lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-06-15 06:41:47 +03:00
Code Activity

Update.

Browse Source 
1998-03-13 16:55  Ulrich Drepper  <drepper@cygnus.com>

	* string/tester.c (test_strpbrk): Add more strpbrk tests.
	(test_strsep): Likewise.  Correct horrible bugs.

	* string/bits/string2.h (strcspn): Optimize also reject string of
	length 2 and 3.
	(strspn): Likewise.
	(strpbrk): Likewise.
	(strsep): Likewise.  Correct bug with successive separators and
	separators at the end of the string.
	* sysdeps/generic/strsep.c: Correct bug with successive separators
	and separators at the end of the string.

1998-03-13 13:11  Tim Waugh  <tim@cyberelk.demon.co.uk>

	* posix/wordexp.c (parse_param): Positional parameters ($1, $2
	etc) now handled, as well as $$ (pid).

	* posix/Makefile (tests): Execute wordexp-test.sh for `make check'.
	(distribute): Add wordexp-tst.sh.

	* posix/wordexp-tst.sh: New file.

	* posix/wordexp.c (parse_param): $# (or ${#}) expands to the
	number of positional parameters.  Renamed substitute_length to
	seen_hash.
	Don't free(env) is env is NULL.

1998-03-13 16:50  Ulrich Drepper  <drepper@cygnus.com>

	* libc.map: Add pthread_attr_init to GLIBC_2.1.

1998-03-13 15:01  Ulrich Drepper  <drepper@cygnus.com>

	* gmon/gmon.c: Allow GMON_OUT_PREFIX variable to specify filename
	for output file replacing gmon.out.
	Patch by Dean Gaudet <dgaudet@arctic.org>.

1998-03-12  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* elf/dl-misc.c (_dl_debug_message): Fix printing of pid.  Clean
	up namespace.  Optimize finding end of line.

1998-03-12  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* elf/rtld.c (process_envvars): Ignore LD_DEBUG_OUTPUT if running
	securely.  Optimized.
	(process_dl_debug): Add ':' to list of separators.  Optimized.

1998-03-13 10:25  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
This commit is contained in:
Ulrich Drepper
1998-03-13 17:02:23 +00:00
parent a7b591dc31
commit 14c44e2ec4
12 changed files with 679 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

192
string/bits/string2.h
View File

@ -1,5 +1,5 @@
/* Machine-independant string function optimizations.
Copyright (C) 1997 Free Software Foundation, Inc.
Copyright (C) 1997, 1998 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@ -526,7 +526,15 @@ __STRING2_COPY_TYPE (8);
? strlen (s) \
: (((__const unsigned char *) (reject))[1] == '\0' \
? __strcspn_c1 (s, ((__const char *) (reject))[0]) \
: strcspn (s, reject))) \
: (((__const unsigned char *) (reject))[2] == '\0' \
? __strcspn_c2 (s, ((__const char *) (reject))[0], \
((__const char *) (reject))[1]) \
: (((__const unsigned char *) (reject))[3] == '\0' \
? __strcspn_c3 (s, \
((__const char *) (reject))[0], \
((__const char *) (reject))[1], \
((__const char *) (reject))[2]) \
: strcspn (s, reject))))) \
: strcspn (s, reject)))
__STRING_INLINE size_t __strcspn_c1 (__const char *__s, char __reject);
@ -538,6 +546,31 @@ __strcspn_c1 (__const char *__s, char __reject)
++__result;
return __result;
}
__STRING_INLINE size_t __strcspn_c2 (__const char *__s, char __reject1,
char __reject2);
__STRING_INLINE size_t
__strcspn_c2 (__const char *__s, char __reject1, char __reject2)
{
register size_t __result = 0;
while (__s[__result] != '\0' && __s[__result] != __reject1
&& __s[__result] != __reject2)
++__result;
return __result;
}
__STRING_INLINE size_t __strcspn_c3 (__const char *__s, char __reject1,
char __reject2, char __reject3);
__STRING_INLINE size_t
__strcspn_c3 (__const char *__s, char __reject1, char __reject2,
char __reject3)
{
register size_t __result = 0;
while (__s[__result] != '\0' && __s[__result] != __reject1
&& __s[__result] != __reject2 && __s[__result] != __reject3)
++__result;
return __result;
}
#endif
@ -550,7 +583,15 @@ __strcspn_c1 (__const char *__s, char __reject)
? 0 \
: (((__const unsigned char *) (accept))[1] == '\0' \
? __strspn_c1 (s, ((__const char *) (accept))[0]) \
: strspn (s, accept))) \
: (((__const unsigned char *) (accept))[2] == '\0' \
? __strspn_c2 (s, ((__const char *) (accept))[0], \
((__const char *) (accept))[1]) \
: (((__const unsigned char *) (accept))[3] == '\0' \
? __strspn_c3 (s, \
((__const char *) (accept))[0], \
((__const char *) (accept))[1], \
((__const char *) (accept))[2]) \
: strspn (s, accept))))) \
: strspn (s, accept)))
__STRING_INLINE size_t __strspn_c1 (__const char *__s, char __accept);
@ -563,6 +604,31 @@ __strspn_c1 (__const char *__s, char __accept)
++__result;
return __result;
}
__STRING_INLINE size_t __strspn_c2 (__const char *__s, char __accept1,
char __accept2);
__STRING_INLINE size_t
__strspn_c2 (__const char *__s, char __accept1, char __accept2)
{
register size_t __result = 0;
/* Please note that __accept1 and __accept2 never can be '\0'. */
while (__s[__result] == __accept1 || __s[__result] == __accept2)
++__result;
return __result;
}
__STRING_INLINE size_t __strspn_c3 (__const char *__s, char __accept1,
char __accept2, char __accept3);
__STRING_INLINE size_t
__strspn_c3 (__const char *__s, char __accept1, char __accept2, char __accept3)
{
register size_t __result = 0;
/* Please note that __accept1 to __accept3 never can be '\0'. */
while (__s[__result] == __accept1 || __s[__result] == __accept2
|| __s[__result] == __accept3)
++__result;
return __result;
}
#endif
@ -574,8 +640,40 @@ __strspn_c1 (__const char *__s, char __accept)
? NULL \
: (((__const unsigned char *) (accept))[1] == '\0' \
? strchr (s, ((__const unsigned char *) (accept))[0]) \
: strpbrk (s, accept))) \
: (((__const unsigned char *) (accept))[2] == '\0' \
? __strpbrk_c2 (s, ((__const char *) (accept))[0], \
((__const char *) (accept))[1]) \
: (((__const unsigned char *) (accept))[3] == '\0' \
? __strpbrk_c3 (s, \
((__const char *) (accept))[0], \
((__const char *) (accept))[1], \
((__const char *) (accept))[2]) \
: strpbrk (s, accept))))) \
: strpbrk (s, accept)))
__STRING_INLINE char *__strpbrk_c2 (__const char *__s, char __accept1,
char __accept2);
__STRING_INLINE char *
__strpbrk_c2 (__const char *__s, char __accept1, char __accept2)
{
/* Please note that __accept1 and __accept2 never can be '\0'. */
while (*__s != '\0' && *__s != __accept1 && *__s != __accept2)
++__s;
return *__s == '\0' ? NULL : (char *) __s;
}
__STRING_INLINE char *__strpbrk_c3 (__const char *__s, char __accept1,
char __accept2, char __accept3);
__STRING_INLINE char *
__strpbrk_c3 (__const char *__s, char __accept1, char __accept2,
char __accept3)
{
/* Please note that __accept1 to __accept3 never can be '\0'. */
while (*__s != '\0' && *__s != __accept1 && *__s != __accept2
&& *__s != __accept3)
++__s;
return *__s == '\0' ? NULL : (char *) __s;
}
#endif
@ -612,8 +710,7 @@ strnlen (__const char *__string, size_t __maxlen)
(__extension__ (__builtin_constant_p (sep) && __string2_1bptr_p (sep) \
? (((__const unsigned char *) (sep))[0] != '\0' \
&& ((__const unsigned char *) (sep))[1] == '\0' \
? __strtok_r_1c (s, ((__const unsigned char *) (sep))[0],\
nextp) \
? __strtok_r_1c (s, ((__const char *) (sep))[0], nextp) \
: strtok_r (s, sep, nextp)) \
: strtok_r (s, sep, nextp)))
@ -652,11 +749,18 @@ __strtok_r_1c (char *__s, char __sep, char **__nextp)
# define strsep(s, reject) \
(__extension__ (__builtin_constant_p (reject) && __string2_1bptr_p (reject) \
? (((__const unsigned char *) (reject))[0] != '\0' \
&& ((__const unsigned char *) (reject))[1] == '\0' \
&& ((__const unsigned char *) (reject))[0] != '\0' \
? (((__const unsigned char *) (reject))[1] == '\0' \
? __strsep_1c (s, \
((__const unsigned char *) (reject))[0]) \
: __strsep_g (s, reject)) \
((__const char *) (reject))[0]) \
: (((__const unsigned char *) (reject))[2] == '\0' \
? __strsep_2c (s, ((__const char *) (reject))[0], \
((__const char *) (reject))[1]) \
: (((__const unsigned char *) (reject))[3] == '\0' \
? __strsep_3c (s, ((__const char *) (reject))[0], \
((__const char *) (reject))[1], \
((__const char *) (reject))[2]) \
: __strsep_g (s, reject)))) \
: __strsep_g (s, reject)))
__STRING_INLINE char *__strsep_1c (char **__s, char __reject);
@ -664,12 +768,68 @@ __STRING_INLINE char *
__strsep_1c (char **__s, char __reject)
{
register char *__retval = *__s;
if (__retval == NULL || *__retval == '\0')
return NULL;
while (*__retval == __reject)
++__retval;
if ((*__s = strchr (__retval, __reject)) != NULL)
if (__retval == NULL)
return *__s = NULL;
if (*__retval == __reject)
*(*__s)++ = '\0';
else
if ((*__s = strchr (__retval, __reject)) != NULL)
*(*__s)++ = '\0';
else
*__s = NULL;
return __retval;
}
__STRING_INLINE char *__strsep_2c (char **__s, char __reject1, char __reject2);
__STRING_INLINE char *
__strsep_2c (char **__s, char __reject1, char __reject2)
{
register char *__retval = *__s;
if (__retval == NULL)
return *__s = NULL;
if (*__retval == __reject1 || *__retval == __reject2)
*(*__s)++ = '\0';
else
{
register char *__cp = __retval;
while (*__cp != '\0' && *__cp != __reject1 && *__cp != __reject2)
++__cp;
if (*__cp != '\0')
{
*__s = __cp;
*(*__s)++ = '\0';
}
else
*__s = NULL;
}
return __retval;
}
__STRING_INLINE char *__strsep_3c (char **__s, char __reject1, char __reject2,
char __reject3);
__STRING_INLINE char *
__strsep_3c (char **__s, char __reject1, char __reject2, char __reject3)
{
register char *__retval = *__s;
if (__retval == NULL)
return *__s = NULL;
if (*__retval == __reject1 || *__retval == __reject2
|| *__retval == __reject3)
*(*__s)++ = '\0';
else
{
register char *__cp = __retval;
while (*__cp != '\0' && *__cp != __reject1 && *__cp != __reject2
&& *__cp != __reject3)
++__cp;
if (*__cp != '\0')
{
*__s = __cp;
*(*__s)++ = '\0';
}
else
*__s = NULL;
}
return __retval;
}
@ -680,7 +840,7 @@ __strsep_g (char **__s, __const char *__reject)
register char *__retval = *__s;
if (__retval == NULL || *__retval == '\0')
return NULL;
if ((*__s = strpbrk (__retval, __reject)) != NULL)
if ((*__s = strpbrk (__retval, __reject)) != '\0')
*(*__s)++ = '\0';
return __retval;
}