mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-03 02:11:08 +00:00
4bca4c1748
1998-04-07 08:51 Ulrich Drepper <drepper@cygnus.com> * iconv/gconv.c: Take care for NULL arguments. * iconv/gconv_dl.c: Make find_func function global. * iconv/gconv_int.h: Add prototype for __gconv_find_func. Add prototypes for ASCII conversion functions. * iconv/gconv_simple.c: Add ASCII conversion functions. * locale/C-ctype.c: Correct charset name. * wcsmbs/Makefile (distribute): Add wcsmbsload.h. (routines): Remove wmemrtowcs and wmemrtombs, add wcsnlen and wcsmbsload. * wcsmbs/btowc.c: Rewrite to use iconv functionality. * wcsmbs/mbrtowc.c: Likewise. * wcsmbs/mbsnrtowcs.c: Likewise. * wcsmbs/mbsrtowcs.c: Likewise. * wcsmbs/wcrtomb.c: Likewise. * wcsmbs/wcsnrtombs.c: Likewise. * wcsmbs/wcsrtombs.c: Likewise. * wcsmbs/wctob.c: Likewise. * wcsmbs/wchar.h: Add prototype for __wcslen, wcsnlen. Remove prototypes for wmemr*. * wcsmbs/wcslen.c: Rename to __wcslen and make wcslen weak alias. * wcsmbs/wcsnlen.c: New file. * wcsmbs/wcsmbsload.c: New file. * wcsmbs/wcsmbsload.h: New file. * manual/filesys.texi: Mention risks of tmpnam and mktemp. * manual/install.texi: Describe some more critical points. * string/string.h: Add prototype for __strnlen. * string/strnlen.c: Rename to __strnlen and make strnlen weak alias. * sysdeps/posix/mktemp.c: Rewrite to allow many more files and much less predictable names. * sysdeps/posix/mkstemp.c: Likewise. 1998-04-05 Andreas Jaeger <aj@arthur.rhein-neckar.de> * manual/libc.texinfo (Top): Change "file namespace" to "local namespace". * manual/socket.texi: Change file namespace to local namespace. (Out-of-Band Data): Remove unneeded variable link. (Host Address Functions): Use uint32_t consequently and add a number of clarifications for IPv4/IPv6, classless addresses. (Internet Namespace): Added some paragraphs about IPv6. Based on suggestions by Francesco Potorti` <F.Potorti@cnuce.cnr.it>. 1998-04-05 Philip Blundell <Philip.Blundell@pobox.com> Update for draft-ietf-ipngwg-bsd-api-new-01.txt: * resolv/netdb.h (getnameinfo): Use `socklen_t' not `size_t'. (NI_NUMERICHOST, et al.): Tidy up and add comments. (AI_NUMERICHOST): Define. (getnodebyname): New prototype. (AI_V4MAPPED, et al.): New constants. * sysdeps/unix/bsd/bsd4.4/bits/sockaddr.h (SA_LEN): New macro.< * sysdeps/generic/bits/sockaddr.h (SA_LEN): Likewise. * sysdeps/unix/sysv/linux/Makefile (sysdep_routines): Add sa_len for socket. * sysdeps/unix/sysv/linux/sa_len.c: New file. * sysdeps/unix/sysv/linux/Dist: Add sa_len.c. * sysdeps/unix/sysv/linux/bits/socket.h: Make multiple #inclusion safe. * sysdeps/generic/bits/sockunion.h: New file, defining sockaddr_union. * sysdeps/unix/sysv/linux/bits/sockunion.h: Likewise. * socket/Makefile (headers): Add bits/sockunion.h. * socket/sys/socket.h: Include <bits/sockunion.h> * inet/netinet/in.h: Include <bits/sockaddr.h> rather than <sys/socket.h>, to avoid getting sockaddr_union defined. * sysdeps/generic/bits/socket.h: Allow inclusion from netinet.in.h. * sysdeps/unix/sysv/linux/bits/socket.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/socket.h: Likewise. * sysdeps/unix/sysv/linux/if_index.c: Remove use of SIOCGIFCOUNT (2.2.x kernels won't have it). 1998-04-06 21:21 Ulrich Drepper <drepper@cygnus.com> * sysdeps/mach/hurd/bits/ioctls.h: Allow inclusion from hurd/ioctl.h. * sysdeps/mach/hurd/dl-sysdep.c: Use __ptr_t not caddr_t. * iconv/gconv_conf.c: Define MAXPATHLEN if not available before. Patches by UCHIYAMA Yasushi <uch@nop.or.jp>. 1998-04-05 Philip Blundell <Philip.Blundell@pobox.com> * manual/socket.texi (Socket Addresses): Fix a typo. (Interface Naming): New section. 1998-04-05 23:29 Zack Weinberg <zack@rabi.phys.columbia.edu> * configure.in: Check for CC using $ac_tool_prefix, to handle cross-compilation. Use AC_CHECK_TOOL to find MiG. * config.make.in: Add MIG to be substituted. * mach/Machrules: Don't define MIG variable. Patch by Gordon Matzigkeit <gord@profitpress.com>. 1998-04-05 Mark Kettenis <kettenis@phys.uva.nl> * elf/dl-load.c (decompose_rpath): Use local_strdup instead of strdupa to copy rpath. 1998-04-05 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * configure.in: Fix gcc version check. * aclocal.m4 (AC_PROG_CHECK_VER): Rewritten to make less confusing. 1998-04-05 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * configure.in: Fix gcc version check. * aclocal.m4 (AC_PROG_CHECK_VER): Rewritten to make less confusing. 1998-04-05 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * configure.in: Fix gcc version check. * aclocal.m4 (AC_PROG_CHECK_VER): Rewritten to make less confusing. 1998-03-31 Mark Kettenis <kettenis@phys.uva.nl> * sysdeps/unix/bsd/unlockpt.c (unlockpt): Call __ptsname_r instead of ptsname_r. * stdlib/stdlib.h: Change prototype of ptsname_r to make it more like ttyname_r. * sysdeps/unix/sysv/linux/ptsname.c (__ptsname_r): Likewise. * sysdeps/generic/ptsname.c (__ptsname_r): Likewise. * sysdeps/unix/grantpt.c (grantpt): Change check of return value of __ptsname_r accordingly. * login/openpty.c (openpty): Likewise. 1998-06-04 18:47 H.J. Lu <hjl@gnu.org> * libio/fileops.c (_IO_file_xsgetn): Adjust pointers. 1998-04-06 13:58 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makeconfig (libtypes): Redo H.J. Lu's change of 1998-03-27. * Makerules: Readd missing rule for $(objpfx)stamp.oS. 1998-04-06 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/ypclnt.c: Don't give YPERR_RPC back, use the do_ypcall return value for better error checking.
331 lines
13 KiB
C
331 lines
13 KiB
C
/* Copyright (C) 1991, 92, 93, 95, 96, 97, 98 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. */
|
|
extern __ptr_t __memccpy __P ((__ptr_t __dest, __const __ptr_t __src,
|
|
int __c, size_t __n));
|
|
#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));
|
|
|
|
|
|
/* 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]. */
|
|
extern char *__strndup __P ((__const char *__string, size_t __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));
|
|
|
|
/* 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 *__s, __const char *__delim,
|
|
char **__save_ptr));
|
|
#if defined __USE_POSIX || defined __USE_MISC
|
|
extern char *strtok_r __P ((char *__s, __const char *__delim,
|
|
char **__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));
|
|
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 \
|
|
&& (_POSIX_C_SOURCE - 0) < 199506L)
|
|
/* 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));
|
|
extern int ffs __P ((int __i));
|
|
|
|
/* 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));
|
|
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 **__stringp, __const char *__delim));
|
|
extern char *strsep __P ((char **__stringp, __const char *__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));
|
|
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 *__dest, __const char *__src));
|
|
extern char *stpcpy __P ((char *__dest, __const char *__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 *__dest, __const char *__src, size_t __n));
|
|
extern char *stpncpy __P ((char *__dest, __const char *__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 && defined __OPTIMIZE__
|
|
/* 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
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* string.h */
|