From b17277cfa29eee1b76fcaa18f2d4bb21c1567d6c Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 15 May 1998 14:46:36 +0000 Subject: Update. 1998-05-15 14:36 Ulrich Drepper * posix/wordexp-test.c: Avoid duplicate messages. * sysdeps/generic/setenv.c: Use __tfind and __tsearch, not tfind and tsearch. Correctly interpret values returned by those functions. (unsetenv): Store pointer to string, not pointer to string pointer. * time/tzfile.c (__tzfile_compute): Take new arguments. Store DST information and offset in them. * time/tzset.c (__tz_convert): Pass extra parameters to __tzfile_compute. Compute equivalent values for use of tz_rules. 1998-05-15 00:49:11 Zack Weinberg * iconvdata/Makefile (gen-8bit-table): Use move-if-change and stamp files to avoid unnecessary recompilation. (gen-8bit-gap-table): Likewise. (move-if-change): New variable. (all generated .h rules): Change to be .stmp rules. (%.h): New rule; depend on %.stmp; no commands. (distribute): Add gen-8bit.sh, gen-8bit-gap.sh, gen-8bit-gap-1.sh. 1998-05-15 01:09 Zack Weinberg * Makerules (libc-map): Deleted. (load-map-file): Set to the appropriate compiler switch, not just the file name. If libfoo-map is not set, look for a libfoo.map in the current directory and $(..). (map-file): New variable, contains just the mapfile name. (build-shlib): Adjust for new value of load-map-file. (libc.so): Correct dependencies. * extra-lib.mk: Correct shlib dependencies since libfoo-map may not be set anymore. * elf/Makefile: Set ld-map to $(..)libc.map, not $(libc-map). Delete libdl-map. Tweak ld.so link rule to work with changed variable settings in Makerules. * iconvdata/Makefile: Tweak build-module to work with changed variable settings in Makerules. * db/Makefile: Delete libdb-map. * hesiod/Makefile: Delete libnss_hesiod-map. * linuxthreads/Makefile: Delete libpthread-map. * locale/Makefile: Delete libBrokenLocale-map. * login/Makefile: Delete libutil-map. * math/Makefile: Delete libm-map. * md5-crypt/Makefile: Delete libcrypt-map. * nis/Makefile: Delete libnsl-map, libnss_nis-map, libnss_nisplus-map, and libnss_compat-map. * nss/Makefile: Delete libnss_files-map, libnss_db-map, and libnss_ldap-map. * resolv/Makefile: Delete libresolv-map and libnss_dns-map. * rt/Makefile: Delete librt-map. 1998-05-15 01:06 Zack Weinberg * configure.in: Instead of substituting `yes' or `no' for whether --no-whole-archive is available, set @no_whole_archive@ to the appropriate gcc switch or the empty string. Likewise for -fno-exceptions. * config.make.in: Replace have-no-whole-archive with no-whole-archive and have-no-exceptions with no-exceptions. * Makerules: Delete stanzas setting no-whole-archive and no-exceptions. * sunrpc/Makefile: Use move-if-change to update generated .h and .c files. 1998-05-13 Andreas Schwab * wcsmbs/wcsmbsload.c (extract_charset_name): Use strcspn instead of strchr loop. 1998-05-15 Andreas Jaeger * time/tzfile.c (__tzfile_read): Remove unused variable info. (__tzfile_compute): Likewise. 1998-05-15 Andreas Jaeger * sysdeps/unix/sysv/linux/bits/socket.h (AF_SNA,PF_SNA): Add new defines from Linux 2.1.102. --- sysdeps/generic/setenv.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'sysdeps/generic') diff --git a/sysdeps/generic/setenv.c b/sysdeps/generic/setenv.c index 69bd992832..baae4c59b2 100644 --- a/sysdeps/generic/setenv.c +++ b/sysdeps/generic/setenv.c @@ -61,6 +61,8 @@ __libc_lock_define_initialized (static, envlock) # define setenv __setenv # define unsetenv __unsetenv # define clearenv __clearenv +# define tfind __tfind +# define tsearch __tsearch #endif /* In the GNU C library implementation we try to be more clever and @@ -75,8 +77,20 @@ __libc_lock_define_initialized (static, envlock) values. */ static void *known_values; -# define KNOWN_VALUE(Str) tfind (Str, &known_values, (__compar_fn_t) strcmp) -# define STORE_VALUE(Str) tsearch (Str, &known_values, (__compar_fn_t) strcmp) +# define KNOWN_VALUE(Str) \ + ({ \ + void **value = tfind (Str, &known_values, (__compar_fn_t) strcmp); \ + if (value != NULL) \ + value = *(const char **) value; \ + value; \ + }) +# define STORE_VALUE(Str) \ + ({ \ + void **value = tsearch (Str, &known_values, (__compar_fn_t) strcmp); \ + if (value != NULL) \ + value = *(const char **) value; \ + value; \ + }) #else # undef USE_TSEARCH @@ -240,7 +254,7 @@ unsetenv (name) char **dp = ep; /* Store the value so that we can reuse it later. */ - STORE_VALUE (ep); + STORE_VALUE (*ep); do dp[0] = dp[1]; -- cgit 1.4.1