diff options
| author | Eric Andersen <andersen@codepoet.org> | 2001-08-11 04:09:22 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2001-08-11 04:09:22 +0000 |
| commit | 246af1d52ea6e0ae2cd67b89bc5ab7c4e3e3303d (patch) | |
| tree | 09b0688704955b8edd7e7eb0671dd76dce592873 /ldso/util | |
| parent | 51ff0f67c733ac9dd1ad405978fe1d7f1141c250 (diff) | |
| download | uClibc-alpine-246af1d52ea6e0ae2cd67b89bc5ab7c4e3e3303d.tar.bz2 uClibc-alpine-246af1d52ea6e0ae2cd67b89bc5ab7c4e3e3303d.tar.xz | |
Sync up ldd behavior
Diffstat (limited to 'ldso/util')
| -rw-r--r-- | ldso/util/ldd.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ldso/util/ldd.c b/ldso/util/ldd.c index e8627fb0a..0cf3c798e 100644 --- a/ldso/util/ldd.c +++ b/ldso/util/ldd.c @@ -101,7 +101,8 @@ int check_elf_header(Elf32_Ehdr const *const ehdr) return 0; } -/* This function must exactly match that in uClibc/ldso/util/ldd.c */ +/* This function's behavior must exactly match that + * in uClibc/ldso/d-link/readelflib1.c */ static void search_for_named_library(char *name, char *result, const char *path_list) { int i, count = 0; @@ -121,7 +122,7 @@ static void search_for_named_library(char *name, char *result, const char *path_ memmove(path_n, path_n+1, i-1); } - /* Replace colons with zeros in path_parsed and count them */ + /* Replace colons with zeros in path_list and count them */ for(i=strlen(path); i > 0; i--) { if (path[i]==':') { path[i]=0; @@ -196,9 +197,12 @@ void locate_library_file(Elf32_Ehdr* ehdr, Elf32_Dyn* dynamic, char *strtab, int } } +#ifdef USE_CACHE /* FIXME -- add code to check the Cache here */ +#endif - /* Lastly, search the standard list of paths for the library */ + /* Lastly, search the standard list of paths for the library. + This list must exactly match the list in uClibc/ldso/d-link/readelflib1.c */ path = UCLIBC_TARGET_PREFIX "/usr/lib:" UCLIBC_TARGET_PREFIX "/lib:" UCLIBC_DEVEL_PREFIX "/lib:" |