 @@ -1,14 +1,14 @@
-/*	$NetBSD: ldd.c,v 1.19 2011/05/24 12:27:29 joerg Exp $	*/
+/*	$NetBSD: ldd.c,v 1.20 2012/07/08 00:53:44 matt Exp $	*/
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Paul Kranenburg.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -52,53 +52,57 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: ldd.c,v 1.19 2011/05/24 12:27:29 joerg Exp $");
+__RCSID("$NetBSD: ldd.c,v 1.20 2012/07/08 00:53:44 matt Exp $");
 #endif /* not lint */
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/wait.h>
 #include <dirent.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <ctype.h>
 #include "debug.h"
 #include "rtld.h"
 #include "ldd.h"
 /*
  * Data declarations.
  */
 static char *error_message;	/* Message for dlopen(), or NULL */
 bool _rtld_trust;		/* False for setuid and setgid programs */
 /*
  * This may be ELF64 or ELF32 but since they are used opaquely it doesn't
  * really matter.
  */
 Obj_Entry *_rtld_objlist;	/* Head of linked list of shared objects */
 Obj_Entry **_rtld_objtail = &_rtld_objlist;
 				/* Link field of last object in list */
 u_int _rtld_objcount;		/* Number of shared objects */
 u_int _rtld_objloads;		/* Number of objects loaded */
 Obj_Entry *_rtld_objmain;	/* The main program shared object */
 size_t _rtld_pagesz;
 Search_Path *_rtld_default_paths;
 Search_Path *_rtld_paths;
 Library_Xform *_rtld_xforms;
 @@ -190,131 +194,26 @@ _rtld_error(const char *fmt, ...)
 	error_message = buf;
 	va_end(ap);
+}
 char *
 dlerror()
