diff options
Diffstat (limited to 'ldso/ldso/ld_string.h')
| -rw-r--r-- | ldso/ldso/ld_string.h | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/ldso/ldso/ld_string.h b/ldso/ldso/ld_string.h index b94b1c5f9..822d6f313 100644 --- a/ldso/ldso/ld_string.h +++ b/ldso/ldso/ld_string.h @@ -224,17 +224,30 @@ static inline char *_dl_simple_ltoahex(char * local, unsigned long i) #if defined mc68000 || defined __arm__ /* On some arches constant strings are referenced through the GOT. */ /* XXX Requires load_addr to be defined. */ -#define SEND_STDERR(X) \ - { const char *__s = (X); \ - if (__s < (const char *) load_addr) __s += load_addr; \ - _dl_write (2, __s, _dl_strlen (__s)); \ - } +#define SEND_STDERR(X) \ +{ \ + const char *ptr, *str; \ + ptr = str = (char *)(X); \ + if(str < (const char *)load_addr) { \ + str += load_addr; \ + ptr += load_addr; \ + } \ + while (*ptr) \ + ptr++; \ + _dl_write(2, str, ptr - str); \ +} #else -#define SEND_STDERR(X) _dl_write(2, X, _dl_strlen(X)); +#define SEND_STDERR(str) \ +{ \ + register char *ptr = (char *) str; \ + while (*ptr) \ + ptr++; \ + _dl_write(2, str, ptr - str); \ +} #endif #define SEND_ADDRESS_STDERR(X, add_a_newline) { \ - char tmp[13], *tmp1; \ + char tmp[22], *tmp1; \ _dl_memset(tmp, 0, sizeof(tmp)); \ tmp1=_dl_simple_ltoahex( tmp, (unsigned long)(X)); \ _dl_write(2, tmp1, _dl_strlen(tmp1)); \ @@ -245,9 +258,9 @@ static inline char *_dl_simple_ltoahex(char * local, unsigned long i) }; #define SEND_NUMBER_STDERR(X, add_a_newline) { \ - char tmp[13], *tmp1; \ + char tmp[22], *tmp1; \ _dl_memset(tmp, 0, sizeof(tmp)); \ - tmp1=_dl_simple_ltoahex( tmp, (unsigned long)(X)); \ + tmp1=_dl_simple_ltoa( tmp, (unsigned long)(X)); \ _dl_write(2, tmp1, _dl_strlen(tmp1)); \ if (add_a_newline) { \ tmp[0]='\n'; \ |