[illumos-gate merge]

commit a6d101109bfb442cf0db6d8ebb5fb7c32cb16d7e
    9472 Add smbutil discon command
commit 4226f635096bf9d814aa9fb335518c4855bbe3a3
    6375 Add native name demangling support
commit 83b4671e6262c5aa6b4f9fb5a384b1946dfc2e7f
    9664 loader: need UEFI32 support
commit e1bf37b1abeb6653a6e35e2bd6924131cced1efe
    9884 cw(1) should use -fpic rather than -Kpic

	Conflicts:
	usr/src/test/util-tests/tests/Makefile
	usr/src/cmd/mdb/common/mdb/mdb_demangle.c

1 files changed, 85 insertions, 0 deletions

diff --git a/usr/src/lib/libdemangle/common/util.c b/usr/src/lib/libdemangle/common/util.c
new file mode 100644
index 0000000000..9ffb72c79b
--- /dev/null
+++ b/usr/src/lib/libdemangle/common/util.c
@@ -0,0 +1,85 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2017 Jason King
+ */
+
+#include <sys/debug.h>
+#include <stdlib.h>
+#include <string.h>
+#include "demangle-sys.h"
+#include "demangle_int.h"
+
+void *
+zalloc(sysdem_ops_t *ops, size_t len)
+{
+	void *p = ops->alloc(len);
+
+	if (p != NULL)
+		(void) memset(p, 0, len);
+
+#ifdef DEBUG
+	/*
+	 * In normal operation, we should never exhaust memory.  Either
+	 * something's wrong, or the system is so hosed that aborting
+	 * shouldn't hurt anything, and it gives us a more useful stack
+	 * trace.
+	 */
+	if (p == NULL)
+		abort();
+#endif
+
+	return (p);
+}
+
+void
+xfree(sysdem_ops_t *ops, void *p, size_t len)
+{
+	if (p == NULL || len == 0)
+		return;
+
+	ops->free(p, len);
+}
+
+void *
+xrealloc(sysdem_ops_t *ops, void *p, size_t oldsz, size_t newsz)
+{
+	if (newsz == oldsz)
+		return (p);
+
+	VERIFY3U(newsz, >, oldsz);
+
+	void *temp = zalloc(ops, newsz);
+
+	if (temp == NULL)
+		return (NULL);
+
+	if (oldsz > 0) {
+		(void) memcpy(temp, p, oldsz);
+		xfree(ops, p, oldsz);
+	}
+
+	return (temp);
+}
+
+/*ARGSUSED*/
+static void
+def_free(void *p, size_t len)
+{
+	free(p);
+}
+
+static sysdem_ops_t i_sysdem_ops_default = {
+	.alloc = malloc,
+	.free = def_free
+};
+sysdem_ops_t *sysdem_ops_default = &i_sysdem_ops_default;