[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
CVS shishi/gl
From: |
shishi-commit |
Subject: |
CVS shishi/gl |
Date: |
Thu, 11 Nov 2004 19:59:35 +0100 |
Update of /home/cvs/shishi/gl
In directory dopio:/tmp/cvs-serv2376/gl
Modified Files:
Makefile.am
Added Files:
strtok_r.c strtok_r.h
Log Message:
Add strtok_r.
--- /home/cvs/shishi/gl/Makefile.am 2004/11/09 18:18:50 1.49
+++ /home/cvs/shishi/gl/Makefile.am 2004/11/11 18:59:35 1.50
@@ -9,7 +9,7 @@
#
# Generated by gnulib-tool.
# Invoked as: gnulib-tool --import
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl
--m4-base=gl/m4 --libtool alloca alloca-opt allocsa error extensions
getaddrinfo getdate getdomainname gethostname getline getopt getpass getsubopt
gettext gettime gettimeofday mktime progname readlink realloc restrict setenv
stdbool strcase strchrnul strdup strndup strnlen timegm time_r timespec
vasnprintf vasprintf xalloc xgetdomainname xgethostname xreadlink xsize xstrndup
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl
--m4-base=gl/m4 --libtool alloca alloca-opt allocsa error extensions
getaddrinfo getdate getdomainname gethostname getline getopt getpass getsubopt
gettext gettime gettimeofday mktime progname readlink realloc restrict setenv
stdbool strcase strchrnul strdup strndup strnlen strtok_r timegm time_r
timespec vasnprintf vasprintf xalloc xgetdomainname xgethostname xreadlink
xsize xstrndup
AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
@@ -180,6 +180,12 @@
## end gnulib module strndup
+## begin gnulib module strtok_r
+
+libgnu_la_SOURCES += strtok_r.h
+
+## end gnulib module strtok_r
+
## begin gnulib module timegm
libgnu_la_SOURCES += timegm.h
--- /home/cvs/shishi/gl/strtok_r.c 2004/11/11 18:59:35 NONE
+++ /home/cvs/shishi/gl/strtok_r.c 2004/11/11 18:59:35 1.1
/* Reentrant string tokenizer. Generic version.
Copyright (C) 1991,1996-1999,2001,2004 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 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
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <string.h>
#undef strtok_r
#undef __strtok_r
#ifndef _LIBC
/* Get specification. */
# include "strtok_r.h"
# define __strtok_r strtok_r
# define __rawmemchr strchr
#endif
/* Parse S into tokens separated by characters in DELIM.
If S is NULL, the saved pointer in SAVE_PTR is used as
the next starting point. For example:
char s[] = "-abc-=-def";
char *sp;
x = strtok_r(s, "-", &sp); // x = "abc", sp = "=-def"
x = strtok_r(NULL, "-=", &sp); // x = "def", sp = NULL
x = strtok_r(NULL, "=", &sp); // x = NULL
// s = "abc\0-def\0"
*/
char *
__strtok_r (s, delim, save_ptr)
char *s;
const char *delim;
char **save_ptr;
{
char *token;
if (s == NULL)
s = *save_ptr;
/* Scan leading delimiters. */
s += strspn (s, delim);
if (*s == '\0')
{
*save_ptr = s;
return NULL;
}
/* Find the end of the token. */
token = s;
s = strpbrk (token, delim);
if (s == NULL)
/* This token finishes the string. */
*save_ptr = __rawmemchr (token, '\0');
else
{
/* Terminate the token and make *SAVE_PTR point past it. */
*s = '\0';
*save_ptr = s + 1;
}
return token;
}
#ifdef weak_alias
libc_hidden_def (__strtok_r)
weak_alias (__strtok_r, strtok_r)
#endif
--- /home/cvs/shishi/gl/strtok_r.h 2004/11/11 18:59:35 NONE
+++ /home/cvs/shishi/gl/strtok_r.h 2004/11/11 18:59:35 1.1
/* Split string into tokens
Copyright (C) 2004 Free Software Foundation, Inc.
Written by Simon Josefsson.
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.
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 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. */
#ifndef STRTOK_R_H
#define STRTOK_R_H
/* Get strtok_r declaration, if available. */
#include <string.h>
#if defined HAVE_DECL_STRTOK_R && !HAVE_DECL_STRTOK_R
char *strtok_r(char *restrict s, const char *restrict sep,
char **restrict lasts);
#endif
#endif /* STRTOK_R_H */
- CVS shishi/gl, shishi-commit, 2004/11/08
- CVS shishi/gl, shishi-commit, 2004/11/09
- CVS shishi/gl, shishi-commit, 2004/11/10
- CVS shishi/gl, shishi-commit, 2004/11/11
- CVS shishi/gl,
shishi-commit <=
- CVS shishi/gl, shishi-commit, 2004/11/11
- CVS shishi/gl, shishi-commit, 2004/11/11
- CVS shishi/gl, shishi-commit, 2004/11/11
- CVS shishi/gl, shishi-commit, 2004/11/12
- CVS shishi/gl, shishi-commit, 2004/11/19
- CVS shishi/gl, shishi-commit, 2004/11/19
- CVS shishi/gl, shishi-commit, 2004/11/21
- CVS shishi/gl, shishi-commit, 2004/11/28