diff options
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/dl-addr.c | 11 | ||||
| -rw-r--r-- | elf/dl-lookup.c | 1 | ||||
| -rw-r--r-- | elf/dl-minimal.c | 4 | ||||
| -rw-r--r-- | elf/ldd.bash.in | 6 | ||||
| -rw-r--r-- | elf/ldd.sh.in | 6 | ||||
| -rw-r--r-- | elf/rtld.c | 6 |
6 files changed, 17 insertions, 17 deletions
diff --git a/elf/dl-addr.c b/elf/dl-addr.c index d50cc4bf10..baa6df593e 100644 --- a/elf/dl-addr.c +++ b/elf/dl-addr.c @@ -33,7 +33,7 @@ _dl_addr (const void *address, Dl_info *info) /* Find the highest-addressed object that ADDRESS is not below. */ match = NULL; for (l = _dl_loaded; l; l = l->l_next) - if (addr >= l->l_addr && !match || match->l_addr < l->l_addr) + if (addr >= l->l_addr && (!match || match->l_addr < l->l_addr)) match = l; if (match) @@ -62,10 +62,11 @@ _dl_addr (const void *address, Dl_info *info) /* We assume that the string table follows the symbol table, because there is no way in ELF to know the size of the dynamic symbol table!! */ for (matchsym = NULL; (void *) symtab < (void *) strtab; ++symtab) - if (addr >= match->l_addr + symtab->st_value && !matchsym || - matchsym->st_value < symtab->st_value && - ELFW(ST_BIND) (symtab->st_info) == STB_GLOBAL || - ELFW(ST_BIND) (symtab->st_info) == STB_WEAK) + if (addr >= match->l_addr + symtab->st_value + && (!matchsym + || (matchsym->st_value < symtab->st_value + && (ELFW(ST_BIND) (symtab->st_info) == STB_GLOBAL + || ELFW(ST_BIND) (symtab->st_info) == STB_WEAK)))) matchsym = symtab; if (matchsym) diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c index c3a67ffcc6..2ec7e3a446 100644 --- a/elf/dl-lookup.c +++ b/elf/dl-lookup.c @@ -25,7 +25,6 @@ #include "dl-hash.h" #include <dl-machine.h> -#include <stdio-common/_itoa.h> #define VERSTAG(tag) (DT_NUM + DT_PROCNUM + DT_VERSIONTAGIDX (tag)) diff --git a/elf/dl-minimal.c b/elf/dl-minimal.c index a76e01dcb8..088c2331f6 100644 --- a/elf/dl-minimal.c +++ b/elf/dl-minimal.c @@ -146,7 +146,7 @@ __assert_fail (const char *assertion, char buf[64]; buf[sizeof buf - 1] = '\0'; _dl_sysdep_fatal ("BUG IN DYNAMIC LINKER ld.so: ", - file, ": ", _itoa (line, buf + sizeof buf - 1, 10, 0), + file, ": ", _itoa_word (line, buf + sizeof buf - 1, 10, 0), ": ", function ?: "", function ? ": " : "", "Assertion `", assertion, "' failed!\n", NULL); @@ -161,7 +161,7 @@ __assert_perror_fail (int errnum, char buf[64]; buf[sizeof buf - 1] = '\0'; _dl_sysdep_fatal ("BUG IN DYNAMIC LINKER ld.so: ", - file, ": ", _itoa (line, buf + sizeof buf - 1, 10, 0), + file, ": ", _itoa_word (line, buf + sizeof buf - 1, 10, 0), ": ", function ?: "", function ? ": " : "", "Unexpected error: ", strerror (errnum), "\n", NULL); diff --git a/elf/ldd.bash.in b/elf/ldd.bash.in index 32a9405422..6f4da3d8f9 100644 --- a/elf/ldd.bash.in +++ b/elf/ldd.bash.in @@ -49,7 +49,7 @@ Written by Roland McGrath and Ulrich Drepper." -d, --data-relocs process data relocations -r, --function-relocs process data and function relocations -v, --verbose print all information -Report bugs using the \`glibcbug' script to <bugs@gnu.ai.mit.edu>." +Report bugs using the \`glibcbug' script to <bugs@gnu.org>." exit 0 ;; -d | --d | --da | --dat | --data | --data- | --data-r | --data-re | \ --data-rel | --data-relo | --data-reloc | --data-relocs) @@ -88,7 +88,7 @@ case $# in 1) # We don't list the file name when there is only one. case "$1" in - /*) file="$1" ;; + */*) file="$1" ;; *) file="./$1" ;; esac if test ! -f "$file"; then @@ -124,7 +124,7 @@ case $# in for file; do echo "${file}:" case "$file" in - /*) : ;; + */*) : ;; *) file="./$file" ;; esac if test ! -f "$file"; then diff --git a/elf/ldd.sh.in b/elf/ldd.sh.in index 908a26e269..1de55f4d39 100644 --- a/elf/ldd.sh.in +++ b/elf/ldd.sh.in @@ -44,7 +44,7 @@ Written by Roland McGrath and Ulrich Drepper.' -d, --data-relocs process data relocations -r, --function-relocs process data and function relocations -v, --verbose print all information -Report bugs using the \`glibcbug' script to <bugs@gnu.ai.mit.edu>." +Report bugs using the \`glibcbug' script to <bugs@gnu.org>." exit 0 ;; -d | --d | --da | --dat | --data | --data- | --data-r | --data-re | \ --data-rel | --data-relo | --data-reloc | --data-relocs) @@ -85,7 +85,7 @@ Try \`ldd --help' for more information." 1) # We don't list the file name when there is only one. case "$1" in - /*) file="$1" ;; + */*) file="$1" ;; *) file="./$1" ;; esac if test ! -f "$file"; then @@ -124,7 +124,7 @@ Try \`ldd --help' for more information." for file; do echo "${file}:" case "$file" in - /*) : ;; + */*) : ;; *) file="./$file" ;; esac if test ! -f "$file"; then diff --git a/elf/rtld.c b/elf/rtld.c index 0402727c52..48d8575c89 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -656,7 +656,7 @@ of this helper program; chances are you did not intend to run this program.\n", { char buf[20], *bp; buf[sizeof buf - 1] = '\0'; - bp = _itoa (l->l_addr, &buf[sizeof buf - 1], 16, 0); + bp = _itoa_word (l->l_addr, &buf[sizeof buf - 1], 16, 0); while ((size_t) (&buf[sizeof buf - 1] - bp) < sizeof l->l_addr * 2) *--bp = '0'; @@ -675,12 +675,12 @@ of this helper program; chances are you did not intend to run this program.\n", ELF_MACHINE_JMP_SLOT); char buf[20], *bp; buf[sizeof buf - 1] = '\0'; - bp = _itoa (ref->st_value, &buf[sizeof buf - 1], 16, 0); + bp = _itoa_word (ref->st_value, &buf[sizeof buf - 1], 16, 0); while ((size_t) (&buf[sizeof buf - 1] - bp) < sizeof loadbase * 2) *--bp = '0'; _dl_sysdep_message (_dl_argv[i], " found at 0x", bp, NULL); buf[sizeof buf - 1] = '\0'; - bp = _itoa (loadbase, &buf[sizeof buf - 1], 16, 0); + bp = _itoa_word (loadbase, &buf[sizeof buf - 1], 16, 0); while ((size_t) (&buf[sizeof buf - 1] - bp) < sizeof loadbase * 2) *--bp = '0'; _dl_sysdep_message (" in object at 0x", bp, "\n", NULL); |