(memmem): An empty needle is at the beginning of haystack.

diff --git a/sysdeps/generic/memmem.c b/sysdeps/generic/memmem.c
index 099897ab80a448a99799b052c2dc0fe01f683850..6e14f5513e6776ea20349ef6e8fdee61b0e6891e 100644 (file)
--- a/sysdeps/generic/memmem.c
+++ b/sysdeps/generic/memmem.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1993, 1994, 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 93, 94, 96, 98 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
@@ -34,8 +34,8 @@ DEFUN(memmem, (haystack, haystack_len,
 
   if (needle_len == 0)
     /* The first occurrence of the empty string is deemed to occur at
-       the end of the string.  */
-    return (PTR) &((CONST char *) haystack)[haystack_len - 1];
+       the beginning of the string.  */
+    return (PTR) haystack;
 
   for (begin = (CONST char *) haystack; begin <= last_possible; ++begin)
     if (begin[0] == ((CONST char *) needle)[0] &&