summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoakim Tjernlund <joakim.tjernlund@transmode.se>2004-10-06 12:51:12 +0000
committerJoakim Tjernlund <joakim.tjernlund@transmode.se>2004-10-06 12:51:12 +0000
commit09fb630d4c79ffaeae30837b4759d5719b0ce8f7 (patch)
treeb9599dcd32bf18921faedb8b5193c8a151a1b889
parent7eea9ca077dac620c865f5dbe8f9391324ceb013 (diff)
Add type libc0 to cache_print().
Always strip trailing slaches(/) from paths read from ld.so.conf.
-rw-r--r--utils/ldconfig.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/utils/ldconfig.c b/utils/ldconfig.c
index 52dc55b1d..f2bdd2dfa 100644
--- a/utils/ldconfig.c
+++ b/utils/ldconfig.c
@@ -699,6 +699,9 @@ void cache_print(void)
case LIB_ELF:
printf("(ELF%s)", libent[fd].flags & LIB_ELF64 ? "/64" : "");
break;
+ case LIB_ELF_LIBC0:
+ printf("(libc0%s)",libent[fd].flags & LIB_ELF64 ? "/64" : "");
+ break;
case LIB_ELF_LIBC5:
case LIB_ELF_LIBC6:
printf("(libc%d%s)", (libent[fd].flags & ~LIB_ELF64) + 3,
@@ -884,13 +887,13 @@ int main(int argc, char **argv)
if ((extpath = get_extpath()))
{
for (cp = strtok(extpath, DIR_SEP); cp; cp = strtok(NULL, DIR_SEP)) {
- /* we do the redundancy check only if cache usage is enabled */
-#ifdef __LDSO_CACHE_SUPPORT__
/* strip trailing slashes */
int len = strlen(cp);
if (len)
while (cp[--len] == '/' && len)
cp[len] = 0;
+ /* we do the redundancy check only if cache usage is enabled */
+#ifdef __LDSO_CACHE_SUPPORT__
if (strcmp(UCLIBC_RUNTIME_PREFIX "lib", cp) == 0 ||
strcmp(UCLIBC_RUNTIME_PREFIX "usr/lib", cp) == 0) {
if (verbose >= 0)