diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | dlfcn/eval.c | 69 | ||||
| -rw-r--r-- | elf/dl-minimal.c | 80 | ||||
| -rw-r--r-- | elf/rtld.c | 2 |
4 files changed, 77 insertions, 82 deletions
diff --git a/ChangeLog b/ChangeLog index 85c1b8e58c..32802e6580 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2001-01-18 Ulrich Drepper <drepper@redhat.com> + * elf/rtld.c (process_envvars): Call __strtoul_internal instead of + strtoul. + * elf/dl-minimal.c (strtol, __strtol_internal, strtoul): Removed. + (__sigjmp_save): Set __mask_was_saved to zero since we don't save + anything. + * dlfcn/eval.c (__strtol_internal): Define here. + (eval): Use __strtol_internal instead of strtol. + * elf/elf.h: Add a few more EF_MIPS_* constants. 2001-01-17 Ulrich Drepper <drepper@redhat.com> diff --git a/dlfcn/eval.c b/dlfcn/eval.c index 1f9421ddda..a9fe648c00 100644 --- a/dlfcn/eval.c +++ b/dlfcn/eval.c @@ -1,5 +1,5 @@ /* You don't really want to know what this hack is for. - Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 2000, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -17,16 +17,77 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <stdio.h> +#include <assert.h> #include <ctype.h> +#include <dlfcn.h> +#include <errno.h> +#include <limits.h> +#include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <dlfcn.h> static void *funcall (char **stringp); static void *eval (char **stringp); + +long int weak_function +__strtol_internal (const char *nptr, char **endptr, int base, int group) +{ + unsigned long int result = 0; + long int sign = 1; + + while (*nptr == ' ' || *nptr == '\t') + ++nptr; + + if (*nptr == '-') + { + sign = -1; + ++nptr; + } + else if (*nptr == '+') + ++nptr; + + if (*nptr < '0' || *nptr > '9') + { + if (endptr != NULL) + *endptr = (char *) nptr; + return 0L; + } + + assert (base == 0); + base = 10; + if (*nptr == '0') + { + if (nptr[1] == 'x' || nptr[1] == 'X') + { + base = 16; + nptr += 2; + } + else + base = 8; + } + + while (*nptr >= '0' && *nptr <= '9') + { + unsigned long int digval = *nptr - '0'; + if (result > LONG_MAX / 10 + || (sign > 0 ? result == LONG_MAX / 10 && digval > LONG_MAX % 10 + : (result == ((unsigned long int) LONG_MAX + 1) / 10 + && digval > ((unsigned long int) LONG_MAX + 1) % 10))) + { + errno = ERANGE; + return sign > 0 ? LONG_MAX : LONG_MIN; + } + result *= base; + result += digval; + ++nptr; + } + + return (long int) result * sign; +} + + static void * funcall (char **stringp) { @@ -101,7 +162,7 @@ eval (char **stringp) default: /* Try to parse it as a number. */ - value = (void *) strtol (p, stringp, 0); + value = (void *) __strtol_internal (p, stringp, 0, 0); if (*stringp != p) return value; diff --git a/elf/dl-minimal.c b/elf/dl-minimal.c index 6097ef13ba..994b56c3d9 100644 --- a/elf/dl-minimal.c +++ b/elf/dl-minimal.c @@ -1,5 +1,5 @@ /* Minimal replacements for basic facilities used in the dynamic linker. - Copyright (C) 1995,96,97,98,2000 Free Software Foundation, Inc. + Copyright (C) 1995,96,97,98,2000,2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -36,11 +36,6 @@ static void *alloc_ptr, *alloc_end, *alloc_last_block; /* Declarations of global functions. */ extern void weak_function free (void *ptr); extern void * weak_function realloc (void *ptr, size_t n); -extern long int weak_function __strtol_internal (const char *nptr, - char **endptr, - int base, int group); -extern long int weak_function strtol (const char *nptr, char **endptr, - int base); extern unsigned long int weak_function __strtoul_internal (const char *nptr, char **endptr, int base, int group); extern unsigned long int weak_function strtoul (const char *nptr, @@ -128,9 +123,9 @@ realloc (void *ptr, size_t n) #include <setjmp.h> int weak_function -__sigjmp_save (sigjmp_buf env, int savemask) +__sigjmp_save (sigjmp_buf env, int savemask __attribute__ ((unused))) { - env[0].__mask_was_saved = savemask; + env[0].__mask_was_saved = 0; return 0; } @@ -221,69 +216,6 @@ __assert_perror_fail (int errnum, #endif -/* This function is only used in eval.c. */ -long int weak_function -__strtol_internal (const char *nptr, char **endptr, int base, int group) -{ - unsigned long int result = 0; - long int sign = 1; - - while (*nptr == ' ' || *nptr == '\t') - ++nptr; - - if (*nptr == '-') - { - sign = -1; - ++nptr; - } - else if (*nptr == '+') - ++nptr; - - if (*nptr < '0' || *nptr > '9') - { - if (endptr != NULL) - *endptr = (char *) nptr; - return 0L; - } - - assert (base == 0); - base = 10; - if (*nptr == '0') - { - if (nptr[1] == 'x' || nptr[1] == 'X') - { - base = 16; - nptr += 2; - } - else - base = 8; - } - - while (*nptr >= '0' && *nptr <= '9') - { - unsigned long int digval = *nptr - '0'; - if (result > LONG_MAX / 10 - || (sign > 0 ? result == LONG_MAX / 10 && digval > LONG_MAX % 10 - : (result == ((unsigned long int) LONG_MAX + 1) / 10 - && digval > ((unsigned long int) LONG_MAX + 1) % 10))) - { - errno = ERANGE; - return sign > 0 ? LONG_MAX : LONG_MIN; - } - result *= base; - result += digval; - ++nptr; - } - - return (long int) result * sign; -} - -long int weak_function -strtol (const char *nptr, char **endptr, int base) -{ - return __strtol_internal (nptr, endptr, base, 0); -} - unsigned long int weak_function __strtoul_internal (const char *nptr, char **endptr, int base, int group) { @@ -337,9 +269,3 @@ __strtoul_internal (const char *nptr, char **endptr, int base, int group) return result * sign; } - -unsigned long int weak_function -strtoul (const char *nptr, char **endptr, int base) -{ - return (unsigned long int) __strtoul_internal (nptr, endptr, base, 0); -} diff --git a/elf/rtld.c b/elf/rtld.c index 9590875ebe..1cefb5622a 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -1389,7 +1389,7 @@ process_envvars (enum mode *modep, int *lazyp) case 10: /* Mask for the important hardware capabilities. */ if (memcmp (&envline[3], "HWCAP_MASK", 10) == 0) - _dl_hwcap_mask = strtoul (&envline[14], NULL, 0); + _dl_hwcap_mask = __strtoul_internal (&envline[14], NULL, 0, 0); break; case 11: |