Update copyright dates with scripts/update-copyrights.

[thirdparty/glibc.git] / string / strtok.c

diff --git a/string/strtok.c b/string/strtok.c
index 0b95084f534f47b5c79103373cd0313a4fb3c396..97acd4a05aebfdd8854702017ee869b602807c20 100644 (file)
--- a/string/strtok.c
+++ b/string/strtok.c
@@ -1,68 +1,62 @@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+/* Copyright (C) 1991-2015 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 free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 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.
+   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
+   Lesser 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., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
-#include <ansidecl.h>
-#include <errno.h>
 #include <string.h>
 
 
-static char *olds = NULL;
+static char *olds;
+
+#undef strtok
+
+#ifndef STRTOK
+# define STRTOK strtok
+#endif
 
 /* Parse S into tokens separated by characters in DELIM.
    If S is NULL, the last string strtok() was called with is
    used.  For example:
-       char s[] = "-abc=-def";
+       char s[] = "-abc-=-def";
        x = strtok(s, "-");             // x = "abc"
-       x = strtok(NULL, "=-");         // x = "def"
+       x = strtok(NULL, "-=");         // x = "def"
        x = strtok(NULL, "=");          // x = NULL
-               // s = "abc\0-def\0"
+               // s = "abc\0=-def\0"
 */
 char *
-DEFUN(strtok, (s, delim),
-      register char *s AND register CONST char *delim)
+STRTOK (char *s, const char *delim)
 {
   char *token;
 
   if (s == NULL)
-    {
-      if (olds == NULL)
-       {
-         errno = EINVAL;
-         return NULL;
-       }
-      else
-       s = olds;
-    }
+    s = olds;
 
   /* Scan leading delimiters.  */
-  s += strspn(s, delim);
+  s += strspn (s, delim);
   if (*s == '\0')
     {
-      olds = NULL;
+      olds = s;
       return NULL;
     }
 
   /* Find the end of the token.  */
   token = s;
-  s = strpbrk(token, delim);
+  s = strpbrk (token, delim);
   if (s == NULL)
     /* This token finishes the string.  */
-    olds = NULL;
+    olds = __rawmemchr (token, '\0');
   else
     {
       /* Terminate the token and make OLDS point past it.  */