From 789b13c4e808dfcdd58d52bc5f4221047fee57e5 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 23 Mar 1998 11:53:10 +0000 Subject: [PATCH] Update. 1998-03-23 07:52 H.J. Lu * elf/dl-close.c (_dl_close): Fix byte count while removing the shared object from the global scope list and optimize a little bit. 1998-03-22 Andreas Jaeger * manual/filesys.texi (Scanning Directory Content): Add missing closing brace. (Scanning Directory Content): Fix text. 1998-03-22 Andreas Jaeger * manual/memory.texi (Heap Consistency Checking): Add paragraph explaining difference of -lmcheck and MALLOC_CHECK_. 1998-03-23 Andreas Jaeger * sysdeps/unix/sysv/linux/fstatvfs.c (fstatvfs): Correct some typos in comments. 1998-03-20 Andreas Schwab * test-skeleton.c (main): Fix test for exit signal. 1998-03-22 Andreas Schwab * sysdeps/generic/strtok_r.c: Undefine __strtok_r. 1998-03-22 Andreas Schwab * sysdeps/generic/memcmp.c [_LIBC]: Define WORDS_BIGENDIAN as appropriate. 1998-03-23 11:14 Andreas Schwab * libc.map: Export __strtok_r. 1998-03-23 Ulrich Drepper * posix/regex.c (re_compile_fastmap): Remove unused variable num_regs and adjust comment. Patch by Jim Meyering . * math/math.h (M_*l): Extend long double constants to be usable for 128 bit floats. Patch by Richard Henderson. 1998-03-23 11:16 Andreas Schwab Patch by Tim Waugh and Andreas Schwab. --- ChangeLog | 52 ++++++++++++++++++++++++++++++++++++-- elf/dl-close.c | 5 ++-- libc.map | 1 + manual/filesys.texi | 10 ++++---- manual/memory.texi | 7 +++++ posix/regex.c | 6 ++--- sysdeps/generic/memcmp.c | 7 ++++- sysdeps/generic/strtok_r.c | 1 + sysdeps/unix/sysv/linux/fstatvfs.c | 10 ++++---- test-skeleton.c | 5 ++-- 10 files changed, 81 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index df388f0..55adf3a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,59 @@ -Mon Mar 23 11:16:14 1998 Andreas Schwab +1998-03-23 07:52 H.J. Lu + + * elf/dl-close.c (_dl_close): Fix byte count while removing + the shared object from the global scope list and optimize + a little bit. + +1998-03-22 Andreas Jaeger + + * manual/filesys.texi (Scanning Directory Content): Add missing + closing brace. + (Scanning Directory Content): Fix text. + +1998-03-22 Andreas Jaeger + + * manual/memory.texi (Heap Consistency Checking): Add paragraph + explaining difference of -lmcheck and MALLOC_CHECK_. + +1998-03-23 Andreas Jaeger + + * sysdeps/unix/sysv/linux/fstatvfs.c (fstatvfs): Correct some + typos in comments. + +1998-03-20 Andreas Schwab + + * test-skeleton.c (main): Fix test for exit signal. + +1998-03-22 Andreas Schwab + + * sysdeps/generic/strtok_r.c: Undefine __strtok_r. + +1998-03-22 Andreas Schwab + + * sysdeps/generic/memcmp.c [_LIBC]: Define WORDS_BIGENDIAN as + appropriate. + +1998-03-23 11:14 Andreas Schwab + + * libc.map: Export __strtok_r. + +1998-03-23 Ulrich Drepper + + * posix/regex.c (re_compile_fastmap): Remove unused variable + num_regs and adjust comment. + Patch by Jim Meyering . + + * math/math.h (M_*l): Extend long double constants to be usable + for 128 bit floats. Patch by Richard Henderson. + +1998-03-23 11:16 Andreas Schwab * sysdeps/m68k/m68020/wordcopy.S: New file. 1998-03-22 Ulrich Drepper * posix/wordexp.c: Rewrite parse_param. - Patch by Tim Waugh and. Andreas Schwab. + Patch by Tim Waugh and Andreas Schwab. 1998-03-21 23:46 Zack Weinberg diff --git a/elf/dl-close.c b/elf/dl-close.c index f215503..a782452 100644 --- a/elf/dl-close.c +++ b/elf/dl-close.c @@ -95,10 +95,9 @@ _dl_close (struct link_map *map) do --tail; while (*tail != imap); + memcpy (tail, tail + 1, + (char *) _dl_global_scope_end - (char *) tail); --_dl_global_scope_end; - memcpy (tail, tail + 1, _dl_global_scope_end - tail); - _dl_global_scope_end[0] = NULL; - _dl_global_scope_end[1] = NULL; } /* We can unmap all the maps at once. We just have to determine diff --git a/libc.map b/libc.map index 7a39f2c..b045448 100644 --- a/libc.map +++ b/libc.map @@ -67,6 +67,7 @@ GLIBC_2.0 { __xstat; __fxstat; __lxstat; __xmknod; __dcgettext; __uflow; __underflow; __overflow; __iswctype; __sigpause; __ctype_get_mb_cur_max; __bzero; + __strtok_r; # functions used in other libraries __printf_fp; __stpncpy; __stpcpy; __strdup; __mempcpy; diff --git a/manual/filesys.texi b/manual/filesys.texi index 8a91639..c5c2f10 100644 --- a/manual/filesys.texi +++ b/manual/filesys.texi @@ -485,8 +485,8 @@ The @code{alphasort} function behaves like the @code{strcoll} function are not string pointers but instead they are of type @code{struct dirent **}. -Return value of is less than, equal to, or greater than zero depending -on the order of the two entries @var{a} and @var{b}. +Return value of @code{alphasort} is less than, equal to, or greater than +zero depending on the order of the two entries @var{a} and @var{b}. @end deftypefun @comment dirent.h @@ -509,7 +509,7 @@ only that the directory entries it returns are described by elements of type @w{@code{struct dirent64}}. The function pointed to by @var{selector} is again used to select the wanted entries only that @var{selector} now must point to a function which takes a -@w{@code{struct dirent64 *} parameter. +@w{@code{struct dirent64 *}} parameter. The @var{cmp} now must be a function which expects its two arguments to be of type @code{struct dirent64 **}. @@ -528,8 +528,8 @@ The @code{alphasort64} function behaves like the @code{strcoll} function are not string pointers but instead they are of type @code{struct dirent64 **}. -Return value of is less than, equal to, or greater than zero depending -on the order of the two entries @var{a} and @var{b}. +Return value of @code{alphasort64} is less than, equal to, or greater +than zero depending on the order of the two entries @var{a} and @var{b}. @end deftypefun @comment dirent.h diff --git a/manual/memory.texi b/manual/memory.texi index 09147bc..262d772 100644 --- a/manual/memory.texi +++ b/manual/memory.texi @@ -625,6 +625,13 @@ immediately. This can be useful because otherwise a crash may happen much later, and the true cause for the problem is then very hard to track down. +So, what's the difference between using @code{MALLOC_CHECK_} and linking +with @samp{-lmcheck}? @code{MALLOC_CHECK_} is orthognal with respect to +@samp{-lmcheck}. @samp{-lmcheck} has been added for backward +compatibility. Both @code{MALLOC_CHECK_} and @samp{-lmcheck} should +uncover the same bugs - but using @code{MALLOC_CHECK_} you don't need to +recompile your application. + @node Hooks for Malloc @subsection Storage Allocation Hooks @cindex allocation hooks, for @code{malloc} diff --git a/posix/regex.c b/posix/regex.c index 1bc6096..bf0e7c4 100644 --- a/posix/regex.c +++ b/posix/regex.c @@ -1198,8 +1198,8 @@ typedef struct if we ever fail back to it. Requires variables fail_stack, regstart, regend, reg_info, and - num_regs be declared. DOUBLE_FAIL_STACK requires `destination' be - declared. + num_regs_pushed be declared. DOUBLE_FAIL_STACK requires `destination' + be declared. Does `return FAILURE_CODE' if runs out of memory. */ @@ -3089,8 +3089,6 @@ re_compile_fastmap (bufp) #ifndef REGEX_MALLOC char *destination; #endif - /* We don't push any register information onto the failure stack. */ - unsigned num_regs = 0; register char *fastmap = bufp->fastmap; unsigned char *pattern = bufp->buffer; diff --git a/sysdeps/generic/memcmp.c b/sysdeps/generic/memcmp.c index 213ccc0..033ac19 100644 --- a/sysdeps/generic/memcmp.c +++ b/sysdeps/generic/memcmp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1993, 1995, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1993, 1995, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Torbjorn Granlund (tege@sics.se). @@ -47,6 +47,11 @@ #ifdef _LIBC # include +# include + +# if __BYTE_ORDER == __BIG_ENDIAN +# define WORDS_BIGENDIAN +# endif #else /* Not in the GNU C library. */ diff --git a/sysdeps/generic/strtok_r.c b/sysdeps/generic/strtok_r.c index 26d7da5..3105e6a 100644 --- a/sysdeps/generic/strtok_r.c +++ b/sysdeps/generic/strtok_r.c @@ -20,6 +20,7 @@ #include #undef strtok_r +#undef __strtok_r /* Parse S into tokens separated by characters in DELIM. If S is NULL, the saved pointer in SAVE_PTR is used as diff --git a/sysdeps/unix/sysv/linux/fstatvfs.c b/sysdeps/unix/sysv/linux/fstatvfs.c index 53edb6b..ef28bc6 100644 --- a/sysdeps/unix/sysv/linux/fstatvfs.c +++ b/sysdeps/unix/sysv/linux/fstatvfs.c @@ -27,8 +27,8 @@ #include /* These definitions come from the kernel headers. But we cannot - include the headers here because of type clashes. If there will - become new filesystem types available we have to add the + include the headers here because of type clashes. If new + filesystem types will become available we have to add the appropriate definitions here.*/ #define ADFS_SUPER_MAGIC 0xadf5 #define AFFS_SUPER_MAGIC 0xadff @@ -61,7 +61,7 @@ fstatvfs (int fd, struct statvfs *buf) if (__fstatfs (fd, &fsbuf) < 0) return -1; - /* Now fill in the fields me have information for. */ + /* Now fill in the fields we have information for. */ buf->f_bsize = fsbuf.f_bsize; buf->f_blocks = fsbuf.f_blocks; buf->f_bfree = fsbuf.f_bfree; @@ -108,8 +108,8 @@ fstatvfs (int fd, struct statvfs *buf) /* XXX I have no idea how to compute f_favail. Any idea??? */ buf->f_favail = buf->f_ffree; - /* Determining the flags is tricky. We have to read /proc/mount or - the /etc/matb file and search for the entry which matches the given + /* Determining the flags is tricky. We have to read /proc/mounts or + the /etc/mtab file and search for the entry which matches the given file. The way we can test for matching filesystem is using the device number. */ buf->f_flag = 0; diff --git a/test-skeleton.c b/test-skeleton.c index 418f69a..5bb5c44 100644 --- a/test-skeleton.c +++ b/test-skeleton.c @@ -164,11 +164,10 @@ main (int argc, char *argv[]) /* We don't expect any signal. */ # define EXPECTED_SIGNAL 0 #endif - if (WIFSIGNALED (status) != EXPECTED_SIGNAL) + if (WTERMSIG (status) != EXPECTED_SIGNAL) { fprintf (stderr, "Incorrect signal from child: got `%s', need `%s'\n", - strsignal (WIFSIGNALED (status)), - strsignal (EXPECTED_SIGNAL)); + strsignal (WTERMSIG (status)), strsignal (EXPECTED_SIGNAL)); exit (1); } -- 2.7.4