diff options
Diffstat (limited to 'string')
| -rw-r--r-- | string/Makefile | 4 | ||||
| -rw-r--r-- | string/string.h | 5 | ||||
| -rw-r--r-- | string/strtok.c | 20 | ||||
| -rw-r--r-- | string/strxfrm.c | 54 | ||||
| -rw-r--r-- | string/tester.c | 96 |
5 files changed, 165 insertions, 14 deletions
diff --git a/string/Makefile b/string/Makefile index af371ed689..02137316bf 100644 --- a/string/Makefile +++ b/string/Makefile @@ -28,7 +28,7 @@ routines := strcat strchr strcmp strcoll strcpy strcspn strdup \ strerror _strerror strlen strnlen \ strncat strncmp strncpy \ strrchr strpbrk strsignal strspn strstr strtok \ - strxfrm memchr memcmp memmove memset \ + strtok_r strxfrm memchr memcmp memmove memset \ bcopy bzero ffs stpcpy stpncpy \ strcasecmp strncase \ memccpy memcpy wordcopy strsep \ @@ -42,3 +42,5 @@ distribute := memcopy.h pagecopy.h include ../Rules + +tester-ENV = LANGUAGE=C diff --git a/string/string.h b/string/string.h index 5443d5009e..0df63d0653 100644 --- a/string/string.h +++ b/string/string.h @@ -120,6 +120,11 @@ extern char *strstr __P ((__const char *__haystack, __const char *__needle)); extern char *strtok __P ((char *__s, __const char *__delim)); #ifdef __USE_GNU +/* Divide S into tokens separated by characters in DELIM. Information + passed between calls are stored in SAVE_PTR. */ +extern char *strtok_r __P ((char *__s, __const char *__delim, + char **__save_ptr)); + /* Find the first occurence of NEEDLE in HAYSTACK. NEEDLE is NEEDLELEN bytes long; HAYSTACK is HAYSTACKLEN bytes long. */ diff --git a/string/strtok.c b/string/strtok.c index 0b95084f53..954471322b 100644 --- a/string/strtok.c +++ b/string/strtok.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1996 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 @@ -13,10 +13,9 @@ 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. */ +not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ -#include <ansidecl.h> #include <errno.h> #include <string.h> @@ -26,15 +25,16 @@ 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"; + 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" */ char * -DEFUN(strtok, (s, delim), - register char *s AND register CONST char *delim) +strtok (s, delim) + char *s; + const char *delim; { char *token; @@ -50,7 +50,7 @@ DEFUN(strtok, (s, delim), } /* Scan leading delimiters. */ - s += strspn(s, delim); + s += strspn (s, delim); if (*s == '\0') { olds = NULL; @@ -59,7 +59,7 @@ DEFUN(strtok, (s, delim), /* 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; diff --git a/string/strxfrm.c b/string/strxfrm.c index 300967bc2b..f94c16b50b 100644 --- a/string/strxfrm.c +++ b/string/strxfrm.c @@ -21,9 +21,10 @@ Boston, MA 02111-1307, USA. */ #include <stdlib.h> #include <string.h> -#ifndef STRING_TYPE +#ifndef WIDE_VERSION # define STRING_TYPE char # define USTRING_TYPE unsigned char +# define L_(Ch) Ch # define STRXFRM strxfrm # define STRLEN strlen # define STPNCPY __stpncpy @@ -34,9 +35,10 @@ Boston, MA 02111-1307, USA. */ #include "../locale/weight.h" +#ifndef WIDE_VERSION /* Write 32 bit value UTF-8 encoded but only if enough space is left. */ static __inline size_t -print_val (u_int32_t value, STRING_TYPE *dest, size_t max, size_t act) +print_val (u_int32_t value, char *dest, size_t max, size_t act) { char tmp[6]; int idx = 0; @@ -90,6 +92,48 @@ print_val (u_int32_t value, STRING_TYPE *dest, size_t max, size_t act) return act; } +#else +static __inline size_t +print_val (u_int32_t value, wchar_t *dest, size_t max, size_t act) +{ + /* We cannot really assume wchar_t is 32 bits wide. But it is for + GCC and so we don't do much optimization for the other case. */ + if (sizeof (wchar_t) == 4) + { + if (act < max) + dest[act] = (wchar_t) value; + ++act; + } + else + { + wchar_t tmp[3]; + size_t idx = 0; + + if (value < 0x8000) + tmp[idx++] = (wchar_t) act; + else + { + tmp[idx++] = (wchar_t) (0x8000 + (value & 0x3fff)); + value >>= 14; + if (value < 0x2000) + tmp[idx++] = (wchar_t) (0xc000 + value); + else + { + tmp[idx++] = (wchar_t) (0x8000 + (value & 0x3fff)); + value >>= 14; + tmp[idx++] = (wchar_t) (0xe000 + value); + } + } + while (idx-- > 0) + { + if (act < max) + dest[act] = tmp[idx]; + ++act; + } + } + return act; +} +#endif /* Transform SRC into a form such that the result of strcmp @@ -184,5 +228,9 @@ STRXFRM (STRING_TYPE *dest, const STRING_TYPE *src, size_t n) } /* Terminate string. */ - return print_val (0, dest, n, written); + if (written < n) + dest[written] = L_('\0'); + + /* Return length without counting the terminating '\0'. */ + return written; } diff --git a/string/tester.c b/string/tester.c index d826ff7beb..1b87c9f544 100644 --- a/string/tester.c +++ b/string/tester.c @@ -40,6 +40,8 @@ char two[50]; int DEFUN(main, (argc, argv), int argc AND char **argv) { + char *cp; + /* Test strcmp first because we use it to test other things. */ it = "strcmp"; check(strcmp("", "") == 0, 1); /* Trivial case. */ @@ -359,6 +361,100 @@ DEFUN(main, (argc, argv), int argc AND char **argv) equal(one+2, "b", 32); equal(one+4, "c", 33); + /* strtok_r. */ + it = "strtok_r"; + (void) strcpy(one, "first, second, third"); + equal(strtok_r(one, ", ", &cp), "first", 1); /* Basic test. */ + equal(one, "first", 2); + equal(strtok_r((char *)NULL, ", ", &cp), "second", 3); + equal(strtok_r((char *)NULL, ", ", &cp), "third", 4); + check(strtok_r((char *)NULL, ", ", &cp) == NULL, 5); + (void) strcpy(one, ", first, "); + equal(strtok_r(one, ", ", &cp), "first", 6); /* Extra delims, 1 tok. */ + check(strtok_r((char *)NULL, ", ", &cp) == NULL, 7); + (void) strcpy(one, "1a, 1b; 2a, 2b"); + equal(strtok_r(one, ", ", &cp), "1a", 8); /* Changing delim lists. */ + equal(strtok_r((char *)NULL, "; ", &cp), "1b", 9); + equal(strtok_r((char *)NULL, ", ", &cp), "2a", 10); + (void) strcpy(two, "x-y"); + equal(strtok_r(two, "-", &cp), "x", 11); /* New string before done. */ + equal(strtok_r((char *)NULL, "-", &cp), "y", 12); + check(strtok_r((char *)NULL, "-", &cp) == NULL, 13); + (void) strcpy(one, "a,b, c,, ,d"); + equal(strtok_r(one, ", ", &cp), "a", 14); /* Different separators. */ + equal(strtok_r((char *)NULL, ", ", &cp), "b", 15); + equal(strtok_r((char *)NULL, " ,", &cp), "c", 16); /* Permute list too. */ + equal(strtok_r((char *)NULL, " ,", &cp), "d", 17); + check(strtok_r((char *)NULL, ", ", &cp) == NULL, 18); + check(strtok_r((char *)NULL, ", ", &cp) == NULL, 19); /* Persistence. */ + (void) strcpy(one, ", "); + check(strtok_r(one, ", ", &cp) == NULL, 20); /* No tokens. */ + (void) strcpy(one, ""); + check(strtok_r(one, ", ", &cp) == NULL, 21); /* Empty string. */ + (void) strcpy(one, "abc"); + equal(strtok_r(one, ", ", &cp), "abc", 22); /* No delimiters. */ + check(strtok_r((char *)NULL, ", ", &cp) == NULL, 23); + (void) strcpy(one, "abc"); + equal(strtok_r(one, "", &cp), "abc", 24); /* Empty delimiter list. */ + check(strtok_r((char *)NULL, "", &cp) == NULL, 25); + (void) strcpy(one, "abcdefgh"); + (void) strcpy(one, "a,b,c"); + equal(strtok_r(one, ",", &cp), "a", 26); /* Basics again... */ + equal(strtok_r((char *)NULL, ",", &cp), "b", 27); + equal(strtok_r((char *)NULL, ",", &cp), "c", 28); + check(strtok_r((char *)NULL, ",", &cp) == NULL, 29); + equal(one+6, "gh", 30); /* Stomped past end? */ + equal(one, "a", 31); /* Stomped old tokens? */ + equal(one+2, "b", 32); + equal(one+4, "c", 33); + + /* strsep. */ + it = "strsep"; + cp = strcpy(one, "first, second, third"); + equal(strsep(&cp, ", "), "first", 1); /* Basic test. */ + equal(one, "first", 2); + equal(strsep(&cp, ", "), "second", 3); + equal(strsep(&cp, ", "), "third", 4); + check(strsep(&cp, ", ") == NULL, 5); + cp = strcpy(one, ", first, "); + equal(strsep(&cp, ", "), "first", 6); /* Extra delims, 1 tok. */ + check(strsep(&cp, ", ") == NULL, 7); + cp = strcpy(one, "1a, 1b; 2a, 2b"); + equal(strsep(&cp, ", "), "1a", 8); /* Changing delim lists. */ + equal(strsep(&cp, "; "), "1b", 9); + equal(strsep(&cp, ", "), "2a", 10); + cp = strcpy(two, "x-y"); + equal(strsep(&cp, "-"), "x", 11); /* New string before done. */ + equal(strsep(&cp, "-"), "y", 12); + check(strsep(&cp, "-") == NULL, 13); + cp = strcpy(one, "a,b, c,, ,d"); + equal(strsep(&cp, ", "), "a", 14); /* Different separators. */ + equal(strsep(&cp, ", "), "b", 15); + equal(strsep(&cp, " ,"), "c", 16); /* Permute list too. */ + equal(strsep(&cp, " ,"), "d", 17); + check(strsep(&cp, ", ") == NULL, 18); + check(strsep(&cp, ", ") == NULL, 19); /* Persistence. */ + cp = strcpy(one, ", "); + check(strsep(&cp, ", ") == NULL, 20); /* No tokens. */ + cp = strcpy(one, ""); + check(strsep(&cp, ", ") == NULL, 21); /* Empty string. */ + cp = strcpy(one, "abc"); + equal(strsep(&cp, ", "), "abc", 22); /* No delimiters. */ + check(strsep(&cp, ", ") == NULL, 23); + cp = strcpy(one, "abc"); + equal(strsep(&cp, ""), "abc", 24); /* Empty delimiter list. */ + check(strsep(&cp, "") == NULL, 25); + (void) strcpy(one, "abcdefgh"); + cp = strcpy(one, "a,b,c"); + equal(strsep(&cp, ","), "a", 26); /* Basics again... */ + equal(strsep(&cp, ","), "b", 27); + equal(strsep(&cp, ","), "c", 28); + check(strsep(&cp, ",") == NULL, 29); + equal(one+6, "gh", 30); /* Stomped past end? */ + equal(one, "a", 31); /* Stomped old tokens? */ + equal(one+2, "b", 32); + equal(one+4, "c", 33); + /* memcmp. */ it = "memcmp"; check(memcmp("a", "a", 1) == 0, 1); /* Identity. */ |