From c3bbc0eafdae7a50c46ec61f3352821b7c28ea85 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Wed, 8 Aug 2001 17:03:36 +0000 Subject: This syncs things up with my local tree. Mainly changes installer issues, and syns things (as far as I am willing) with Dave Schleef's tree. We may need to go another round or so, but we do seem to be converging... --- ldso/util/ldd.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'ldso/util/ldd.c') diff --git a/ldso/util/ldd.c b/ldso/util/ldd.c index fd0ff54b3..e8627fb0a 100644 --- a/ldso/util/ldd.c +++ b/ldso/util/ldd.c @@ -222,6 +222,10 @@ static int add_library(Elf32_Ehdr* ehdr, Elf32_Dyn* dynamic, char *strtab, int i if (!s || !strlen(s)) return 1; + /* We add libc.so.0 elsewhere */ + if (strcmp(s, UCLIBC_LDSO)==0) + return 1; + for (cur = lib_list; cur; cur=cur->next) { if(strcmp(cur->name, s)==0) { /* Lib is already in the list */ @@ -396,9 +400,13 @@ int main( int argc, char** argv) /* Print the list */ + got_em_all=0; for (cur = lib_list; cur; cur=cur->next) { + got_em_all=1; printf("\t%s => %s\n", cur->name, cur->path); } + if (got_em_all==0) + printf("\tnot a dynamic executable\n"); return 0; } -- cgit v1.2.3