X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fstring_.h;h=14e781730bc84434c1d06eb804b796d5065c561c;hb=738e912a0f97a43c2b195bcec6fe34512208e81f;hp=78b27647fe1c5692c2fb0451d3d9c256a2226d39;hpb=2a2eb440165889566a738cd355381b4b28870206;p=gnulib.git diff --git a/lib/string_.h b/lib/string_.h index 78b27647f..14e781730 100644 --- a/lib/string_.h +++ b/lib/string_.h @@ -22,34 +22,7 @@ #include @ABSOLUTE_STRING_H@ -/* GL_LINK_WARNING("literal string") arranges to emit the literal string as - a linker warning on most glibc systems. - We use a linker warning rather than a preprocessor warning, because - #warning cannot be used inside macros. */ -#ifndef GL_LINK_WARNING - /* This works on platforms with GNU ld and ELF object format. - Testing __GLIBC__ is sufficient for asserting that GNU ld is in use. - Testing __ELF__ guarantees the ELF object format. - Testing __GNUC__ is necessary for the compound expression syntax. */ -# if defined __GLIBC__ && defined __ELF__ && defined __GNUC__ -# define GL_LINK_WARNING(message) \ - GL_LINK_WARNING1 (__FILE__, __LINE__, message) -# define GL_LINK_WARNING1(file, line, message) \ - GL_LINK_WARNING2 (file, line, message) /* macroexpand file and line */ -# define GL_LINK_WARNING2(file, line, message) \ - GL_LINK_WARNING3 (file ":" #line ": " message) -# define GL_LINK_WARNING3(message) \ - ({ static const char warning[sizeof (message)] \ - __attribute__ ((__unused__, \ - __section__ (".gnu.warning"), \ - __aligned__ (1))) \ - = message "\n"; \ - (void)0; \ - }) -# else -# define GL_LINK_WARNING(message) ((void) 0) -# endif -#endif +/* The definition of GL_LINK_WARNING is copied here. */ #ifdef __cplusplus @@ -64,7 +37,10 @@ extern void *memmem (void const *__haystack, size_t __haystack_len, # endif #elif defined GNULIB_POSIXCHECK # undef memmem -# define memmem memmem_is_unportable__use_gnulib_module_memmem_for_portability +# define memmem(a,al,b,bl) \ + (GL_LINK_WARNING ("memmem is unportable - "\ + "use gnulib module memmem for portability"), \ + memmem (a, al, b, bl)) #endif /* Copy N bytes of SRC to DEST, return pointer to bytes after the @@ -76,7 +52,10 @@ extern void *mempcpy (void *restrict __dest, void const *restrict __src, # endif #elif defined GNULIB_POSIXCHECK # undef mempcpy -# define mempcpy mempcpy_is_unportable__use_gnulib_module_mempcpy_for_portability +# define mempcpy(a,b,n) \ + (GL_LINK_WARNING ("mempcpy is unportable - "\ + "use gnulib module mempcpy for portability"), \ + mempcpy (a, b, n)) #endif /* Search backwards through a block for a byte (specified as an int). */ @@ -86,7 +65,10 @@ extern void *memrchr (void const *, int, size_t); # endif #elif defined GNULIB_POSIXCHECK # undef memrchr -# define memrchr memrchr_is_unportable__use_gnulib_module_memrchr_for_portability +# define memrchr(a,b,c) \ + (GL_LINK_WARNING ("memrchr is unportable - "\ + "use gnulib module memrchr for portability"), \ + memrchr (a, b, c)) #endif /* Copy SRC to DST, returning the address of the terminating '\0' in DST. */ @@ -96,7 +78,10 @@ extern char *stpcpy (char *restrict __dst, char const *restrict __src); # endif #elif defined GNULIB_POSIXCHECK # undef stpcpy -# define stpcpy stpcpy_is_unportable__use_gnulib_module_stpcpy_for_portability +# define stpcpy(a,b) \ + (GL_LINK_WARNING ("stpcpy is unportable - "\ + "use gnulib module stpcpy for portability"), \ + stpcpy (a, b)) #endif /* Copy no more than N bytes of SRC to DST, returning a pointer past the @@ -109,7 +94,10 @@ extern char *stpncpy (char *restrict __dst, char const *restrict __src, # endif #elif defined GNULIB_POSIXCHECK # undef stpncpy -# define stpncpy stpncpy_is_unportable__use_gnulib_module_stpncpy_for_portability +# define stpncpy(a,b,n) \ + (GL_LINK_WARNING ("stpncpy is unportable - "\ + "use gnulib module stpncpy for portability"), \ + stpncpy (a, b, n)) #endif /* Compare strings S1 and S2, ignoring case, returning less than, equal to or @@ -125,7 +113,12 @@ extern int strcasecmp (char const *s1, char const *s2); as a sequence of bytes, not of characters. */ # undef strcasecmp # define strcasecmp(a,b) \ - (GL_LINK_WARNING ("strcasecmp cannot work correctly on character strings in multibyte locales - use mbscasecmp if you care about internationalization, or use c_strcasecmp (from gnulib module c-strcase) if you want a locale independent function"), \ + (GL_LINK_WARNING ("strcasecmp cannot work correctly on character strings " \ + "in multibyte locales - "\ + "use mbscasecmp if you care about " \ + "internationalization, or use c_strcasecmp (from " \ + "gnulib module c-strcase) if you want a locale " \ + "independent function"), \ strcasecmp (a, b)) #endif @@ -141,9 +134,14 @@ extern int strncasecmp (char const *s1, char const *s2, size_t n); POSIX says that it operates on "strings", and "string" in POSIX is defined as a sequence of bytes, not of characters. */ # undef strncasecmp -# define strncasecmp(a,b) \ - (GL_LINK_WARNING ("strncasecmp cannot work correctly on character strings in multibyte locales - don't use it if you care about internationalization; use c_strncasecmp (from gnulib module c-strcase) if you want a locale independent function"), \ - strncasecmp (a, b)) +# define strncasecmp(a,b,n) \ + (GL_LINK_WARNING ("strncasecmp cannot work correctly on character " \ + "strings in multibyte locales - "\ + "use mbsncasecmp or mbspcasecmp if you care about " \ + "internationalization, or use c_strncasecmp (from " \ + "gnulib module c-strcase) if you want a locale " \ + "independent function"), \ + strncasecmp (a, b, n)) #endif #if defined GNULIB_POSIXCHECK @@ -151,7 +149,9 @@ extern int strncasecmp (char const *s1, char const *s2, size_t n); GB18030 and the character to be searched is a digit. */ # undef strchr # define strchr(s,c) \ - (GL_LINK_WARNING ("strchr cannot work correctly on character strings in some multibyte locales - use mbschr if you care about internationalization"), \ + (GL_LINK_WARNING ("strchr cannot work correctly on character strings " \ + "in some multibyte locales - "\ + "use mbschr if you care about internationalization"), \ strchr (s, c)) #endif @@ -162,7 +162,10 @@ extern char *strchrnul (char const *__s, int __c_in); # endif #elif defined GNULIB_POSIXCHECK # undef strchrnul -# define strchrnul strchrnul_is_unportable__use_gnulib_module_strchrnul_for_portability +# define strchrnul(a,b) \ + (GL_LINK_WARNING ("strchrnul is unportable - "\ + "use gnulib module strchrnul for portability"), \ + strchrnul (a, b)) #endif /* Duplicate S, returning an identical malloc'd string. */ @@ -172,7 +175,10 @@ extern char *strdup (char const *__s); # endif #elif defined GNULIB_POSIXCHECK # undef strdup -# define strdup strdup_is_unportable__use_gnulib_module_strdup_for_portability +# define strdup(a) \ + (GL_LINK_WARNING ("strdup is unportable - "\ + "use gnulib module strdup for portability"), \ + strdup (a)) #endif /* Return a newly allocated copy of at most N bytes of STRING. */ @@ -186,7 +192,10 @@ extern char *strndup (char const *__string, size_t __n); # endif #elif defined GNULIB_POSIXCHECK # undef strndup -# define strndup strndup_is_unportable__use_gnulib_module_strndup_for_portability +# define strndup(a,n) \ + (GL_LINK_WARNING ("strndup is unportable - "\ + "use gnulib module strndup for portability"), \ + strndup (a, n)) #endif /* Find the length (number of bytes) of STRING, but scan at most @@ -198,7 +207,10 @@ extern size_t strnlen (char const *__string, size_t __maxlen); # endif #elif defined GNULIB_POSIXCHECK # undef strnlen -# define strnlen strnlen_is_unportable__use_gnulib_module_strnlen_for_portability +# define strnlen(a,n) \ + (GL_LINK_WARNING ("strnlen is unportable - "\ + "use gnulib module strnlen for portability"), \ + strnlen (a, n)) #endif #if defined GNULIB_POSIXCHECK @@ -208,7 +220,9 @@ extern size_t strnlen (char const *__string, size_t __maxlen); digit. */ # undef strcspn # define strcspn(s,a) \ - (GL_LINK_WARNING ("strcspn cannot work correctly on character strings in multibyte locales - use mbscspn if you care about internationalization"), \ + (GL_LINK_WARNING ("strcspn cannot work correctly on character strings " \ + "in multibyte locales - "\ + "use mbscspn if you care about internationalization"), \ strcspn (s, a)) #endif @@ -224,12 +238,17 @@ extern char *strpbrk (char const *__s, char const *__accept); digit. */ # undef strpbrk # define strpbrk(s,a) \ - (GL_LINK_WARNING ("strpbrk cannot work correctly on character strings in multibyte locales - use mbspbrk if you care about internationalization"), \ + (GL_LINK_WARNING ("strpbrk cannot work correctly on character strings " \ + "in multibyte locales - "\ + "use mbspbrk if you care about internationalization"), \ strpbrk (s, a)) # endif #elif defined GNULIB_POSIXCHECK # undef strpbrk -# define strpbrk strpbrk_is_unportable__use_gnulib_module_strpbrk_for_portability +# define strpbrk(s,a) \ + (GL_LINK_WARNING ("strpbrk is unportable - "\ + "use gnulib module strpbrk for portability"), \ + strpbrk (s, a)) #endif #if defined GNULIB_POSIXCHECK @@ -237,7 +256,9 @@ extern char *strpbrk (char const *__s, char const *__accept); Even in this simple case, it cannot work with multibyte strings. */ # undef strspn # define strspn(s,a) \ - (GL_LINK_WARNING ("strspn cannot work correctly on character strings in multibyte locales - use mbsspn if you care about internationalization"), \ + (GL_LINK_WARNING ("strspn cannot work correctly on character strings " \ + "in multibyte locales - "\ + "use mbsspn if you care about internationalization"), \ strspn (s, a)) #endif @@ -246,7 +267,9 @@ extern char *strpbrk (char const *__s, char const *__accept); GB18030 and the character to be searched is a digit. */ # undef strrchr # define strrchr(s,c) \ - (GL_LINK_WARNING ("strrchr cannot work correctly on character strings in some multibyte locales - use mbsrchr if you care about internationalization"), \ + (GL_LINK_WARNING ("strrchr cannot work correctly on character strings " \ + "in some multibyte locales - "\ + "use mbsrchr if you care about internationalization"), \ strrchr (s, c)) #endif @@ -270,9 +293,20 @@ extern char *strpbrk (char const *__s, char const *__accept); # if ! @HAVE_STRSEP@ extern char *strsep (char **restrict __stringp, char const *restrict __delim); # endif +# if defined GNULIB_POSIXCHECK +# undef strsep +# define strsep(s,d) \ + (GL_LINK_WARNING ("strsep cannot work correctly on character strings " \ + "in multibyte locales - "\ + "use mbssep if you care about internationalization"), \ + strsep (s, d)) +# endif #elif defined GNULIB_POSIXCHECK # undef strsep -# define strsep strsep_is_unportable__use_gnulib_module_strsep_for_portability +# define strsep(s,d) \ + (GL_LINK_WARNING ("strsep is unportable - "\ + "use gnulib module strsep for portability"), \ + strsep (s, d)) #endif #if defined GNULIB_POSIXCHECK @@ -282,7 +316,9 @@ extern char *strsep (char **restrict __stringp, char const *restrict __delim); as a sequence of bytes, not of characters. */ # undef strstr # define strstr(a,b) \ - (GL_LINK_WARNING ("strstr cannot work correctly on character strings in most multibyte locales - use mbsstr if you care about internationalization"), \ + (GL_LINK_WARNING ("strstr cannot work correctly on character strings " \ + "in most multibyte locales - "\ + "use mbsstr if you care about internationalization"), \ strstr (a, b)) #endif @@ -297,7 +333,11 @@ extern char *strcasestr (const char *haystack, const char *needle); locales. */ # undef strcasestr # define strcasestr(a,b) \ - (GL_LINK_WARNING ("strcasestr does work correctly on character strings in multibyte locales - use mbscasestr if you care about internationalization, or use c-strcasestr if you want a locale independent function"), \ + (GL_LINK_WARNING ("strcasestr does work correctly on character strings " \ + "in multibyte locales - "\ + "use mbscasestr if you care about " \ + "internationalization, or use c-strcasestr if you want " \ + "a locale independent function"), \ strcasestr (a, b)) #endif @@ -325,18 +365,35 @@ extern char *strcasestr (const char *haystack, const char *needle); See also strsep(). */ #if @GNULIB_STRTOK_R@ # if ! @HAVE_DECL_STRTOK_R@ -extern char *strtok_r (char *restrict __s, char const *restrict __sep, - char **restrict __lasts); +extern char *strtok_r (char *restrict s, char const *restrict delim, + char **restrict save_ptr); +# endif +# if defined GNULIB_POSIXCHECK +# undef strtok_r +# define strtok_r(s,d,p) \ + (GL_LINK_WARNING ("strtok_r cannot work correctly on character strings " \ + "in multibyte locales - "\ + "use mbstok_r if you care about internationalization"), \ + strtok_r (s, d, p)) # endif #elif defined GNULIB_POSIXCHECK # undef strtok_r -# define strtok_r strtok_r_is_unportable__use_gnulib_module_strtok_r_for_portability +# define strtok_r(s,d,p) \ + (GL_LINK_WARNING ("strtok_r is unportable - "\ + "use gnulib module strtok_r for portability"), \ + strtok_r (s, d, p)) #endif /* The following functions are not specified by POSIX. They are gnulib extensions. */ +#if @GNULIB_MBSLEN@ +/* Return the number of multibyte characters in the character string STRING. + This considers multibyte characters, unlike strlen, which counts bytes. */ +extern size_t mbslen (const char *string); +#endif + #if @GNULIB_MBSCHR@ /* Locate the first single-byte character C in the character string STRING, and return a pointer to it. Return NULL if C is not found in STRING. @@ -373,6 +430,32 @@ extern char * mbsstr (const char *haystack, const char *needle); extern int mbscasecmp (const char *s1, const char *s2); #endif +#if @GNULIB_MBSNCASECMP@ +/* Compare the initial segment of the character string S1 consisting of at most + N characters with the initial segment of the character string S2 consisting + of at most N characters, ignoring case, returning less than, equal to or + greater than zero if the initial segment of S1 is lexicographically less + than, equal to or greater than the initial segment of S2. + Note: This function may, in multibyte locales, return 0 for initial segments + of different lengths! + Unlike strncasecmp(), this function works correctly in multibyte locales. + But beware that N is not a byte count but a character count! */ +extern int mbsncasecmp (const char *s1, const char *s2, size_t n); +#endif + +#if @GNULIB_MBSPCASECMP@ +/* Compare the initial segment of the character string STRING consisting of + at most mbslen (PREFIX) characters with the character string PREFIX, + ignoring case, returning less than, equal to or greater than zero if this + initial segment is lexicographically less than, equal to or greater than + PREFIX. + Note: This function may, in multibyte locales, return 0 if STRING is of + smaller length than PREFIX! + Unlike strncasecmp(), this function works correctly in multibyte + locales. */ +extern char * mbspcasecmp (const char *string, const char *prefix); +#endif + #if @GNULIB_MBSCASESTR@ /* Find the first occurrence of the character string NEEDLE in the character string HAYSTACK, using case-insensitive comparison. @@ -409,6 +492,44 @@ extern char * mbspbrk (const char *string, const char *accept); extern size_t mbsspn (const char *string, const char *reject); #endif +#if @GNULIB_MBSSEP@ +/* Search the next delimiter (multibyte character listed in the character + string DELIM) starting at the character string *STRINGP. + If one is found, overwrite it with a NUL, and advance *STRINGP to point + to the next multibyte character after it. Otherwise, set *STRINGP to NULL. + If *STRINGP was already NULL, nothing happens. + Return the old value of *STRINGP. + + This is a variant of mbstok_r() that supports empty fields. + + Caveat: It modifies the original string. + Caveat: These functions cannot be used on constant strings. + Caveat: The identity of the delimiting character is lost. + + See also mbstok_r(). */ +extern char * mbssep (char **stringp, const char *delim); +#endif + +#if @GNULIB_MBSTOK_R@ +/* Parse the character string STRING into tokens separated by characters in + the character string DELIM. + If STRING is NULL, the saved pointer in SAVE_PTR is used as + the next starting point. For example: + char s[] = "-abc-=-def"; + char *sp; + x = mbstok_r(s, "-", &sp); // x = "abc", sp = "=-def" + x = mbstok_r(NULL, "-=", &sp); // x = "def", sp = NULL + x = mbstok_r(NULL, "=", &sp); // x = NULL + // s = "abc\0-def\0" + + Caveat: It modifies the original string. + Caveat: These functions cannot be used on constant strings. + Caveat: The identity of the delimiting character is lost. + + See also mbssep(). */ +extern char * mbstok_r (char *string, const char *delim, char **save_ptr); +#endif + #ifdef __cplusplus }