mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 23:30:07 +00:00
c4563d2d66
1999-04-28 Ulrich Drepper <drepper@cygnus.com> * argp/argp-ba.c (argp_program_bug_address): Don't initialize with 0. * argp/argp-parse.c (_argp_hang): Likewise. * argp/argp-pv.c (argp_program_version): Likewise. * argp/argp-pvh.c (argp_program_version_hook): Likewise. * inet/ether_hton.c (ether_hton, startp): Likewise. * inet/ether_ntoh.c (ether_ntoh, startp): Likewise. * inet/getnetgrent_r.c (setup, startp): Likewise. * intl/loadmsgcat.c (_nl_msg_cat_cntr): Likewise. * intl/localealias.c (string_space, string_space_act, string_space_max, nmap, maxmap): Likewise. * libio/iopopen.c (proc_file_chain): Likewise. * libio/oldiopopen.c (old_proc_file_chain): Likewise. * locale/lc-collate.c (__collate_table, __collate_extra, __collate_element_hash, __collate_element_strings, __collate_element_values): Likewise. * malloc/mcheck.c (mcheck_used): Likewise. * malloc/mtrace.c (added_atexit_handler): Likewise. * malloc/set-freeres.c (already_called): Likewise. * misc/getpass.c (getpass) [buf, bufsize]: Likewise. * misc/syslog.c (LogStat, LogTag): Likewise. * nss/XXX-lookup.c (DATABASE_NAME_SYMBOL): Likewise. * nss/getXXbyYY_r.c (startp): Likewise. * posix/getopt.c (optarg, __getopt_initialized): Likewise. * posix/regex.c (init_syntax_once) [done]: Likewise. (debug): Likewise. * string/strfry.c (init): Likewise. * sunrpc/svc_run.c (svc_top): Likewise. * posix/euidaccess.c (have_ids): Likewise. * sysdeps/unix/sysv/linux/poll.c (must_emulate): Likewise. * sysdeps/unix/sysv/linux/ttyname.c (__ttyname, namelen): Likewise. * time/getdate.c (getdate_err): Likewise. * time/tzfile.c (transitions, type_idxs, types, zone_names, leaps): Likewise. * time/tzset.c (old_tz, is_initialized): Likewise. * inet/getnameinfo.c (nrl_domainname): Rewrite to allow initialization of static data with zero. * signal/allocrtsig.c (init): Likewise. * string/Makefile (routines): Add strchrnul. * string/Versions [GLIBC_2.1.1]: Add strchrnul. * string/string.c: Add strchrnul prototype. * include/string.h: Add __strchrnul prototype. * sysdeps/generic/strchrnul.c: New file. * sysdeps/i386/strchrnul.S: New file. * sysdeps/i386/bits/string.c: Add strchrnul optimization. * sysdeps/i386/i486/bits/string.c: Likewise. * argp/argp-help.c (argp_args_usage): Use __strchrnul. * inet/ether_line.c (ether_line): Likewise. * nscd/nscd_conf.c (nscd_parse_file): Likewise. * nss/nsswitch.c (nss_parse_file): Likewise. * posix/execvp.c (execvp): Likewise. * posix/fnmatch.c (internal_fnmatch): Likewise. * resolv/res_hconf.c (_res_hconv_init): Likewise. * resolv/res_init.c (res_init): Likewise. * stdlib/fmtmsg.c (init): Likewise. * stdlib/getsubopt.c (getsubopt): Likewise. * catgets/catgets.c (catopen): Only allocate one memory block. (catclose): Only one free call necessary. * catgets/open_catalog.c (__open_catalog): Simplify handling of file descriptor. * ctype/ctype-extn.c: Make __toascii_l and __isascii_l alias instead of real functions. Simplify _tolower and _toupper. * grp/initgroups.c (compat_call): Remove unnecessary use of pointer variable. * iconv/gconv.h (struct gconv_info): Change data element from pointer to array of size 0. * iconv/gconv_open.c (__gconv_open): Allocate structures accordingly. * iconv/gconv_close.c (__gconv_close): Don't free data. * iconv/gconv_conf.c (add_alias): Avoid searching in tree twice to insert new alias. * iconv/gconv_db.c (add_derivation): More efficient copying. Check for error while inserting in tree. * include/time.h: Pretty print. * inet/ruserpass.c: Rewrite use of toktab to avoid string pointers in table and lots of relocations. * posix/regex.c (regerror): Rewrite use of re_error_msgid to avoid string pointers in table and lots of relocations. * intl/finddomain.c: Remove definition of strchr macro. * io/ftw.c (nftw_arr, ftw_arr): Make const. * locale/loadlocale.c (_nl_load_locale): Optimize string copying. * locale/localeinfo.h (_nl_category_names): Change into an array with fixed width char string elements. * locale/setlocale.c (_nl_category_names): Likewise. (_nl_current): Make global. * locale/nl_langinfo.c (nldata): Removed. Use _nl_current now. * malloc/Makefile (distribute): Add stackinfo.h. * sysdeps/generic/stackinfo.h: New file. * sysdeps/i386/stackinfo.h: New file. * posix/execl.c: Use stackinfo.h in optimizing alloca use. * posix/execle.c: Likewise. * posix/execlp.c: Likewise. * nis/nis_table.c (__create_ib_request): Always use realloc. * posix/execvp.c (execute): Rename to script_execute and keep only code to execute using shell. (execvp): Call execv directly and only fall back on script_execute. * resolv/inet_net_pton.c (inet_net_pton_ipv4): Remove digits define and always use xdigits instead. * resolv/res_init.c (res_init): Use rawmemchr instead of strchr where appropriate. * stdlib/fpioconst.h (__tens): New declaration. (struct mp_power): Remove array, add arrayoff element. * stdlib/fpioconst.c: Replace definitions of _ten_p* arrays by one __tens array and add in _fpioconst_pow10 offsets into __tens. * stdio-common/printf_fp.c: Rewrite to use new __tens array. * stdlib/strtod.c: Likewise. * stdlib/a64l.c (a64l_table): Avoid unnecessary elements. * stdlib/exit.c: Rewrite to use __exit_funcs being as sign for end of the list. * stdlib/atexit.c (__exit_funcs): Don't initialize. * stdlib/fmtmsg.c (keywords): Make name element fixed width array. * sunrpc/clnt_perr.c: Rewrite clnt_sperrno and auth_errmsg to use a single and an array with offsets. * sunrpc/des_soft.c (partab): Make it const. * sunrpc/key_call.c (trytimeout, tottimeout): Make const. (__key_encryptsession_pk_LOCAL): Don't initialize with 0. (__key_decryptsession_pk_LOCAL): Likewise. (__key_gendes_LOCAL): Likewise. (MESSENGER): Mark const. (key_call_private_main): Don't initialize with 0. (use_keyenvoy): Don't initialize with 0. (key_call): Rewrite to reverse logic of use_doors variable. * sunrpc/netname.c (OPSYS): Define as array, not pointer. (startp): Don't initialize with zero. * sunrpc/openchild.c (_openchild): Make first argument const. * sunrpc/pmap_rmt.c (timeout): Mark const. * sunrpc/xcrypt.c (hex): Likewise. * sysdeps/unix/sysv/linux/getcwd.c: Rewrite to allow omitting initialization of global variables. * sysdeps/unix/sysv/linux/getpt.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c: Likewise. * termios/tcgetsid.c: Likewise. * sysdeps/unix/sysv/linux/i386/dl-procinfo.h (x86_cap_flags): Change fxsr to osfxsr. * time/tzfile.c (__tzfile_read): Rewrite to allocate only one memory block. Add function to free memory if wanted. * time/tzset.c (tzset_internal): Pass extra argument to __tzfile_read. * wcsmbs/wcsmbsload.c (to_wc, to_mb): Correct initializers. * wcsmbs/wmemset.c: Little code optimization.
353 lines
13 KiB
C
353 lines
13 KiB
C
/* Copyright (C) 1991,92,93,95,96,97,98,99 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 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. */
|
|
|
|
/*
|
|
* ISO C Standard: 4.11 STRING HANDLING <string.h>
|
|
*/
|
|
|
|
#ifndef _STRING_H
|
|
#define _STRING_H 1
|
|
|
|
#include <features.h>
|
|
|
|
__BEGIN_DECLS
|
|
|
|
/* Get size_t and NULL from <stddef.h>. */
|
|
#define __need_size_t
|
|
#define __need_NULL
|
|
#include <stddef.h>
|
|
|
|
|
|
/* Copy N bytes of SRC to DEST. */
|
|
extern __ptr_t memcpy __P ((__ptr_t __restrict __dest,
|
|
__const __ptr_t __restrict __src, size_t __n));
|
|
/* Copy N bytes of SRC to DEST, guaranteeing
|
|
correct behavior for overlapping strings. */
|
|
extern __ptr_t memmove __P ((__ptr_t __dest, __const __ptr_t __src,
|
|
size_t __n));
|
|
|
|
/* Copy no more than N bytes of SRC to DEST, stopping when C is found.
|
|
Return the position in DEST one byte past where C was copied,
|
|
or NULL if C was not found in the first N bytes of SRC. */
|
|
#if defined __USE_SVID || defined __USE_BSD || defined __USE_XOPEN
|
|
extern __ptr_t memccpy __P ((__ptr_t __dest, __const __ptr_t __src,
|
|
int __c, size_t __n));
|
|
#endif /* SVID. */
|
|
|
|
|
|
/* Set N bytes of S to C. */
|
|
extern __ptr_t memset __P ((__ptr_t __s, int __c, size_t __n));
|
|
|
|
/* Compare N bytes of S1 and S2. */
|
|
extern int memcmp __P ((__const __ptr_t __s1, __const __ptr_t __s2,
|
|
size_t __n));
|
|
|
|
/* Search N bytes of S for C. */
|
|
extern __ptr_t memchr __P ((__const __ptr_t __s, int __c, size_t __n));
|
|
|
|
#ifdef __USE_GNU
|
|
/* Search in S for C. This is similar to `memchr' but there is no
|
|
length limit. */
|
|
extern __ptr_t rawmemchr __P ((__const __ptr_t __s, int __c));
|
|
#endif
|
|
|
|
|
|
/* Copy SRC to DEST. */
|
|
extern char *strcpy __P ((char *__restrict __dest,
|
|
__const char *__restrict __src));
|
|
/* Copy no more than N characters of SRC to DEST. */
|
|
extern char *strncpy __P ((char *__restrict __dest,
|
|
__const char *__restrict __src, size_t __n));
|
|
|
|
/* Append SRC onto DEST. */
|
|
extern char *strcat __P ((char *__restrict __dest,
|
|
__const char *__restrict __src));
|
|
/* Append no more than N characters from SRC onto DEST. */
|
|
extern char *strncat __P ((char *__restrict __dest,
|
|
__const char *__restrict __src, size_t __n));
|
|
|
|
/* Compare S1 and S2. */
|
|
extern int strcmp __P ((__const char *__s1, __const char *__s2));
|
|
/* Compare N characters of S1 and S2. */
|
|
extern int strncmp __P ((__const char *__s1, __const char *__s2, size_t __n));
|
|
|
|
/* Compare the collated forms of S1 and S2. */
|
|
extern int strcoll __P ((__const char *__s1, __const char *__s2));
|
|
/* Put a transformation of SRC into no more than N bytes of DEST. */
|
|
extern size_t strxfrm __P ((char *__restrict __dest,
|
|
__const char *__restrict __src, size_t __n));
|
|
|
|
#ifdef __USE_GNU
|
|
/* The following functions are equivalent to the both above but they
|
|
take the locale they use for the collation as an extra argument.
|
|
This is not standardsized but something like will come. */
|
|
# include <xlocale.h>
|
|
|
|
/* Compare the collated forms of S1 and S2 using rules from L. */
|
|
extern int __strcoll_l __P ((__const char *__s1, __const char *__s2,
|
|
__locale_t __l));
|
|
/* Put a transformation of SRC into no more than N bytes of DEST. */
|
|
extern size_t __strxfrm_l __P ((char *__dest, __const char *__src, size_t __n,
|
|
__locale_t __l));
|
|
#endif
|
|
|
|
#if defined __USE_SVID || defined __USE_BSD || defined __USE_XOPEN_EXTENDED
|
|
/* Duplicate S, returning an identical malloc'd string. */
|
|
extern char *__strdup __P ((__const char *__s));
|
|
extern char *strdup __P ((__const char *__s));
|
|
#endif
|
|
|
|
/* Return a malloc'd copy of at most N bytes of STRING. The
|
|
resultant string is terminated even if no null terminator
|
|
appears before STRING[N]. */
|
|
#if defined __USE_GNU
|
|
extern char *strndup __P ((__const char *__string, size_t __n));
|
|
#endif
|
|
|
|
#if defined __USE_GNU && defined __GNUC__
|
|
/* Duplicate S, returning an identical alloca'd string. */
|
|
# define strdupa(s) \
|
|
(__extension__ \
|
|
({ \
|
|
__const char *__old = (s); \
|
|
size_t __len = strlen (__old) + 1; \
|
|
char *__new = __builtin_alloca (__len); \
|
|
(char *) memcpy (__new, __old, __len); \
|
|
}))
|
|
|
|
/* Return an alloca'd copy of at most N bytes of string. */
|
|
# define strndupa(s, n) \
|
|
(__extension__ \
|
|
({ \
|
|
__const char *__old = (s); \
|
|
size_t __len = strnlen (__old, (n)); \
|
|
char *__new = __builtin_alloca (__len + 1); \
|
|
__new[__len] = '\0'; \
|
|
(char *) memcpy (__new, __old, __len); \
|
|
}))
|
|
#endif
|
|
|
|
/* Find the first occurrence of C in S. */
|
|
extern char *strchr __P ((__const char *__s, int __c));
|
|
/* Find the last occurrence of C in S. */
|
|
extern char *strrchr __P ((__const char *__s, int __c));
|
|
|
|
#ifdef __USE_GNU
|
|
/* This funciton is similar to `strchr'. But it returns a pointer to
|
|
the closing NUL byte in case C is not found in S. */
|
|
extern char *strchrnul __P ((__const char *__s, int __c));
|
|
#endif
|
|
|
|
/* Return the length of the initial segment of S which
|
|
consists entirely of characters not in REJECT. */
|
|
extern size_t strcspn __P ((__const char *__s, __const char *__reject));
|
|
/* Return the length of the initial segment of S which
|
|
consists entirely of characters in ACCEPT. */
|
|
extern size_t strspn __P ((__const char *__s, __const char *__accept));
|
|
/* Find the first occurrence in S of any character in ACCEPT. */
|
|
extern char *strpbrk __P ((__const char *__s, __const char *__accept));
|
|
/* Find the first occurrence of NEEDLE in HAYSTACK. */
|
|
extern char *strstr __P ((__const char *__haystack, __const char *__needle));
|
|
|
|
#ifdef __USE_GNU
|
|
/* Similar to `strstr' but this function ignores the case of both strings. */
|
|
extern char *__strcasestr __P ((__const char *__haystack,
|
|
__const char *__needle));
|
|
extern char *strcasestr __P ((__const char *__haystack,
|
|
__const char *__needle));
|
|
#endif
|
|
|
|
/* Divide S into tokens separated by characters in DELIM. */
|
|
extern char *strtok __P ((char *__restrict __s,
|
|
__const char *__restrict __delim));
|
|
|
|
/* Divide S into tokens separated by characters in DELIM. Information
|
|
passed between calls are stored in SAVE_PTR. */
|
|
extern char *__strtok_r __P ((char *__restrict __s,
|
|
__const char *__restrict __delim,
|
|
char **__restrict __save_ptr));
|
|
#if defined __USE_POSIX || defined __USE_MISC
|
|
extern char *strtok_r __P ((char *__restrict __s,
|
|
__const char *__restrict __delim,
|
|
char **__restrict __save_ptr));
|
|
#endif
|
|
|
|
#ifdef __USE_GNU
|
|
/* Find the first occurrence of NEEDLE in HAYSTACK.
|
|
NEEDLE is NEEDLELEN bytes long;
|
|
HAYSTACK is HAYSTACKLEN bytes long. */
|
|
extern __ptr_t memmem __P ((__const __ptr_t __haystack, size_t __haystacklen,
|
|
__const __ptr_t __needle, size_t __needlelen));
|
|
|
|
/* Copy N bytes of SRC to DEST, return pointer to bytes after the
|
|
last written byte. */
|
|
extern __ptr_t __mempcpy __P ((__ptr_t __restrict __dest,
|
|
__const __ptr_t __restrict __src, size_t __n));
|
|
extern __ptr_t mempcpy __P ((__ptr_t __restrict __dest,
|
|
__const __ptr_t __restrict __src, size_t __n));
|
|
#endif
|
|
|
|
|
|
/* Return the length of S. */
|
|
extern size_t strlen __P ((__const char *__s));
|
|
|
|
#ifdef __USE_GNU
|
|
/* Find the length of STRING, but scan at most MAXLEN characters.
|
|
If no '\0' terminator is found in that many characters, return MAXLEN. */
|
|
extern size_t strnlen __P ((__const char *__string, size_t __maxlen));
|
|
#endif
|
|
|
|
|
|
/* Return a string describing the meaning of the `errno' code in ERRNUM. */
|
|
extern char *strerror __P ((int __errnum));
|
|
#ifdef __USE_MISC
|
|
/* Reentrant version of `strerror'. If a temporary buffer is required, at
|
|
most BUFLEN bytes of BUF will be used. */
|
|
extern char *__strerror_r __P ((int __errnum, char *__buf, size_t __buflen));
|
|
extern char *strerror_r __P ((int __errnum, char *__buf, size_t __buflen));
|
|
#endif
|
|
|
|
/* We define this function always since `bzero' is sometimes needed when
|
|
the namespace rules does not allow this. */
|
|
extern void __bzero __P ((__ptr_t __s, size_t __n));
|
|
|
|
#if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
|
|
/* Copy N bytes of SRC to DEST (like memmove, but args reversed). */
|
|
extern void bcopy __P ((__const __ptr_t __src, __ptr_t __dest, size_t __n));
|
|
|
|
/* Set N bytes of S to 0. */
|
|
extern void bzero __P ((__ptr_t __s, size_t __n));
|
|
|
|
/* Compare N bytes of S1 and S2 (same as memcmp). */
|
|
extern int bcmp __P ((__const __ptr_t __s1, __const __ptr_t __s2, size_t __n));
|
|
|
|
/* Find the first occurrence of C in S (same as strchr). */
|
|
extern char *index __P ((__const char *__s, int __c));
|
|
|
|
/* Find the last occurrence of C in S (same as strrchr). */
|
|
extern char *rindex __P ((__const char *__s, int __c));
|
|
|
|
/* Return the position of the first bit set in I, or 0 if none are set.
|
|
The least-significant bit is position 1, the most-significant 32. */
|
|
extern int __ffs __P ((int __i)) __attribute__ ((const));
|
|
extern int ffs __P ((int __i)) __attribute__ ((const));
|
|
|
|
/* The following two functions are non-standard but necessary for non-32 bit
|
|
platforms. */
|
|
# ifdef __USE_GNU
|
|
extern int ffsl __P ((long int __l)) __attribute__ ((const));
|
|
# ifdef __GNUC__
|
|
__extension__ extern int ffsll __P ((long long int __ll))
|
|
__attribute__ ((const));
|
|
# endif
|
|
# endif
|
|
|
|
/* Compare S1 and S2, ignoring case. */
|
|
extern int __strcasecmp __P ((__const char *__s1, __const char *__s2));
|
|
extern int strcasecmp __P ((__const char *__s1, __const char *__s2));
|
|
|
|
/* Compare no more than N chars of S1 and S2, ignoring case. */
|
|
extern int strncasecmp __P ((__const char *__s1, __const char *__s2,
|
|
size_t __n));
|
|
#endif /* Use BSD or X/Open Unix. */
|
|
|
|
#ifdef __USE_GNU
|
|
/* Again versions of a few functions which use the given locale instead
|
|
of the global one. */
|
|
extern int __strcasecmp_l __P ((__const char *__s1, __const char *__s2,
|
|
__locale_t __loc));
|
|
|
|
extern int __strncasecmp_l __P ((__const char *__s1, __const char *__s2,
|
|
size_t __n, __locale_t __loc));
|
|
#endif
|
|
|
|
#ifdef __USE_BSD
|
|
/* Return the next DELIM-delimited token from *STRINGP,
|
|
terminating it with a '\0', and update *STRINGP to point past it. */
|
|
extern char *strsep __P ((char **__restrict __stringp,
|
|
__const char *__restrict __delim));
|
|
#endif
|
|
|
|
#ifdef __USE_GNU
|
|
/* Compare S1 and S2 as strings holding name & indices/version numbers. */
|
|
extern int strverscmp __P ((__const char *__s1, __const char *__s2));
|
|
|
|
/* Return a string describing the meaning of the signal number in SIG. */
|
|
extern char *strsignal __P ((int __sig));
|
|
|
|
/* Copy SRC to DEST, returning the address of the terminating '\0' in DEST. */
|
|
extern char *__stpcpy __P ((char *__restrict __dest,
|
|
__const char *__restrict __src));
|
|
extern char *stpcpy __P ((char *__restrict __dest,
|
|
__const char *__restrict __src));
|
|
|
|
/* Copy no more than N characters of SRC to DEST, returning the address of
|
|
the last character written into DEST. */
|
|
extern char *__stpncpy __P ((char *__restrict __dest,
|
|
__const char *__restrict __src, size_t __n));
|
|
extern char *stpncpy __P ((char *__restrict __dest,
|
|
__const char *__restrict __src, size_t __n));
|
|
|
|
/* Sautee STRING briskly. */
|
|
extern char *strfry __P ((char *__string));
|
|
|
|
/* Frobnicate N bytes of S. */
|
|
extern __ptr_t memfrob __P ((__ptr_t __s, size_t __n));
|
|
|
|
# ifndef basename
|
|
/* Return the file name within directory of FILENAME. We don't
|
|
declare the function if the `basename' macro is available (defined
|
|
in <libgen.h>) which makes the XPG version of this function
|
|
available. */
|
|
extern char *basename __P ((__const char *__filename));
|
|
# endif
|
|
#endif
|
|
|
|
|
|
#if defined __GNUC__ && __GNUC__ >= 2
|
|
# if defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__ && !defined __cplusplus
|
|
/* When using GNU CC we provide some optimized versions of selected
|
|
functions from this header. There are two kinds of optimizations:
|
|
|
|
- machine-dependent optimizations, most probably using inline
|
|
assembler code; these might be quite expensive since the code
|
|
size can increase significantly.
|
|
These optimizations are not used unless the symbol
|
|
__USE_STRING_INLINES
|
|
is defined before including this header.
|
|
|
|
- machine-independent optimizations which do not increase the
|
|
code size significantly and which optimize mainly situations
|
|
where one or more arguments are compile-time constants.
|
|
These optimizations are used always when the compiler is
|
|
taught to optimize.
|
|
|
|
One can inhibit all optimizations by defining __NO_STRING_INLINES. */
|
|
|
|
/* Get the machine-dependent optimizations (if any). */
|
|
# include <bits/string.h>
|
|
|
|
/* These are generic optimizations which do not add too much inline code. */
|
|
# include <bits/string2.h>
|
|
# endif
|
|
#endif
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* string.h */
|