* memmem.cc: New file.

* include/cygwin/version.h: Bump API version number to 142.
* cygwin.din: Export memmem.

5 files changed, 79 insertions, 3 deletions

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index df961382f..13af63483 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,12 @@
 2005-11-08  Christopher Faylor  <cgf@timesys.com>
 
+	* memmem.cc: New file.
+	* include/cygwin/version.h: Bump API version number to 142.
+	* cygwin.din: Export memmem.
+	* Makefile; Build memmem.o.
+
+2005-11-08  Christopher Faylor  <cgf@timesys.com>
+
 	* environ.cc (spenvs): Make "SYSTEMDRIVE" an "always export".
 
 2005-11-07  Corinna Vinschen  <corinna@vinschen.de>
diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
index 18b3bb9d2..f0711acc4 100644
--- a/winsup/cygwin/Makefile.in
+++ b/winsup/cygwin/Makefile.in
@@ -134,8 +134,8 @@ DLL_OFILES:=assert.o autoload.o bsdlib.o ctype.o cxx.o cygheap.o cygthread.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 init.o ioctl.o ipc.o iruserok.o localtime.o lsearch.o \
-	malloc_wrapper.o miscfuncs.o mktemp.o mmap.o msg.o net.o netdb.o nftw.o \
-	ntea.o passwd.o path.o pinfo.o pipe.o poll.o pthread.o regcomp.o \
+	malloc_wrapper.o memmem.o miscfuncs.o mktemp.o mmap.o msg.o net.o netdb.o \
+	nftw.o ntea.o passwd.o path.o pinfo.o pipe.o poll.o pthread.o regcomp.o \
 	regerror.o regexec.o regfree.o registry.o resource.o scandir.o sched.o \
 	sec_acl.o sec_helper.o security.o select.o sem.o shared.o shm.o \
 	sigfe.o signal.o sigproc.o smallprint.o spawn.o strace.o strsep.o \
diff --git a/winsup/cygwin/cygwin.din b/winsup/cygwin/cygwin.din
index 1aede4e01..c6acea4d4 100644
--- a/winsup/cygwin/cygwin.din
+++ b/winsup/cygwin/cygwin.din
@@ -929,6 +929,7 @@ memmove NOSIGFE
 _memmove = memmove NOSIGFE
 mempcpy NOSIGFE
 __mempcpy = mempcpy NOSIGFE
+memmem NOSIGFE
 memset NOSIGFE
 _memset = memset NOSIGFE
 mkdir SIGFE
diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h
index c2e6755ba..9b54196dd 100644
--- a/winsup/cygwin/include/cygwin/version.h
+++ b/winsup/cygwin/include/cygwin/version.h
@@ -279,12 +279,13 @@ details. */
 	   IPPROTO_IP values.
       140: Export mlock, munlock.
       141: Export futimes, lutimes.
+      142: Export memmem
      */
 
      /* Note that we forgot to bump the api for ualarm, strtoll, strtoull */
 
 #define CYGWIN_VERSION_API_MAJOR 0
-#define CYGWIN_VERSION_API_MINOR 141
+#define CYGWIN_VERSION_API_MINOR 142
 
      /* There is also a compatibity version number associated with the
 	shared memory regions.  It is incremented when incompatible
diff --git a/winsup/cygwin/libc/memmem.cc b/winsup/cygwin/libc/memmem.cc
new file mode 100644
index 000000000..cd9dc33d3
--- /dev/null
+++ b/winsup/cygwin/libc/memmem.cc
@@ -0,0 +1,67 @@
+/*-
+ * 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 (l_len == 0 || s_len == 0)
+    return NULL;
+
+  /* "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;
+}