Disable demangle; more NULL/0 issues

4 files changed, 88 insertions, 0 deletions

diff --git a/mdb/debian/patches/mdb-disable-demangle.patch b/mdb/debian/patches/mdb-disable-demangle.patch
new file mode 100644
index 0000000..6180110
--- /dev/null
+++ b/mdb/debian/patches/mdb-disable-demangle.patch
@@ -0,0 +1,14 @@
+Description: mdb_demangle dlopen()'s libdemangle.so.1 which
+ is a close source library from Solaris Studio. Sorry.
+Index: mdb/usr/src/cmd/mdb/Makefile.mdb
+===================================================================
+--- mdb.orig/usr/src/cmd/mdb/Makefile.mdb	2012-10-08 04:25:29.000000000 +0400
++++ mdb/usr/src/cmd/mdb/Makefile.mdb	2013-04-25 15:03:04.966348042 +0400
+@@ -46,7 +46,6 @@
+ 	mdb_ctf.c \
+ 	mdb_ctf_open.c \
+ 	mdb_debug.c \
+-	mdb_demangle.c \
+ 	mdb_disasm.c \
+ 	mdb_dump.c \
+ 	mdb_err.c \
diff --git a/mdb/debian/patches/mdb-mdb_kvm.c-pointers.patch b/mdb/debian/patches/mdb-mdb_kvm.c-pointers.patch
new file mode 100644
index 0000000..a78fa66
--- /dev/null
+++ b/mdb/debian/patches/mdb-mdb_kvm.c-pointers.patch
@@ -0,0 +1,22 @@
+Index: mdb/usr/src/cmd/mdb/common/mdb/mdb_kvm.c
+===================================================================
+--- mdb.orig/usr/src/cmd/mdb/common/mdb/mdb_kvm.c	2012-10-08 04:25:29.000000000 +0400
++++ mdb/usr/src/cmd/mdb/common/mdb/mdb_kvm.c	2013-04-25 15:05:23.176262283 +0400
+@@ -136,7 +136,7 @@
+ 	addr = head = (uintptr_t)sym.st_value;
+ 
+ 	do {
+-		if (addr == NULL)
++		if (addr == 0)
+ 			break; /* Avoid spurious NULL pointers in list */
+ 
+ 		if (mdb_tgt_vread(t, &ctl, sizeof (ctl), addr) == -1) {
+@@ -1186,7 +1186,7 @@
+ 	if (km->km_ctfp != NULL)
+ 		return (km->km_ctfp);
+ 
+-	if (km->km_ctf_va == NULL) {
++	if (km->km_ctf_va == 0) {
+ 		(void) set_errno(EMDB_NOCTF);
+ 		return (NULL);
+ 	}
diff --git a/mdb/debian/patches/mdb-mdb_proc.c-pointers.patch b/mdb/debian/patches/mdb-mdb_proc.c-pointers.patch
new file mode 100644
index 0000000..f544c1b
--- /dev/null
+++ b/mdb/debian/patches/mdb-mdb_proc.c-pointers.patch
@@ -0,0 +1,49 @@
+Index: mdb/usr/src/cmd/mdb/common/mdb/mdb_proc.c
+===================================================================
+--- mdb.orig/usr/src/cmd/mdb/common/mdb/mdb_proc.c	2012-10-08 04:25:29.000000000 +0400
++++ mdb/usr/src/cmd/mdb/common/mdb/mdb_proc.c	2013-04-25 15:08:39.275427130 +0400
+@@ -3111,7 +3111,7 @@
+ 		(void) strncpy(mp->map_name, s, MDB_TGT_MAPSZ);
+ 		mp->map_name[MDB_TGT_MAPSZ - 1] = '\0';
+ 		mp->map_flags = MDB_TGT_MAP_R | MDB_TGT_MAP_X;
+-		mp->map_base = NULL;
++		mp->map_base = 0;
+ 		mp->map_size = 0;
+ 
+ 		if (func(private, mp, s) != 0)
+@@ -3924,7 +3924,7 @@
+ 
+ 	ptb = mdb_alloc(sizeof (pt_brkpt_t), UM_SLEEP);
+ 	ptb->ptb_addr = pta->pta_addr;
+-	ptb->ptb_instr = NULL;
++	ptb->ptb_instr = 0;
+ 	sep->se_data = ptb;
+ 
+ 	return (0);
+@@ -3942,7 +3942,7 @@
+ pt_brkpt_info(mdb_tgt_t *t, mdb_sespec_t *sep, mdb_vespec_t *vep,
+     mdb_tgt_spec_desc_t *sp, char *buf, size_t nbytes)
+ {
+-	uintptr_t addr = NULL;
++	uintptr_t addr = 0;
+ 
+ 	if (vep != NULL) {
+ 		pt_bparg_t *pta = vep->ve_args;
+@@ -4326,7 +4326,7 @@
+ 
+ 	pta = mdb_alloc(sizeof (pt_bparg_t), UM_SLEEP);
+ 	pta->pta_symbol = strdup(sym);
+-	pta->pta_addr = NULL;
++	pta->pta_addr = 0;
+ 
+ 	return (mdb_tgt_vespec_insert(t, &proc_brkpt_ops, spec_flags,
+ 	    func, data, pta, pt_bparg_dtor));
+@@ -5022,7 +5022,7 @@
+ 
+ 	if (P != NULL && (auxv = Pgetauxvec(P)) != NULL &&
+ 	    auxv->a_type != AT_NULL) {
+-		for (auxp = auxv, auxn = 1; auxp->a_type != NULL; auxp++)
++		for (auxp = auxv, auxn = 1; auxp->a_type != 0; auxp++)
+ 			auxn++;
+ 	}
+ 
diff --git a/mdb/debian/patches/series b/mdb/debian/patches/series
index b3507d2..5f070d6 100644
--- a/mdb/debian/patches/series
+++ b/mdb/debian/patches/series
@@ -17,3 +17,6 @@ mdb-teminfo.patch
 mdb-tigen-echo.patch
 mdb-kvm_ia32dep.c-pointers.patch
 mdb-mdb_cmds.c-pointers.patch
+mdb-disable-demangle.patch
+mdb-mdb_kvm.c-pointers.patch
+mdb-mdb_proc.c-pointers.patch