diff options
author | Corinna Vinschen <corinna@vinschen.de> | 2008-01-15 16:45:42 +0300 |
---|---|---|
committer | Corinna Vinschen <corinna@vinschen.de> | 2008-01-15 16:45:42 +0300 |
commit | 8b5f4dbabce870329b26a484e94f5d58ed88e2cc (patch) | |
tree | e3dbdad453683146b35d86949f14bafbf4412edd /winsup | |
parent | dc26a86fbbe3720abee51179e42cc9886fce18dc (diff) |
* Makefile.in (DLL_OFILES): Remove memmem.o.
* memmem.cc: Remove in favor of newlib implementation.
Diffstat (limited to 'winsup')
-rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
-rw-r--r-- | winsup/cygwin/Makefile.in | 2 | ||||
-rw-r--r-- | winsup/cygwin/libc/memmem.cc | 67 |
3 files changed, 6 insertions, 68 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index fc75a0c8a..b93a3a975 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2008-01-15 Corinna Vinschen <corinna@vinschen.de> + + * Makefile.in (DLL_OFILES): Remove memmem.o. + * memmem.cc: Remove in favor of newlib implementation. + 2008-01-07 Corinna Vinschen <corinna@vinschen.de> * fhandler.h: Update copyright. diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in index 68dc5b35e..85fc937d6 100644 --- a/winsup/cygwin/Makefile.in +++ b/winsup/cygwin/Makefile.in @@ -135,7 +135,7 @@ DLL_OFILES:=assert.o autoload.o bsdlib.o ctype.o cxx.o cygheap.o cygthread.o \ fhandler_termios.o fhandler_tty.o fhandler_virtual.o fhandler_windows.o \ fhandler_zero.o flock.o fnmatch.o fork.o fts.o ftw.o getopt.o glob.o \ grp.o heap.o hookapi.o inet_addr.o inet_network.o init.o ioctl.o ipc.o \ - localtime.o lsearch.o malloc_wrapper.o memmem.o minires-os-if.o \ + localtime.o lsearch.o malloc_wrapper.o minires-os-if.o \ minires.o miscfuncs.o mktemp.o mmap.o msg.o net.o netdb.o nftw.o \ passwd.o path.o pinfo.o pipe.o poll.o posix_ipc.o pthread.o random.o \ regcomp.o regerror.o regexec.o regfree.o registry.o resource.o rexec.o \ diff --git a/winsup/cygwin/libc/memmem.cc b/winsup/cygwin/libc/memmem.cc deleted file mode 100644 index 142b73333..000000000 --- a/winsup/cygwin/libc/memmem.cc +++ /dev/null @@ -1,67 +0,0 @@ -/*- - * Copyright (c) 2005 Pascal Gloor <pascal.gloor@spale.com> - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include <sys/cdefs.h> -#if 0 -__FBSDID("$FreeBSD: src/lib/libc/string/memmem.c,v 1.1 2005/08/25 18:26:58 andre Exp $"); -#endif - -#include <string.h> - -/* Find the first occurrence of the byte string s in byte string l. - */ - -extern "C" void * -memmem (const void *l, size_t l_len, - const void *s, size_t s_len) -{ - register char *cur, *last; - const char *cl = (const char *)l; - const char *cs = (const char *)s; - - /* we need something to compare */ - if (s_len == 0) - return (void *) l; - - /* "s" must be smaller or equal to "l" */ - if (l_len < s_len) - return NULL; - - /* special case where s_len == 1 */ - if (s_len == 1) - return memchr (l, (int) *cs, l_len); - - /* the last position where its possible to find "s" in "l" */ - last = (char *) cl + l_len - s_len; - - for (cur = (char *) cl; cur <= last; cur++) - if (cur[0] == cs[0] && memcmp (cur, cs, s_len) == 0) - return cur; - - return NULL; -} |