6d52618b15
Thu Dec 19 23:28:33 1996 Ulrich Drepper <drepper@cygnus.com> * resolv/resolv.h: Update from BIND 4.9.5-P1. * resolv/res_comp.c: Likewise. * resolv/res_debug.c: Likewise. * resolv/Banner: Update version number. Thu Dec 19 20:58:53 1996 Ulrich Drepper <drepper@cygnus.com> * elf/dlfcn.h: Add extern "C" wrapper. * io/utime.h: Don't define NULL since this isn't allowed in POSIX. * io/sys/stat.h: Declare `lstat' only if __USE_BSD || __USE_XOPEN_EXTENDED. * locale/locale.h: Define NULL. * math/math.c: Don't include <errno.h> to define math errors. * stdlib/stdlib.h: Likewise. * posix/unistd.h: Don't declare environ. * posix/sys/utsname.h (struct utsname): Declare member domainname as __domainname is !__USE_GNU. * signal/signal.h: Declare size_t only if __USE_BSD || __USE_XOPEN_EXTENDED. * stdio/stdio.h: Don't declare cuserid when __USE_POSIX, but instead when __USE_XOPEN. * string/string.h: Define strndup only if __USE_GNU. * sysdeps/unix/sysv/linux/clock.c: New file. * sysdeps/unix/sysv/linux/timebits.h: Define CLOCKS_PER_SEC as 1000000 per X/Open standard. * features.h: Add code to recognize _POSIX_C_SOURCE value 199309. Define __USE_POSIX199309. * posix/unistd.h: Declare fdatasync only if __USE_POSIX199309. * time/time.c: Declare nanosleep only if __USE_POSIX199309. Patches by Rüdiger Helsch <rh@unifix.de>. * locale/locale.h: Add declaration of newlocale and freelocale. * new-malloc/Makefile (distibute): Add mtrace.awk. (dist-routines): Add mcheck and mtrace. (install-lib, non-lib.a): Define as libmcheck.a. * new-malloc/malloc.h: Add declaration of __malloc_initialized. * new-malloc/mcheck.c: New file. * new-malloc/mcheck.h: New file. * new-malloc/mtrace.c: New file. * new-malloc/mtrace.awk: New file. * posix/unistd.h: Correct prototype for usleep. * sysdeps/unix/bsd/usleep.c: De-ANSI-declfy. Correct return type. * sysdeps/unix/sysv/linux/usleep.c: Real implementation based on nanosleep. * signal/signal.h: Change protoype of __sigpause to take two arguments. Remove prototype for sigpause. Add two different macros named sigpause selected when __USE_BSD or __USE_XOPEN are defined. This is necessary since the old BSD definition of theis function collides with the X/Open definition. * sysdeps/posix/sigpause.c: Change function definition to also fit X/Open definition. * sysdeps/libm-i387/e_exp.S: Make sure stack is empty when the function is left. * sysdeps/libm-i387/e_expl.S: Likewise. Patch by HJ Lu. 1996-12-17 Paul Eggert <eggert@twinsun.com> * many, many files: Spelling corrections. * catgets/catgetsinfo.h (mmapped): Renamed from mmaped (in struct catalog_info.status). * mach/err_kern.sub (err_codes_unix), string/stratcliff.c (main): Fix spelling in message. * po/libc.pot: Fix spelling in message for `zic'; this anticipates a fix in the tzcode distribution. Wed Dec 18 15:48:02 1996 Ulrich Drepper <drepper@cygnus.com> * time/strftime.c: Implement ^ flag to cause output be converted to use upper case characters. * time/zic.c: Update from ADO tzcode1996n. Wed Dec 18 14:29:24 1996 Erik Naggum <erik@naggum.no> * time/strftime.c (add): Don't change global `i' until all is over. Define NULL is not already defined. Tue Dec 17 09:49:03 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * libio/iovsprintf.c (_IO_vsprintf): Change `&sf' to `&sf._sbf._f' to avoid the need for a cast. * libio/iovsscanf.c (_IO_vsscanf): Likewise. * sunrpc/rpc/xdr.h: Add prototype for xdr_free.
118 lines
2.7 KiB
C
118 lines
2.7 KiB
C
/* Copyright (C) 1994, 1996 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
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 of the
|
|
License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
/*
|
|
* My personal strstr() implementation that beats most other algorithms.
|
|
* Until someone tells me otherwise, I assume that this is the
|
|
* fastest implementation of strstr() in C.
|
|
* I deliberately chose not to comment it. You should have at least
|
|
* as much fun trying to understand it, as I had to write it :-).
|
|
*
|
|
* Stephen R. van den Berg, berg@pool.informatik.rwth-aachen.de */
|
|
|
|
#include <string.h>
|
|
#include <sys/types.h>
|
|
|
|
typedef unsigned chartype;
|
|
|
|
char *
|
|
strstr (phaystack, pneedle)
|
|
const char *phaystack;
|
|
const char *pneedle;
|
|
{
|
|
register const unsigned char *haystack, *needle;
|
|
register chartype b, c;
|
|
|
|
haystack = (const unsigned char *) phaystack;
|
|
needle = (const unsigned char *) pneedle;
|
|
|
|
b = *needle;
|
|
if (b != '\0')
|
|
{
|
|
haystack--; /* possible ANSI violation */
|
|
do
|
|
{
|
|
c = *++haystack;
|
|
if (c == '\0')
|
|
goto ret0;
|
|
}
|
|
while (c != b);
|
|
|
|
c = *++needle;
|
|
if (c == '\0')
|
|
goto foundneedle;
|
|
++needle;
|
|
goto jin;
|
|
|
|
for (;;)
|
|
{
|
|
register chartype a;
|
|
register const unsigned char *rhaystack, *rneedle;
|
|
|
|
do
|
|
{
|
|
a = *++haystack;
|
|
if (a == '\0')
|
|
goto ret0;
|
|
if (a == b)
|
|
break;
|
|
a = *++haystack;
|
|
if (a == '\0')
|
|
goto ret0;
|
|
shloop: }
|
|
while (a != b);
|
|
|
|
jin: a = *++haystack;
|
|
if (a == '\0')
|
|
goto ret0;
|
|
|
|
if (a != c)
|
|
goto shloop;
|
|
|
|
rhaystack = haystack-- + 1;
|
|
rneedle = needle;
|
|
a = *rneedle;
|
|
|
|
if (*rhaystack == a)
|
|
do
|
|
{
|
|
if (a == '\0')
|
|
goto foundneedle;
|
|
++rhaystack;
|
|
a = *++needle;
|
|
if (*rhaystack != a)
|
|
break;
|
|
if (a == '\0')
|
|
goto foundneedle;
|
|
++rhaystack;
|
|
a = *++needle;
|
|
}
|
|
while (*rhaystack == a);
|
|
|
|
needle = rneedle; /* took the register-poor approach */
|
|
|
|
if (a == '\0')
|
|
break;
|
|
}
|
|
}
|
|
foundneedle:
|
|
return (char*) haystack;
|
|
ret0:
|
|
return 0;
|
|
}
|