diff options
author | Ulrich Drepper <drepper@redhat.com> | 1998-03-18 14:42:25 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1998-03-18 14:42:25 +0000 |
commit | 3116126871400c8737a9df0145f66534f097c06c (patch) | |
tree | 9a41a87b932c3963a7d482ceabc8de92c69bef5b /string/bits/string2.h | |
parent | 52cda95831cdc685d74b99334a06fb1f69996dc4 (diff) | |
download | glibc-3116126871400c8737a9df0145f66534f097c06c.tar.gz glibc-3116126871400c8737a9df0145f66534f097c06c.tar.xz glibc-3116126871400c8737a9df0145f66534f097c06c.zip |
Update.
1998-03-18 14:25 Ulrich Drepper <drepper@cygnus.com> * string/bits/string2.h: Add optimization for strdup. Always define __strsep and __strtok_r and make real names available when feature select macros are defined. 1998-03-18 Andreas Jaeger <aj@arthur.rhein-neckar.de> * manual/install.texi (Installation): Use i486-linux as example instead of the unsupported sunos4. (Reporting Bugs): Mention glibcbug script. (Tools for Installation): gcc 2.8.1/egcs 1.0.2 is required. 1998-03-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * posix/wordexp-tst.sh: Make portable. Add more tests. * posix/Makefile (do-globtest do-wordexp-test): New targets. 1998-03-18 13:38 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/libc-start.c: Moved to ... * sysdeps/generic/libc-start.c: ...here, replacing former content. * sysdeps/unix/sysv/linux/Dist: Add netash/ash.h and netpacket/packet.h. * sysdeps/unix/sysv/linux/bits/socket.h: Pretty print. 1998-03-17 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/bits/resource.h: Remove trailing comma in enumerator for strict standard compliance. * sysdeps/generic/bits/resource.h: Likewise. 1998-03-18 10:04 Philip Blundell <pb@nexus.co.uk> * sysdeps/arm/sysdep.h (__ARM_USES_FP): Deleted. (PLTJMP): New macro. * sysdeps/arm/fpu/__longjmp.S: New file, implementation of longjmp() when floating point enabled. * sysdeps/arm/fpu/setjmp.S: Likewise for setjmp(). * sysdeps/arm/__longjmp.S: Remove floating point code. * sysdeps/arm/setjmp.S: Likewise. * sysdeps/arm/bsd-setjmp.S: Call __sigsetjmp by correct name. * sysdeps/arm/bsd-_setjmp.S: Likewise. * sysdeps/arm/memset.S: New file; optimised ARM implementation of memset(). * sysdeps/generic/setsockopt.c (setsockopt): Keep in step with prototype. 1998-03-17 16:16 Philip Blundell <pb@nexus.co.uk> Based on patches from Pat Beirne and Scott Bambrough: * sysdeps/arm/__longjmp.S: Use ip, not r2, as temporary. * sysdeps/arm/bits/fenv.h: New file. * sysdeps/arm/dl-machine.h: New file. Add ELF support. * sysdeps/arm/elf/setjmp.S: Likewise. * sysdeps/arm/elf/start.S: Likewise. * sysdeps/arm/init-first.c: Likewise. * sysdeps/arm/setjmp.S: Call __sigjmp_save through PLT * sysdeps/arm/sysdep.h: Change format of .type directive. Correct comment about floating point to reflect current reality. * sysdeps/unix/arm/brk.S: Support PIC. * sysdeps/unix/arm/sysdep.S (syscall_error): Support PIC and re-entrant code. * sysdeps/unix/sysv/linux/arm/socket.S: Check correctly for error return; call syscall_error through PLT. * sysdeps/unix/sysv/linux/arm/sysdep.h (ENTRY): Correct error jump. 1998-03-04 12:01 Philip Blundell <pb@nexus.co.uk> * sysdeps/unix/sysv/linux/netpacket/packet.h: New file. * sysdeps/unix/sysv/linux/netash/ash.h: Likewise. * sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Install them.
Diffstat (limited to 'string/bits/string2.h')
-rw-r--r-- | string/bits/string2.h | 37 |
1 files changed, 31 insertions, 6 deletions
diff --git a/string/bits/string2.h b/string/bits/string2.h index 3104f949ba..4b8f161aa1 100644 --- a/string/bits/string2.h +++ b/string/bits/string2.h @@ -704,9 +704,8 @@ strnlen (__const char *__string, size_t __maxlen) #endif -#if defined __USE_POSIX || defined __USE_MISC -# ifndef _HAVE_STRING_ARCH_strtok_r -# define strtok_r(s, sep, nextp) \ +#ifndef _HAVE_STRING_ARCH_strtok_r +# define __strtok_r(s, sep, nextp) \ (__extension__ (__builtin_constant_p (sep) && __string2_1bptr_p (sep) \ ? (((__const unsigned char *) (sep))[0] != '\0' \ && ((__const unsigned char *) (sep))[1] == '\0' \ @@ -740,14 +739,15 @@ __strtok_r_1c (char *__s, char __sep, char **__nextp) } return __result; } +# if defined __USE_POSIX || defined __USE_MISC +# define strtok_r(s, sep, nextp) __strtok_r (s, sep, nextp) # endif #endif -#ifdef __USE_BSD -# ifndef _HAVE_STRING_ARCH_strsep +#ifndef _HAVE_STRING_ARCH_strsep -# define strsep(s, reject) \ +# define __strsep(s, reject) \ (__extension__ (__builtin_constant_p (reject) && __string2_1bptr_p (reject) \ && ((__const unsigned char *) (reject))[0] != '\0' \ ? (((__const unsigned char *) (reject))[1] == '\0' \ @@ -844,6 +844,31 @@ __strsep_g (char **__s, __const char *__reject) *(*__s)++ = '\0'; return __retval; } +# ifdef __USE_BSD +# define strsep(s, reject) __strsep (s, reject) +# endif +#endif + + +#if !defined _HAVE_STRING_ARCH_strdup && !defined __STRICT_ANSI__ + +/* We need the memory allocation functions. Including this header is + not allowed. */ +# include <stdlib.h> + +# define __strdup(s) \ + (__extension__ (__builtin_constant_p (s) && __string2_1bptr_p (s) + ? (((__const unsigned char *) (s))[0] == '\0' + ? return (char *) calloc (1, 1); + : ({ size_t len = strlen (s) + 1; + char *retval = (char *) malloc (len); + if (retval != NULL) + retval = (char *) memcpy (retval, s, len); + retval; })) + : strdup (s))) + +# if defined __USE_SVID || defined __USE_BSD || defined __USE_XOPEN_EXTENDED +# define strdup(s) __strdup (s) # endif #endif |