diff options
Diffstat (limited to 'string')
| -rw-r--r-- | string/Makefile | 4 | ||||
| -rw-r--r-- | string/argz-ctsep.c | 60 | ||||
| -rw-r--r-- | string/argz-next.c | 39 | ||||
| -rw-r--r-- | string/argz.h | 83 | ||||
| -rw-r--r-- | string/envz.c | 16 | ||||
| -rw-r--r-- | string/envz.h | 18 | ||||
| -rw-r--r-- | string/strcoll.c | 2 | ||||
| -rw-r--r-- | string/tst-strlen.c | 32 |
8 files changed, 209 insertions, 45 deletions
diff --git a/string/Makefile b/string/Makefile index d90bf6f857..af371ed689 100644 --- a/string/Makefile +++ b/string/Makefile @@ -33,11 +33,11 @@ routines := strcat strchr strcmp strcoll strcpy strcspn strdup \ strcasecmp strncase \ memccpy memcpy wordcopy strsep \ swab strfry memfrob memmem \ - $(addprefix argz-,append count create \ + $(addprefix argz-,append count create ctsep next \ delete extract insert stringify) \ envz -tests := tester testcopy test-ffs +tests := tester testcopy test-ffs tst-strlen distribute := memcopy.h pagecopy.h diff --git a/string/argz-ctsep.c b/string/argz-ctsep.c new file mode 100644 index 0000000000..9560591cb3 --- /dev/null +++ b/string/argz-ctsep.c @@ -0,0 +1,60 @@ +/* Copyright (C) 1996 Free Software Foundation, Inc. +This file is part of the GNU C Library. +Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996. + +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., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +#include <argz.h> +#include <errno.h> +#include <stdlib.h> +#include <string.h> + + +error_t +__argz_create_sep (const char *string, int delim, char **argz, size_t *len) +{ + size_t nlen = strlen (string) + 1; + + if (nlen != 0) + { + const char *rp; + char *wp; + + *argz = (char *) malloc (nlen); + if (*argz == NULL) + return ENOMEM; + + rp = string; + wp = *argz; + do + if (*rp == delim) + { + if (wp > *argz && wp[-1] != '\0') + *wp++ = '\0'; + else + --nlen; + } + else + *wp++ = *rp; + while (*rp++ != '\0'); + } + if (nlen == 0) + *argz = NULL; + *len = nlen; + + return 0; +} +weak_alias (__argz_create_sep, argz_create_sep) diff --git a/string/argz-next.c b/string/argz-next.c new file mode 100644 index 0000000000..6149c7ee51 --- /dev/null +++ b/string/argz-next.c @@ -0,0 +1,39 @@ +/* Iterate through the elements of an argz block. + Copyright (C) 1995, 1996 Free Software Foundation, Inc. + + Written by Miles Bader <miles@gnu.ai.mit.edu> + + 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +#include <argz.h> +#include <string.h> + +char * +__argz_next (char *argz, size_t argz_len, const char *entry) +{ + if (entry) + { + if (entry < argz + argz_len) + entry = strchr (entry, '\0') + 1; + + return entry >= argz + argz_len ? NULL : entry; + } + else + if (argz_len > 0) + return argz; + else + return NULL; +} +weak_alias (__argz_next, argz_next) diff --git a/string/argz.h b/string/argz.h index 9c03815915..733d06cca8 100644 --- a/string/argz.h +++ b/string/argz.h @@ -20,42 +20,59 @@ #ifndef __ARGZ_H__ #define __ARGZ_H__ 1 + +#include <features.h> + #include <errno.h> /* Define error_t. */ #include <string.h> /* Need size_t, and strchr is called below. */ + +__BEGIN_DECLS + /* Make a '\0' separated arg vector from a unix argv vector, returning it in ARGZ, and the total length in LEN. If a memory allocation error occurs, ENOMEM is returned, otherwise 0. The result can be destroyed using free. */ -error_t __argz_create (char **argv, char **argz, size_t *len); -error_t argz_create (char **argv, char **argz, size_t *len); +error_t __argz_create __P ((char **__argv, char **__argz, size_t *__len)); +error_t argz_create __P ((char **__argv, char **__argz, size_t *__len)); + +/* Make a '\0' separated arg vector from a SEP separated list in + STRING, returning it in ARGZ, and the total length in LEN. If a + memory allocation error occurs, ENOMEM is returned, otherwise 0. + The result can be destroyed using free. */ +error_t __argz_create_sep __P ((__const char *__string, int __sep, + char **__argz, size_t *__len)); +error_t argz_create_sep __P ((__const char *__string, int __sep, + char **__argz, size_t *__len)); /* Returns the number of strings in ARGZ. */ -size_t __argz_count (const char *argz, size_t len); -size_t argz_count (const char *argz, size_t len); +size_t __argz_count __P ((__const char *__argz, size_t __len)); +size_t argz_count __P ((__const char *__argz, size_t __len)); /* Puts pointers to each string in ARGZ into ARGV, which must be large enough to hold them all. */ -void __argz_extract (const char *argz, size_t len, char **argv); -void argz_extract (const char *argz, size_t len, char **argv); +void __argz_extract __P ((__const char *__argz, size_t __len, char **__argv)); +void argz_extract __P ((__const char *__argz, size_t __len, char **__argv)); /* Make '\0' separated arg vector ARGZ printable by converting all the '\0's except the last into the character SEP. */ -void __argz_stringify (char *argz, size_t len, int sep); -void argz_stringify (char *argz, size_t len, int sep); +void __argz_stringify __P ((char *__argz, size_t __len, int __sep)); +void argz_stringify __P ((char *__argz, size_t __len, int __sep)); /* Append BUF, of length BUF_LEN to the argz vector in ARGZ & ARGZ_LEN. */ -error_t __argz_append (char **argz, size_t *argz_len, - const char *buf, size_t buf_len); -error_t argz_append (char **argz, size_t *argz_len, - const char *buf, size_t buf_len); +error_t __argz_append __P ((char **__argz, size_t *__argz_len, + __const char *__buf, size_t __buf_len)); +error_t argz_append __P ((char **__argz, size_t *__argz_len, + __const char *__buf, size_t __buf_len)); /* Append STR to the argz vector in ARGZ & ARGZ_LEN. */ -error_t __argz_add (char **argz, size_t *argz_len, const char *str); -error_t argz_add (char **argz, size_t *argz_len, const char *str); +error_t __argz_add __P ((char **__argz, size_t *__argz_len, + __const char *__str)); +error_t argz_add __P ((char **__argz, size_t *__argz_len, + __const char *__str)); /* Delete ENTRY from ARGZ & ARGZ_LEN, if it appears there. */ -void __argz_delete (char **argz, size_t *argz_len, char *entry); -void argz_delete (char **argz, size_t *argz_len, char *entry); +void __argz_delete __P ((char **__argz, size_t *__argz_len, char *__entry)); +void argz_delete __P ((char **__argz, size_t *__argz_len, char *__entry)); /* Insert ENTRY into ARGZ & ARGZ_LEN before BEFORE, which should be an existing entry in ARGZ; if BEFORE is NULL, ENTRY is appended to the end. @@ -63,17 +80,17 @@ void argz_delete (char **argz, size_t *argz_len, char *entry); ARGZ, ENTRY) will insert ENTRY at the beginning of ARGZ. If BEFORE is not in ARGZ, EINVAL is returned, else if memory can't be allocated for the new ARGZ, ENOMEM is returned, else 0. */ -error_t __argz_insert (char **argz, size_t *argz_len, - char *before, const char *entry); -error_t argz_insert (char **argz, size_t *argz_len, - char *before, const char *entry); +error_t __argz_insert __P ((char **__argz, size_t *__argz_len, + char *__before, __const char *__entry)); +error_t argz_insert __P ((char **__argz, size_t *__argz_len, + char *__before, __const char *__entry)); /* Returns the next entry in ARGZ & ARGZ_LEN after ENTRY, or NULL if there are no more. If entry is NULL, then the first entry is returned. This behavior allows two convenient iteration styles: char *entry = 0; - while (entry = argz_next (argz, argz_len, entry)) + while ((entry = argz_next (argz, argz_len, entry))) ...; or @@ -82,19 +99,33 @@ error_t argz_insert (char **argz, size_t *argz_len, for (entry = argz; entry; entry = argz_next (argz, argz_len, entry)) ...; */ +extern char *__argz_next __P ((char *__argz, size_t __argz_len, + __const char *__entry)); +extern char *argz_next __P ((char *__argz, size_t __argz_len, + __const char *__entry)); + +#if defined (__OPTIMIZE__) && __GNUC__ >= 2 extern inline char * -argz_next (char *argz, size_t argz_len, const char *entry) +__argz_next (char *argz, size_t argz_len, const char *entry) { if (entry) - if (entry >= argz + argz_len) - return 0; - else - return strchr (entry, '\0') + 1; + { + if (entry < argz + argz_len) + entry = strchr (entry, '\0') + 1; + + return entry >= argz + argz_len ? NULL : entry; + } else if (argz_len > 0) return argz; else return 0; } +extern inline char * +argz_next (char *argz, size_t argz_len, const char *entry) +{ + return __argz_next (argz, argz_len, entry); +} +#endif /* optimizing GCC2 */ #endif /* __ARGZ_H__ */ diff --git a/string/envz.c b/string/envz.c index 4d0816e4e1..e751eccb8f 100644 --- a/string/envz.c +++ b/string/envz.c @@ -29,8 +29,8 @@ /* Returns a pointer to the entry in ENVZ for NAME, or 0 if there is none. If NAME contains the separator character, only the portion before it is used in the comparison. */ -char * -envz_entry (char *envz, unsigned envz_len, char *name) +const char * +envz_entry (const char *envz, size_t envz_len, const char *name) { while (envz_len) { @@ -57,8 +57,8 @@ envz_entry (char *envz, unsigned envz_len, char *name) /* Returns a pointer to the value portion of the entry in ENVZ for NAME, or 0 if there is none. */ -char * -envz_get (char *envz, unsigned envz_len, char *name) +const char * +envz_get (const char *envz, size_t envz_len, const char *name) { char *entry = envz_entry (envz, envz_len, name); if (entry) @@ -75,7 +75,7 @@ envz_get (char *envz, unsigned envz_len, char *name) /* Remove the entry for NAME from ENVZ & ENVZ_LEN, if any. */ void -envz_remove (char **envz, unsigned *envz_len, char *name) +envz_remove (char **envz, size_t *envz_len, char *name) { char *entry = envz_entry (*envz, *envz_len, name); if (entry) @@ -89,7 +89,7 @@ envz_remove (char **envz, unsigned *envz_len, char *name) because when merging with another envz, the null entry can override an entry in the other one. Null entries can be removed with envz_strip (). */ error_t -envz_add (char **envz, unsigned *envz_len, char *name, char *value) +envz_add (char **envz, unsigned *envz_len, const char *name, const char *value) { envz_remove (envz, envz_len, name); @@ -126,8 +126,8 @@ envz_add (char **envz, unsigned *envz_len, char *name, char *value) OVERRIDE is true, then values in ENVZ2 will supercede those with the same name in ENV, otherwise not. */ error_t -envz_merge (char **envz, unsigned *envz_len, char *envz2, unsigned envz2_len, - int override) +envz_merge (char **envz, unsigned *envz_len, const char *envz2, + size_t envz2_len, int override) { error_t err = 0; diff --git a/string/envz.h b/string/envz.h index c39c497e7e..dad2d281f4 100644 --- a/string/envz.h +++ b/string/envz.h @@ -28,11 +28,13 @@ #include <argz.h> /* Returns a pointer to the entry in ENVZ for NAME, or 0 if there is none. */ -char *envz_entry (const char *envz, size_t envz_len, const char *name); +const char *envz_entry __P ((__const char *__envz, size_t __envz_len, + __const char *__name)); /* Returns a pointer to the value portion of the entry in ENVZ for NAME, or 0 if there is none. */ -char *envz_get (const char *envz, size_t envz_len, const char *name); +const char *envz_get __P ((__const char *__envz, size_t __envz_len, + __const char *__name)); /* Adds an entry for NAME with value VALUE to ENVZ & ENVZ_LEN. If an entry with the same name already exists in ENVZ, it is removed. If VALUE is @@ -40,17 +42,17 @@ char *envz_get (const char *envz, size_t envz_len, const char *name); return NULL, although envz_entry will still return an entry; this is handy because when merging with another envz, the null entry can override an entry in the other one. Null entries can be removed with envz_strip (). */ -error_t envz_add (char **envz, size_t *envz_len, - const char *name, const char *value); +error_t envz_add __P ((char **__envz, size_t *__envz_len, + __const char *__name, __const char *__value)); /* Adds each entry in ENVZ2 to ENVZ & ENVZ_LEN, as if with envz_add(). If OVERRIDE is true, then values in ENVZ2 will supercede those with the same name in ENV, otherwise not. */ -error_t envz_merge (char **envz, size_t *envz_len, - const char *envz2, size_t envz2_len, - int override); +error_t envz_merge __P ((char **__envz, size_t *__envz_len, + __const char *__envz2, size_t __envz2_len, + int __override)); /* Remove null entries. */ -void envz_strip (char **envz, size_t *envz_len); +void envz_strip __P ((char **__envz, size_t *__envz_len)); #endif /* __ENVZ_H__ */ diff --git a/string/strcoll.c b/string/strcoll.c index dc1bb2aaaa..a4bbabc2ac 100644 --- a/string/strcoll.c +++ b/string/strcoll.c @@ -71,7 +71,7 @@ STRCOLL (s1, s2) { int s1ignore = 0; int s2ignore = 0; - u32_t w1, w2; + u_int32_t w1, w2; /* Here we have to check for IGNORE entries. If these are found we count them and go on witht he next value. */ diff --git a/string/tst-strlen.c b/string/tst-strlen.c new file mode 100644 index 0000000000..a58f8784db --- /dev/null +++ b/string/tst-strlen.c @@ -0,0 +1,32 @@ +#include <stdio.h> +#include <string.h> + +int +main() +{ + static const lens[16] = { 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, 4 }; + char buf[24]; + int words; + + for (words = 0; words < 4; ++words) + { + int last; + memset (buf, 'a', words * 4); + + for (last = 0; last < 16; ++last) + { + buf[words * 4 + 0] = (last & 1) != 0 ? 'b' : '\0'; + buf[words * 4 + 1] = (last & 2) != 0 ? 'c' : '\0'; + buf[words * 4 + 2] = (last & 4) != 0 ? 'd' : '\0'; + buf[words * 4 + 3] = (last & 8) != 0 ? 'e' : '\0'; + buf[words * 4 + 4] = '\0'; + + if (strlen (buf) != words * 4 + lens[last]) + { + printf ("failed for words=%d and last=%d\n", words, last); + return 1; + } + } + } + return 0; +} |