Update 'strstr' module from gnulib.

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index 3f5e64565e1b5eeb73b8bfdef7ace0ba190696de..8eaaf5403aac2326e3f846c6ea24cc673b0d71ec 100644 (file)
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/lib/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-06  Bruno Haible  <bruno@clisp.org>
+
+       * strstr.c: Update from gnulib.
+
 2005-01-06  Bruno Haible  <bruno@clisp.org>
 
        * strpbrk.c: Update from gnulib.

diff --git a/gettext-tools/lib/strstr.c b/gettext-tools/lib/strstr.c
index b16346b161860c6aa9bc7f39f3b294a38578b18c..dd4622297a2559b5cb3b136d534c07c278cdeaa3 100644 (file)
--- a/gettext-tools/lib/strstr.c
+++ b/gettext-tools/lib/strstr.c
@@ -1,21 +1,19 @@
-/* Return the offset of one string within another.
-   Copyright (C) 1994, 1996, 1997, 2000, 2002 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
+/* Copyright (C) 1994, 1999, 2002-2003 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.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, 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.
+This program 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 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.  */
+You should have received a copy of the GNU General Public License
+along with this program; 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.
@@ -30,9 +28,7 @@
 # include <config.h>
 #endif
 
-#if defined _LIBC || defined HAVE_STRING_H
-# include <string.h>
-#endif
+#include <string.h>
 
 typedef unsigned chartype;
 
@@ -110,7 +106,7 @@ jin:          a = *++haystack;
              }
            while (*rhaystack == a);
 
-         needle = rneedle;             /* took the register-poor approach */
+         needle = rneedle;                /* took the register-poor approach */
 
          if (a == '\0')
            break;