mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-30 22:43:12 +03:00
Update.
1997-10-26 18:12 Ulrich Drepper <drepper@cygnus.com> * libio/genops.c: Partial undo of last patch. * libio/stdfiles.c: Likewise. * libio/iofdopen.c: Use _IO_FILE_complete, not _IO_file_plus. * libio/iopopen.c: Likewise. * libio/iovdprintf.c: Likewise. * libio/libio.h: Remove duplicated `;'. * libio/stdio.c: Remove misleading comment. * libio/stdio.h: Declare standard streams as variables. * login/Makefile (distribute): Add README.utmpd. * login/README.utmpd: New file. Provided by Mark M. Kettenis <kettenis@phys.uva.nl>. * manual/job.texi: Document tcgetsid. * manual/pattern.texi: Document globfree. * manual/terminal.texi: Document B38400 ... B460800. * posix/confstr.c: Print "-D_FILE_OFFSET_SIZE=64" for _CS_LFS_CFLAGS. * posix/unistd.h: Add explanation of _POSIX_* constants. * posix/unists.h: Add prototypes for __pread, __pread64, __pwrite and __pwrite64. * sysdeps/generic/pread.c: Define as __pread and make pread weak alias. * sysdeps/generic/pread64.c: Likewise. * sysdeps/generic/pwrite.c: Likewise. * sysdeps/generic/pwrite64.c: Likewise. * sysdeps/posix/pread.c: Likewise. * sysdeps/posix/pwrite.c: Likewise. * sysdeps/posix/pread64.c: New file. * sysdeps/posix/pwrite64.c: Likewise. * sysdeps/unix/sysv/linux/Makefile [$(subdir)=posix] (sysdep_routines): Add s_pread64 and s_pwrite64. * sysdeps/unix/sysv/linux/pread.c: New file. * sysdeps/unix/sysv/linux/pread64.c: New file. * sysdeps/unix/sysv/linux/pwrite.c: New file. * sysdeps/unix/sysv/linux/pwrite64.c: New file. * sysdeps/unix/sysv/linux/s_pread64.c: New file. * sysdeps/unix/sysv/linux/s_pwrite64.c: New file. * sysdeps/unix/sysv/linux/syscalls.list: Add pread and pwrite. * sysdeps/unix/sysv/linux/alpha/pread64.c: New (empty) file. * sysdeps/unix/sysv/linux/alpha/pwrite64.c: New (empty) file. * sysdeps/unix/sysv/linux/sparc/sparc64/pread64.c: New (empty) file. * sysdeps/unix/sysv/linux/sparc/sparc64/pwrite64.c: New (empty) file. * sysdeps/unix/sysv/linux/alpha/syscalls.list: Add pread and pwrite with weak aliases for *64 functions. * sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list: Likewise. * string/bits/string2.h: Add casts to allow void * arguments. * sysdeps/i386/i486/bits/string.h: Define index and rindex only if __USE_BSD or __USE_XOPEN_EXTENDED. * sysdeps/unix/sysv/linux/bits/socket.h: Add SCM_RIGHTS and other SCM_* constants from kernel header. * termios/termios.h: Add prototype for tcgetsid. 1997-10-26 13:26 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * sunrpc/clnt_perr.c: Add trailing '\0' to strings. * sunrpc/get_myaddr.c: Include rpc/clnt.h for prototypes. * sunrpc/pmap_clnt.c: Use get_myaddress from header file. 1997-10-26 05:26 Ulrich Drepper <drepper@cygnus.com> * configure.in: Punt if any directory mentioned in the enable-add-on parameter does not exist. 1997-10-25 19:25 Ulrich Drepper <drepper@cygnus.com> * termios/Makefile (routines): Add tcgetsid. * termios/tcgetsid.c: New file. Provided by Mark M. Kettenis <kettenis@phys.uva.nl>. 1997-10-25 18:56 Ulrich Drepper <drepper@cygnus.com> * stdlib/stdlib.h: Remove mblen optimization. * stdlib/mblen.c: Rewrite to make sure global state is not changed. Reported by anderson@metrolink.com. 1997-10-19 21:51 Wolfram Gloger <wg@wolfram.dent.med.uni-muenchen.de> * malloc/thread-m.h [_LIBC]: Use new __libc_internal_tsd_{set,get} interface for thread-specific data. 1997-10-25 06:51 Ulrich Drepper <drepper@cygnus.com> * elf/dl-addr.c: Use braces for correct logical grouping. Patch by Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>. 1997-10-18 09:15 Geoff Keating <geoffk@ozemail.com.au> * io/ftwtest-sh: Sometimes /tmp is a symlink to somewhere more convenient; that caused this test to break. * sysdeps/powerpc/dl-machine.h: Fix typo. * sysdeps/powerpc/bits/fenv.h: Don't use floating-point registers when -msoft-float is in effect, because this causes compilation to stop. * sysdeps/powerpc/bits/mathinlines.h: Likewise. * rpm/template: Add description, use RPM flags rather than the ones used to build the spec. Build in a temporary directory, not /. * elf/dl-lookup.c: Don't include _itoa.h, it's not used. * elf/dl-minimal.c: Use _itoa_word rather than _itoa. It seems that _itoa is the only routine that ld.so uses that requires something from libgcc.a on powerpc, so it would be best to avoid it in ld.so. * elf/rtld.c: Likewise. * sysdeps/generic/_strerror.c: Likewise. * stdio-common/_itoa.c: Split out digits strings. * stdio-common/itoa-digits.c: New file. * stdio-common/Makefile: Add itoa-digits. 1997-10-21 Andreas Jaeger <aj@arthur.rhein-neckar.de> * manual/filesys.texi (Scanning Directory Content): Document error case more. * dirent/scandir.c (scandir): Ignore errors from select function. Suggested by urbanw@cs.umu.se (closes PR libc/316). 1997-10-25 06:18 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/sparc/sparc32/socket.S: Corrections. Patch by Erik Troan <ewt@redhat.com>. 1997-10-25 04:00 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/dl-cache.c (_dl_load_cache_lookup): Favour exact matching of version function if both the general (1) and glibc-specific (3) entry are present. 1997-10-22 18:47 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * sunrpc/rpc/clnt.h: Add get_myaddress prototype. * nis/libnsl.map: Fix typo. * nis/nis_call.c: Fix memory leak. 1997-10-22 19:29 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/memcmp.c: Define __P if not defined before. Patch by Jim Meyering <meyering@eng.ascend.com>. 1997-10-21 22:09 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/sys/prctl.h: New file by Richard Gooch <rgooch@atnf.csiro.au>. 1997-10-21 21:50 Ulrich Drepper <drepper@cygnus.com> * misc/syslog.c (vsyslog): Open console with O_NOCTTY. Patch by Zack Weinberg <zack@rabi.phys.columbia.edu>. 1997-10-21 18:07 Ulrich Drepper <drepper@cygnus.com> * posix/wordexp.c: Improve handling of $... expressions. Patch by Tim Waugh <tim@cyberelk.demon.co.uk>. 1997-10-21 16:12 Ulrich Drepper <drepper@cygnus.com> * manual/string.texi: Correct return values of bcopy and bzero. Patch by Matthew Wilcox <willy@odie.barnet.ac.uk>. 1997-10-18 15:03 Philip Blundell <Philip.Blundell@pobox.com> * sysdeps/unix/sysv/linux/bits/socket.h: Correct types of some elements in struct msghdr and struct cmsghdr, to keep in step with the kernel. 1997-10-17 22:29 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/sparc/sparc32/init-first.h: Fix another bug in startup code. Patch by Eric Delaunay <delaunay@lix.polytechnique.fr>. 1997-10-16 20:17 Richard Henderson <rth@cygnus.com> * sysdeps/unix/sysv/linux/sparc/sparc32/socket.S: Dump args to the stack and give the kernel a pointer. Use the sysdep.h macros. 1997-10-17 04:07 Ulrich Drepper <drepper@cygnus.com> * sysdeps/sparc/sparc32/elf/start.S: Calculate argv correctly. Patch by Eric Delaunay <delaunay@lix.polytechnique.fr>. 1997-10-16 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/libm-ieee754/s_nextafterxf.c [!__STDC__]: Correct typo. 1997-10-16 14:50 Ulrich Drepper <drepper@cygnus.com> * manual/pattern.texi: Document globfree. 1997-10-15 21:11 Philip Blundell <Philip.Blundell@pobox.com> * sysdeps/unix/sysv/linux/net/if_packet.h: New file. * sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Add net/if_packet.h. * sysdeps/unix/sysv/linux/net/if_arp.h (ARPHRD_ASH): New type, for 64Mbps ASH. (ARPHRD_ETHER): This is used for 100Mbps networks too. 1997-10-15 Andreas Jaeger <aj@arthur.rhein-neckar.de> * Makerules (install): Use full pathnames for linker script. This is to work around a limitation in `ld' while no better solution is possible. 1997-10-15 Andreas Jaeger <aj@arthur.rhein-neckar.de> * malloc/malloc.c (mmap_chunk): Put inline before static in function definition to avoid compiler warning. (malloc_extend): Likewise. * sysdeps/generic/des_impl.c: Include "des.h" to avoid warning. 1997-10-15 Andreas Jaeger <aj@arthur.rhein-neckar.de> * NEWS: Fix @gnu.ai.mit.edu -> @gnu.org. * README.template: Likewise. * db/makedb.c: Likewise. * elf/ldd.bash.in: Likewise. * elf/ldd.sh.in: Likewise. * intl/locale.alias: Likewise. * login/programs/utmpd.c: Likewise. * libio/stdfiles.c [!_IO_MTSAFE] (DEF_STDFILE): Fix parameter list. 1997-10-14 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Rules: Remove all empty.* files. (shared-only-routines): Correct implementation. 1997-10-14 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/libm-ieee754/s_lrintl.c: Make compilable. * sysdeps/libm-ieee754/s_llrintl.c: Likewise. Optimized. 1997-10-14 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * elf/ldd.bash.in: Only prepend ./ if the file contains no slash at all. * elf/ldd.sh.in: Likewise. 1997-10-14 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/sys/ucontext.h: New file. 1997-10-13 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/fpu/s_scalbln.c: New (empty) file. * sysdeps/m68k/fpu/s_scalblnf.c: New (empty) file. * sysdeps/m68k/fpu/s_scalblnl.c: New (empty) file. * sysdeps/m68k/fpu/s_scalbn.c: Add scalbln alias. * sysdeps/m68k/fpu/s_scalbnf.c: Adapted. * sysdeps/m68k/fpu/s_scalbnl.c: Adapted. * sysdeps/m68k/fpu/s_lrint.c: Add standard skeleton stuff. * sysdeps/m68k/fpu/s_lrintf.c: New file. * sysdeps/m68k/fpu/s_lrintl.c: New file. * sysdeps/m68k/fpu/bits/mathinline.h: Add fma and scalbln. Update lrint and scalbn. (__m81_inline) [__cplusplus]: Define to __inline. * math/bits/mathcalls.h: Remove whitespace before second argument of __MATHDECL. Add note explaining this. 1997-10-13 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * manual/arith.texi (Absolute Value): Spelling fix. 1997-10-13 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * malloc/obstack.h (obstack_empty_p) [!__GNUC__]: Properly parenthesize the macro parameter. * Rules: Remove rules to magically install <subdir>.h headers.
This commit is contained in:
Ulrich Drepper
@ -52,16 +52,22 @@
|
||||
|
||||
# if __BYTE_ORDER == __LITTLE_ENDIAN
|
||||
# define __STRING2_SMALL_GET16(src, idx) \
|
||||
(((src)[idx + 1] << 8) | (src)[idx])
|
||||
(((__const unsigned char *) (src))[idx + 1] << 8 \
|
||||
| ((__const unsigned char *) (src))[idx])
|
||||
# define __STRING2_SMALL_GET32(src, idx) \
|
||||
((((src)[idx + 3] << 8 | (src)[idx + 2]) << 8 \
|
||||
| (src)[idx + 1]) << 8 | (src)[idx])
|
||||
(((((__const unsigned char *) (src))[idx + 3] << 8 \
|
||||
| ((__const char *) (src))[idx + 2]) << 8 \
|
||||
| ((__const unsigned char *) (src))[idx + 1]) << 8 \
|
||||
| ((__const unsigned char *) (src))[idx])
|
||||
# else
|
||||
# define __STRING2_SMALL_GET16(src, idx) \
|
||||
(((src)[idx] << 8) | (src)[idx + 1])
|
||||
(((__const unsigned char *) (src))[idx] << 8 \
|
||||
| ((__const unsigned char *) (src))[idx + 1])
|
||||
# define __STRING2_SMALL_GET32(src, idx) \
|
||||
((((src)[idx] << 8 | (src)[idx + 1]) << 8 \
|
||||
| (src)[idx + 2]) << 8 | (src)[idx + 3])
|
||||
(((((__const unsigned char *) (src))[idx] << 8 \
|
||||
| ((__const unsigned char *) (src))[idx + 1]) << 8 \
|
||||
| ((__const unsigned char *) (src))[idx + 2]) << 8 \
|
||||
| ((__const unsigned char *) (src))[idx + 3])
|
||||
# endif
|
||||
#else
|
||||
/* These are a few types we need for the optimizations if we cannot
|
||||
@ -159,43 +165,66 @@ __STRING2_COPY_TYPE (8);
|
||||
break; \
|
||||
case 2: \
|
||||
*((__STRING2_COPY_ARR2 *) __dest) = \
|
||||
((__STRING2_COPY_ARR2) { { (src)[0], '\0' } }); \
|
||||
((__STRING2_COPY_ARR2) \
|
||||
{ { ((__const unsigned char *) (src))[0], \
|
||||
'\0' } }); \
|
||||
break; \
|
||||
case 3: \
|
||||
*((__STRING2_COPY_ARR3 *) __dest) = \
|
||||
((__STRING2_COPY_ARR3) { { (src)[0], (src)[1], \
|
||||
'\0' } }); \
|
||||
((__STRING2_COPY_ARR3) \
|
||||
{ { ((__const unsigned char *) (src))[0], \
|
||||
((__const unsigned char *) (src))[1], \
|
||||
'\0' } }); \
|
||||
break; \
|
||||
case 4: \
|
||||
*((__STRING2_COPY_ARR4 *) __dest) = \
|
||||
((__STRING2_COPY_ARR4) { { (src)[0], (src)[1], \
|
||||
(src)[2], '\0' } }); \
|
||||
((__STRING2_COPY_ARR4) \
|
||||
{ { ((__const unsigned char *) (src))[0], \
|
||||
((__const unsigned char *) (src))[1], \
|
||||
((__const unsigned char *) (src))[2], \
|
||||
'\0' } }); \
|
||||
break; \
|
||||
case 5: \
|
||||
*((__STRING2_COPY_ARR5 *) __dest) = \
|
||||
((__STRING2_COPY_ARR5) { { (src)[0], (src)[1], \
|
||||
(src)[2], (src)[3], \
|
||||
'\0' } }); \
|
||||
((__STRING2_COPY_ARR5) \
|
||||
{ { ((__const unsigned char *) (src))[0], \
|
||||
((__const unsigned char *) (src))[1], \
|
||||
((__const unsigned char *) (src))[2], \
|
||||
((__const unsigned char *) (src))[3], \
|
||||
'\0' } }); \
|
||||
break; \
|
||||
case 6: \
|
||||
*((__STRING2_COPY_ARR6 *) __dest) = \
|
||||
((__STRING2_COPY_ARR6) { { (src)[0], (src)[1], \
|
||||
(src)[2], (src)[3], \
|
||||
(src)[4], '\0' } }); \
|
||||
((__STRING2_COPY_ARR6) \
|
||||
{ { ((__const unsigned char *) (src))[0], \
|
||||
((__const unsigned char *) (src))[1], \
|
||||
((__const unsigned char *) (src))[2], \
|
||||
((__const unsigned char *) (src))[3], \
|
||||
((__const unsigned char *) (src))[4], \
|
||||
'\0' } }); \
|
||||
break; \
|
||||
case 7: \
|
||||
*((__STRING2_COPY_ARR7 *) __dest) = \
|
||||
((__STRING2_COPY_ARR7) { { (src)[0], (src)[1], \
|
||||
(src)[2], (src)[3], \
|
||||
(src)[4], (src)[5], \
|
||||
'\0' } }); \
|
||||
((__STRING2_COPY_ARR7) \
|
||||
{ { ((__const unsigned char *) (src))[0], \
|
||||
((__const unsigned char *) (src))[1], \
|
||||
((__const unsigned char *) (src))[2], \
|
||||
((__const unsigned char *) (src))[3], \
|
||||
((__const unsigned char *) (src))[4], \
|
||||
((__const unsigned char *) (src))[5], \
|
||||
'\0' } }); \
|
||||
break; \
|
||||
case 8: \
|
||||
*((__STRING2_COPY_ARR8 *) __dest) = \
|
||||
((__STRING2_COPY_ARR8) { { (src)[0], (src)[1], \
|
||||
(src)[2], (src)[3], \
|
||||
(src)[4], (src)[5], \
|
||||
(src)[6], '\0' } }); \
|
||||
((__STRING2_COPY_ARR8) \
|
||||
{ { ((__const unsigned char *) (src))[0], \
|
||||
((__const unsigned char *) (src))[1], \
|
||||
((__const unsigned char *) (src))[2], \
|
||||
((__const unsigned char *) (src))[3], \
|
||||
((__const unsigned char *) (src))[4], \
|
||||
((__const unsigned char *) (src))[5], \
|
||||
((__const unsigned char *) (src))[6], \
|
||||
'\0' } }); \
|
||||
break; \
|
||||
} \
|
||||
(char *) __dest; }))
|
||||
@ -280,43 +309,66 @@ __STRING2_COPY_TYPE (8);
|
||||
break; \
|
||||
case 2: \
|
||||
*((__STRING2_COPY_ARR2 *) __dest) = \
|
||||
((__STRING2_COPY_ARR2) { { (src)[0], '\0' } }); \
|
||||
((__STRING2_COPY_ARR2) \
|
||||
{ { ((__const unsigned char *) (src))[0], \
|
||||
'\0' } }); \
|
||||
break; \
|
||||
case 3: \
|
||||
*((__STRING2_COPY_ARR3 *) __dest) = \
|
||||
((__STRING2_COPY_ARR3) { { (src)[0], (src)[1], \
|
||||
'\0' } }); \
|
||||
((__STRING2_COPY_ARR3) \
|
||||
{ { ((__const unsigned char *) (src))[0], \
|
||||
((__const unsigned char *) (src))[1], \
|
||||
'\0' } }); \
|
||||
break; \
|
||||
case 4: \
|
||||
*((__STRING2_COPY_ARR4 *) __dest) = \
|
||||
((__STRING2_COPY_ARR4) { { (src)[0], (src)[1], \
|
||||
(src)[2], '\0' } }); \
|
||||
((__STRING2_COPY_ARR4) \
|
||||
{ { ((__const unsigned char *) (src))[0], \
|
||||
((__const unsigned char *) (src))[1], \
|
||||
((__const unsigned char *) (src))[2], \
|
||||
'\0' } }); \
|
||||
break; \
|
||||
case 5: \
|
||||
*((__STRING2_COPY_ARR5 *) __dest) = \
|
||||
((__STRING2_COPY_ARR5) { { (src)[0], (src)[1], \
|
||||
(src)[2], (src)[3], \
|
||||
'\0' } }); \
|
||||
((__STRING2_COPY_ARR5) \
|
||||
{ { ((__const unsigned char *) (src))[0], \
|
||||
((__const unsigned char *) (src))[1], \
|
||||
((__const unsigned char *) (src))[2], \
|
||||
((__const unsigned char *) (src))[3], \
|
||||
'\0' } }); \
|
||||
break; \
|
||||
case 6: \
|
||||
*((__STRING2_COPY_ARR6 *) __dest) = \
|
||||
((__STRING2_COPY_ARR6) { { (src)[0], (src)[1], \
|
||||
(src)[2], (src)[3], \
|
||||
(src)[4], '\0' } }); \
|
||||
((__STRING2_COPY_ARR6) \
|
||||
{ { ((__const unsigned char *) (src))[0], \
|
||||
((__const unsigned char *) (src))[1], \
|
||||
((__const unsigned char *) (src))[2], \
|
||||
((__const unsigned char *) (src))[3], \
|
||||
((__const unsigned char *) (src))[4], \
|
||||
'\0' } }); \
|
||||
break; \
|
||||
case 7: \
|
||||
*((__STRING2_COPY_ARR7 *) __dest) = \
|
||||
((__STRING2_COPY_ARR7) { { (src)[0], (src)[1], \
|
||||
(src)[2], (src)[3], \
|
||||
(src)[4], (src)[5], \
|
||||
'\0' } }); \
|
||||
((__STRING2_COPY_ARR7) \
|
||||
{ { ((__const unsigned char *) (src))[0], \
|
||||
((__const unsigned char *) (src))[1], \
|
||||
((__const unsigned char *) (src))[2], \
|
||||
((__const unsigned char *) (src))[3], \
|
||||
((__const unsigned char *) (src))[4], \
|
||||
((__const unsigned char *) (src))[5], \
|
||||
'\0' } }); \
|
||||
break; \
|
||||
case 8: \
|
||||
*((__STRING2_COPY_ARR8 *) __dest) = \
|
||||
((__STRING2_COPY_ARR8) { { (src)[0], (src)[1], \
|
||||
(src)[2], (src)[3], \
|
||||
(src)[4], (src)[5], \
|
||||
(src)[6], '\0' } }); \
|
||||
((__STRING2_COPY_ARR8) \
|
||||
{ { ((__const unsigned char *) (src))[0], \
|
||||
((__const unsigned char *) (src))[1], \
|
||||
((__const unsigned char *) (src))[2], \
|
||||
((__const unsigned char *) (src))[3], \
|
||||
((__const unsigned char *) (src))[4], \
|
||||
((__const unsigned char *) (src))[5], \
|
||||
((__const unsigned char *) (src))[6], \
|
||||
'\0' } }); \
|
||||
break; \
|
||||
} \
|
||||
(char *) (__dest + ((srclen) - 1)); }))
|
||||
@ -390,49 +442,63 @@ __STRING2_COPY_TYPE (8);
|
||||
: strcmp (s1, s2)))))
|
||||
|
||||
# define __strcmp_cc(s1, s2, l) \
|
||||
(__extension__ ({ register int __result = ((unsigned char) (s1)[0] \
|
||||
- (unsigned char) (s2)[0]); \
|
||||
(__extension__ ({ register int __result = \
|
||||
(((__const unsigned char *) (s1))[0] \
|
||||
- ((__const unsigned char *) (s2))[0]); \
|
||||
if (l > 0 && __result == 0) \
|
||||
{ \
|
||||
__result = ((unsigned char) (s1)[1] \
|
||||
- (unsigned char) (s2)[1]); \
|
||||
__result = (((__const unsigned char *) (s1))[1] \
|
||||
- ((__const unsigned char *) (s2))[1]); \
|
||||
if (l > 1 && __result == 0) \
|
||||
{ \
|
||||
__result = ((unsigned char) (s1)[2] \
|
||||
- (unsigned char) (s2)[2]); \
|
||||
__result = \
|
||||
(((__const unsigned char *) (s1))[2] \
|
||||
- ((__const unsigned char *) (s2))[2]); \
|
||||
if (l > 2 && __result == 0) \
|
||||
__result = ((unsigned char) (s1)[3] \
|
||||
- (unsigned char) (s2)[3]); \
|
||||
__result = \
|
||||
(((__const unsigned char *) (s1))[3] \
|
||||
- ((__const unsigned char *) (s2))[3]); \
|
||||
} \
|
||||
} \
|
||||
__result; }))
|
||||
|
||||
# define __strcmp_cg(s1, s2, l1) \
|
||||
(__extension__ ({ __const unsigned char *__s2 = (unsigned char *) (s2); \
|
||||
register int __result = (unsigned char) (s1)[0] - __s2[0];\
|
||||
(__extension__ ({ __const unsigned char *__s2 = \
|
||||
(__const unsigned char *) (s2); \
|
||||
register int __result = \
|
||||
(((__const unsigned char *) (s1))[0] - __s2[0]); \
|
||||
if (l1 > 0 && __result == 0) \
|
||||
{ \
|
||||
__result = (unsigned char) (s1)[1] - __s2[1]; \
|
||||
__result = (((__const unsigned char *) (s1))[1] \
|
||||
- __s2[1]); \
|
||||
if (l1 > 1 && __result == 0) \
|
||||
{ \
|
||||
__result = (unsigned char) (s1)[2] - __s2[2]; \
|
||||
__result = (((__const unsigned char *) (s1))[2] \
|
||||
- __s2[2]); \
|
||||
if (l1 > 2 && __result == 0) \
|
||||
__result = (unsigned char) (s1)[3] - __s2[3]; \
|
||||
__result = (((__const unsigned char *) (s1))[3] \
|
||||
- __s2[3]); \
|
||||
} \
|
||||
} \
|
||||
__result; }))
|
||||
|
||||
# define __strcmp_gc(s1, s2, l2) \
|
||||
(__extension__ ({ __const unsigned char *__s1 = (unsigned char *) (s1); \
|
||||
register int __result = __s1[0] - (unsigned char) (s2)[0];\
|
||||
(__extension__ ({ __const unsigned char *__s1 = \
|
||||
(__const unsigned char *) (s1); \
|
||||
register int __result = \
|
||||
__s1[0] - ((__const unsigned char *) (s2))[0]; \
|
||||
if (l2 > 0 && __result == 0) \
|
||||
{ \
|
||||
__result = __s1[1] - (unsigned char) (s2)[1]; \
|
||||
__result = (__s1[1] \
|
||||
- ((__const unsigned char *) (s2))[1]); \
|
||||
if (l2 > 1 && __result == 0) \
|
||||
{ \
|
||||
__result = __s1[2] - (unsigned char) (s2)[2]; \
|
||||
__result = \
|
||||
(__s1[2] - ((__const unsigned char *) (s2))[2]);\
|
||||
if (l2 > 2 && __result == 0) \
|
||||
__result = __s1[3] - (unsigned char) (s2)[3]; \
|
||||
__result = \
|
||||
(__s1[3] \
|
||||
- ((__const unsigned char *)(s2))[3]); \
|
||||
} \
|
||||
} \
|
||||
__result; }))
|
||||
@ -455,10 +521,10 @@ __STRING2_COPY_TYPE (8);
|
||||
#ifndef _HAVE_STRING_ARCH_strcspn
|
||||
# define strcspn(s, reject) \
|
||||
(__extension__ (__builtin_constant_p (reject) && __string2_1bptr_p (reject) \
|
||||
? ((reject)[0] == '\0' \
|
||||
? (((__const unsigned char *) (reject))[0] == '\0' \
|
||||
? strlen (s) \
|
||||
: ((reject)[1] == '\0' \
|
||||
? __strcspn_c1 (s, (reject)[0]) \
|
||||
: (((__const unsigned char *) (reject))[1] == '\0' \
|
||||
? __strcspn_c1 (s, ((__const char *) (reject))[0]) \
|
||||
: strcspn (s, reject))) \
|
||||
: strcspn (s, reject)))
|
||||
|
||||
@ -479,10 +545,10 @@ __strcspn_c1 (__const char *__s, char __reject)
|
||||
#ifndef _HAVE_STRING_ARCH_strspn
|
||||
# define strspn(s, accept) \
|
||||
(__extension__ (__builtin_constant_p (accept) && __string2_1bptr_p (accept) \
|
||||
? ((accept)[0] == '\0' \
|
||||
? (((__const unsigned char *) (accept))[0] == '\0' \
|
||||
? 0 \
|
||||
: ((accept)[1] == '\0' \
|
||||
? __strspn_c1 (s, (accept)[0]) \
|
||||
: (((__const unsigned char *) (accept))[1] == '\0' \
|
||||
? __strspn_c1 (s, ((__const char *) (accept))[0]) \
|
||||
: strspn (s, accept))) \
|
||||
: strspn (s, accept)))
|
||||
|
||||
@ -503,10 +569,10 @@ __strspn_c1 (__const char *__s, char __accept)
|
||||
#ifndef _HAVE_STRING_ARCH_strpbrk
|
||||
# define strpbrk(s, accept) \
|
||||
(__extension__ (__builtin_constant_p (accept) && __string2_1bptr_p (accept) \
|
||||
? ((accept)[0] == '\0' \
|
||||
? (((__const unsigned char *) (accept))[0] == '\0' \
|
||||
? NULL \
|
||||
: ((accept)[1] == '\0' \
|
||||
? strchr (s, (accept)[0]) \
|
||||
: (((__const unsigned char *) (accept))[1] == '\0' \
|
||||
? strchr (s, ((__const unsigned char *) (accept))[0]) \
|
||||
: strpbrk (s, accept))) \
|
||||
: strpbrk (s, accept)))
|
||||
#endif
|
||||
@ -516,10 +582,11 @@ __strspn_c1 (__const char *__s, char __accept)
|
||||
#ifndef _HAVE_STRING_ARCH_strstr
|
||||
# define strstr(haystack, needle) \
|
||||
(__extension__ (__builtin_constant_p (needle) && __string2_1bptr_p (needle) \
|
||||
? ((needle)[0] == '\0' \
|
||||
? (((__const unsigned char *) (needle))[0] == '\0' \
|
||||
? haystack \
|
||||
: ((needle)[1] == '\0' \
|
||||
? strchr (haystack, (needle)[0]) \
|
||||
: (((__const unsigned char *) (needle))[1] == '\0' \
|
||||
? strchr (haystack, \
|
||||
((__const unsigned char *) (needle))[0]) \
|
||||
: strstr (haystack, needle))) \
|
||||
: strstr (haystack, needle)))
|
||||
#endif
|
||||
@ -543,8 +610,10 @@ strnlen (__const char *__string, size_t __maxlen)
|
||||
|
||||
# define strsep(s, reject) \
|
||||
(__extension__ (__builtin_constant_p (reject) && __string2_1bptr_p (reject) \
|
||||
? ((reject)[0] != '\0' && (reject)[1] == '\0' \
|
||||
? __strsep_1c (s, (reject)[0]) \
|
||||
? (((__const unsigned char *) (reject))[0] != '\0' \
|
||||
&& ((__const unsigned char *) (reject))[1] == '\0' \
|
||||
? __strsep_1c (s, \
|
||||
((__const unsigned char *) (reject))[0]) \
|
||||
: __strsep_g (s, reject)) \
|
||||
: __strsep_g (s, reject)))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user