+{
 	char *msg = error_message;
 	error_message = NULL;
 	return msg;
+}
 void
 fmtprint(const char *libname, Obj_Entry *obj, const char *fmt1,
     const char *fmt2)
 	const char *libpath = obj ? obj->path : "not found";
 	char libnamebuf[200];
 	char *libmajor = NULL;
 	const char *fmt;
 	char *cp;
 	int c;
 	if (strncmp(libname, "lib", 3) == 0 &&
 	    (cp = strstr(libname, ".so")) != NULL) {
 		size_t i = cp - (libname + 3);
 		if (i >= sizeof(libnamebuf))
 			i = sizeof(libnamebuf) - 1;
 		(void)memcpy(libnamebuf, libname + 3, i);
 		libnamebuf[i] = '\0';
 		if (cp[3] && isdigit((unsigned char)cp[4]))
 			libmajor = &cp[4];
 		libname = libnamebuf;
 	if (fmt1 == NULL)
 		fmt1 = libmajor != NULL ?
 		    "\t-l%o.%m => %p\n" :
 		    "\t-l%o => %p\n";
 	if (fmt2 == NULL)
 		fmt2 = "\t%o => %p\n";
 	fmt = libname == libnamebuf ? fmt1 : fmt2;
 	while ((c = *fmt++) != '\0') {
 		switch (c) {
 		default:
 			putchar(c);
 			continue;
 		case '\\':
 			switch (c = *fmt) {
 			case '\0':
 				continue;
 			case 'n':
 				putchar('\n');
 				break;
 			case 't':
 				putchar('\t');
 				break;
 			break;
 		case '%':
 			switch (c = *fmt) {
 			case '\0':
 				continue;
 			case '%':
 			default:
 				putchar(c);
 				break;
 			case 'A':
 				printf("%s", main_local);
 				break;
 			case 'a':
 				printf("%s", main_progname);
 				break;
 			case 'o':
 				printf("%s", libname);
 				break;
 			case 'm':
 				printf("%s", libmajor);
 				break;
 			case 'n':
 				/* XXX: not supported for elf */
 				break;
 			case 'p':
 				printf("%s", libpath);
 				break;
 			case 'x':
 				printf("%p", obj ? obj->mapbase : 0);
 				break;
 			break;
 		++fmt;
 void
 print_needed(Obj_Entry *obj, const char *fmt1, const char *fmt2)
 	const Needed_Entry *needed;
 	for (needed = obj->needed; needed != NULL; needed = needed->next) {
 		const char *libname = obj->strtab + needed->name;
 		if (needed->obj != NULL) {
 			if (!needed->obj->printed) {
 				fmtprint(libname, needed->obj, fmt1, fmt2);
 				needed->obj->printed = 1;
 				print_needed(needed->obj, fmt1, fmt2);
 		} else {
 			fmtprint(libname, needed->obj, fmt1, fmt2);
 void
 _rtld_die(void)
+{
 	const char *msg = dlerror();
 	if (msg == NULL)
 		msg = "Fatal error";
 	xerrx(1, "%s", msg);
+}
 void
 _rtld_shared_enter(void)
+{
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ldd.h,v 1.6 2009/12/15 04:06:43 mrg Exp $	*/
+/*	$NetBSD: ldd.h,v 1.7 2012/07/08 00:53:44 matt Exp $	*/
 /*
  * Copyright (c) 2008 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -33,18 +33,15 @@ int elf32_ldd(int, char *, const char *,
 #ifdef _LP64
 #define LDD_ELF64
 #endif
 #ifdef LDD_ELF64
 int elf64_ldd(int, char *, const char *, const char *);
 #define elf_ldd elf64_ldd
 #elif defined(ELF32_COMPAT)
 #define elf_ldd elf32_compat_ldd
 #else
 #define elf_ldd elf32_ldd
 #endif
 void fmtprint(const char *, Obj_Entry *, const char *, const char *);
 void print_needed(Obj_Entry *, const char *, const char *);
 extern char *main_local;
 extern char *main_progname;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ldd_elfxx.c,v 1.5 2011/06/30 20:09:41 wiz Exp $	*/
+/*	$NetBSD: ldd_elfxx.c,v 1.6 2012/07/08 00:53:44 matt Exp $	*/
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Paul Kranenburg.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -52,48 +52,51 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: ldd_elfxx.c,v 1.5 2011/06/30 20:09:41 wiz Exp $");
+__RCSID("$NetBSD: ldd_elfxx.c,v 1.6 2012/07/08 00:53:44 matt Exp $");
 #endif /* not lint */
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/wait.h>
 #include <dirent.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <ctype.h>
 #include "debug.h"
 #include "rtld.h"
 #include "ldd.h"
 static void print_needed(Obj_Entry *, const char *, const char *);
 static void fmtprint(const char *, Obj_Entry *, const char *, const char *);
 /*
  * elfxx_ldd() - bit-size independent ELF ldd implementation.
  * returns 0 on success and -1 on failure.
  */
 int
 ELFNAME(ldd)(int fd, char *path, const char *fmt1, const char *fmt2)
+{
 	struct stat st;
 	if (lseek(fd, 0, SEEK_SET) < 0 ||
 	    fstat(fd, &st) < 0) {
 		_rtld_error("%s: %s", path, strerror(errno));
 		return -1;
 @@ -148,13 +151,118 @@ ELFNAME(ldd)(int fd, char *path, const c
 			xfree(__UNCONST(needed));
+		}
 		(void) munmap(obj->mapbase, obj->mapsize);
 		xfree(obj->path);
 		xfree(obj);
+	}
 	_rtld_objmain = NULL;
 	_rtld_objtail = &_rtld_objlist;
 	/* Need to free _rtld_paths? */
 	return 0;
+}
 void
 fmtprint(const char *libname, Obj_Entry *obj, const char *fmt1,
     const char *fmt2)
+{
 	const char *libpath = obj ? obj->path : "not found";
 	char libnamebuf[200];
 	char *libmajor = NULL;
 	const char *fmt;
 	char *cp;
 	int c;
 	if (strncmp(libname, "lib", 3) == 0 &&
 	    (cp = strstr(libname, ".so")) != NULL) {
 		size_t i = cp - (libname + 3);
 		if (i >= sizeof(libnamebuf))
 			i = sizeof(libnamebuf) - 1;
 		(void)memcpy(libnamebuf, libname + 3, i);
 		libnamebuf[i] = '\0';
 		if (cp[3] && isdigit((unsigned char)cp[4]))
 			libmajor = &cp[4];
 		libname = libnamebuf;
+	}
 	if (fmt1 == NULL)
 		fmt1 = libmajor != NULL ?
 		    "\t-l%o.%m => %p\n" :
 		    "\t-l%o => %p\n";
 	if (fmt2 == NULL)
 		fmt2 = "\t%o => %p\n";
 	fmt = libname == libnamebuf ? fmt1 : fmt2;
 	while ((c = *fmt++) != '\0') {
 		switch (c) {
 		default:
 			putchar(c);
 			continue;
 		case '\\':
 			switch (c = *fmt) {
 			case '\0':
 				continue;
 			case 'n':
 				putchar('\n');
 				break;
 			case 't':
 				putchar('\t');
 				break;
+			}
 			break;
 		case '%':
 			switch (c = *fmt) {
 			case '\0':
 				continue;
 			case '%':
 			default:
 				putchar(c);
 				break;
 			case 'A':
 				printf("%s", main_local);
 				break;
 			case 'a':
 				printf("%s", main_progname);
 				break;
 			case 'o':
 				printf("%s", libname);
 				break;
 			case 'm':
 				printf("%s", libmajor);
 				break;
 			case 'n':
 				/* XXX: not supported for elf */
 				break;
 			case 'p':
 				printf("%s", libpath);
 				break;
 			case 'x':
 				printf("%p", obj ? obj->mapbase : 0);
 				break;
+			}
 			break;
+		}
 		++fmt;
+	}
+}
 void
 print_needed(Obj_Entry *obj, const char *fmt1, const char *fmt2)
+{
 	const Needed_Entry *needed;
 	for (needed = obj->needed; needed != NULL; needed = needed->next) {
 		const char *libname = obj->strtab + needed->name;
 		if (needed->obj != NULL) {
 			if (!needed->obj->printed) {
 				fmtprint(libname, needed->obj, fmt1, fmt2);
 				needed->obj->printed = 1;
 				print_needed(needed->obj, fmt1, fmt2);
+			}
 		} else {
 			fmtprint(libname, needed->obj, fmt1, fmt2);
+		}
+	}
+}