From a05ba261e9c40c9ef95b286d7a8abff519551295 Mon Sep 17 00:00:00 2001 From: Greg McGary Date: Mon, 12 Apr 1999 07:56:55 +0000 Subject: * lib/strsep.c: Add file. * lib/strtok.c: Remove file. * configure.in: Check for strsep instead of strtok. * libidu/idfile.c (locate_id_file_name): Use strsep instead of strtok. * libidu/scanners.c (language_save_arg, language_save_arg, tokenize_args_string): Ditto. * libidu/walker.c (append_strings_to_vector, vectorize_string): Ditto. --- lib/strtok.c | 73 ------------------------------------------------------------ 1 file changed, 73 deletions(-) delete mode 100644 lib/strtok.c (limited to 'lib/strtok.c') diff --git a/lib/strtok.c b/lib/strtok.c deleted file mode 100644 index 0b95084..0000000 --- a/lib/strtok.c +++ /dev/null @@ -1,73 +0,0 @@ -/* Copyright (C) 1991 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 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. - -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. */ - -#include -#include -#include - - -static char *olds = NULL; - -/* 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"; - x = strtok(s, "-"); // x = "abc" - x = strtok(NULL, "=-"); // x = "def" - x = strtok(NULL, "="); // x = NULL - // s = "abc\0-def\0" -*/ -char * -DEFUN(strtok, (s, delim), - register char *s AND register CONST char *delim) -{ - char *token; - - if (s == NULL) - { - if (olds == NULL) - { - errno = EINVAL; - return NULL; - } - else - s = olds; - } - - /* Scan leading delimiters. */ - s += strspn(s, delim); - if (*s == '\0') - { - olds = NULL; - return NULL; - } - - /* Find the end of the token. */ - token = s; - s = strpbrk(token, delim); - if (s == NULL) - /* This token finishes the string. */ - olds = NULL; - else - { - /* Terminate the token and make OLDS point past it. */ - *s = '\0'; - olds = s + 1; - } - return token; -} -- cgit v1.2.3