diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-02-23 20:29:25 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-02-23 20:29:25 +0000 |
| commit | d436a9f71094ec7fc8e946058af20a1c167df791 (patch) | |
| tree | a4b982297630c5af186566289301e8f084b18d04 /sysdeps/generic | |
| parent | 578af3381518983dccfb99df52cc917c43f38542 (diff) | |
| download | glibc-d436a9f71094ec7fc8e946058af20a1c167df791.zip glibc-d436a9f71094ec7fc8e946058af20a1c167df791.tar.gz glibc-d436a9f71094ec7fc8e946058af20a1c167df791.tar.bz2 | |
Update.
2001-02-23 Andreas Jaeger <aj@suse.de>
* string/tester.c (test_strtok_r): Add testcase.
(test_strtok_r): Always initialize cp for proper checking.
* sysdeps/generic/strtok.c (strtok): Handle case of first strtok
returning NULL correctly.
Patch by Fumitoshi UKAI <ukai@debian.or.jp>.
* sysdeps/generic/strtok_r.c (__strtok_r): Likewise.
2001-02-23 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/aix/bits/types.h: Define __need_NULL before
including <stddef.h>.
* sysdeps/unix/sysv/aix/write.c: Define alias __libc_write.
* include/libc-symbols.h (weak_alias): Don't use .weak if
HAVE_ASM_GLOBAL_DOT_NAME is defined.
Patches by Michael Keezer <mkeezer@redhat.com>.
* sysdeps/generic/ftime.c: Don't include <sys/time.h> at all.
Patch by Michael Keezer <mkeezer@redhat.com>.
* sysdeps/unix/sysv/aix/Dist: Remove restf.S and savef.S.
* sysdeps/unix/sysv/aix/Makefile [$(subdir) == misc]
(sysdep_routines): Remove restf.S and savef.S.
* sysdeps/unix/sysv/aix/restf.S. Removed.
* sysdeps/unix/sysv/aix/savef.S. Removed.
* sysdeps/powerpc/fprrest.S: Use C_TEXT to define label. Also define
alternative names used on some platforms.
* sysdeps/powerpc/fprsave.S: Likewise.
* sysdeps/powerpc/gprrest0.S: Likewise.
* sysdeps/powerpc/gprrest1.S: Likewise.
* sysdeps/powerpc/gprsave0.S: Likewise.
* sysdeps/powerpc/gprsave1.S: Likewise.
Patch by Michael Keezer <mkeezer@redhat.com>.
Diffstat (limited to 'sysdeps/generic')
| -rw-r--r-- | sysdeps/generic/ftime.c | 3 | ||||
| -rw-r--r-- | sysdeps/generic/strtok.c | 7 | ||||
| -rw-r--r-- | sysdeps/generic/strtok_r.c | 7 |
3 files changed, 11 insertions, 6 deletions
diff --git a/sysdeps/generic/ftime.c b/sysdeps/generic/ftime.c index 3e9852c..db692fa 100644 --- a/sysdeps/generic/ftime.c +++ b/sysdeps/generic/ftime.c @@ -16,10 +16,9 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include <errno.h> #include <time.h> #include <sys/timeb.h> -#include <sys/time.h> -#include <errno.h> int ftime (timebuf) diff --git a/sysdeps/generic/strtok.c b/sysdeps/generic/strtok.c index b6f9523..451fd1e 100644 --- a/sysdeps/generic/strtok.c +++ b/sysdeps/generic/strtok.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1996, 1997, 1999, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1991,1996,1997,1999,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 @@ -45,7 +45,10 @@ strtok (s, delim) /* Scan leading delimiters. */ s += strspn (s, delim); if (*s == '\0') - return NULL; + { + olds = s; + return NULL; + } /* Find the end of the token. */ token = s; diff --git a/sysdeps/generic/strtok_r.c b/sysdeps/generic/strtok_r.c index 4acda14..7e6d774 100644 --- a/sysdeps/generic/strtok_r.c +++ b/sysdeps/generic/strtok_r.c @@ -1,5 +1,5 @@ /* Reentrant string tokenizer. Generic version. - Copyright (C) 1991, 1996, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1991, 1996, 1997, 1998, 1999, 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 @@ -46,7 +46,10 @@ __strtok_r (s, delim, save_ptr) /* Scan leading delimiters. */ s += strspn (s, delim); if (*s == '\0') - return NULL; + { + *save_ptr = s; + return NULL; + } /* Find the end of the token. */ token = s; |