[uClibc-cvs] uClibc/utils ldd.c,1.6,1.7

Erik Andersen andersen at uclibc.org
Fri Feb 13 10:52:43 UTC 2004


Update of /var/cvs/uClibc/utils
In directory nail:/tmp/cvs-serv27063

Modified Files:
	ldd.c 
Log Message:
Fix the annoying "not a dynamic executable" problem when running ldd
on libuClibc


Index: ldd.c
===================================================================
RCS file: /var/cvs/uClibc/utils/ldd.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ldd.c	13 Feb 2004 10:39:59 -0000	1.6
+++ ldd.c	13 Feb 2004 10:52:41 -0000	1.7
@@ -367,7 +367,7 @@
 		tmp++;
 	}
 
-	/* We add libc.so.0 elsewhere */
+	/* We add ldso elsewhere */
 	if (interpreter_already_found && (tmp=strrchr(interp, '/')) != NULL)
 	{
 		int len = strlen(interp_dir);
@@ -523,7 +523,7 @@
 		goto foo;
 
 	/* mmap the file to make reading stuff from it effortless */
-	ehdr = (Elf32_Ehdr *)mmap(0, statbuf.st_size, 
+	ehdr = (Elf32_Ehdr *)mmap(0, statbuf.st_size,
 			PROT_READ|PROT_WRITE, MAP_PRIVATE, fileno(thefile), 0);
 
 foo:
@@ -658,9 +658,9 @@
 			got_em_all=1;
 			printf("\t%s => %s (0x00000000)\n", cur->name, cur->path);
 		}
-		if (interp_dir && got_em_all==1)
+		if (interp && interpreter_already_found==1)
 			printf("\t%s => %s (0x00000000)\n", interp, interp);
-		if (got_em_all==0)
+		else
 			printf("\tnot a dynamic executable\n");
 
 		for (cur = lib_list; cur; cur=cur->next) {




More information about the uClibc-cvs mailing list