mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
2604afb1b2
1997-09-21 03:19 Ulrich Drepper <drepper@cygnus.com> * libio/libio.h: More libstdc++ cleanups. Define _IO_USE_DTOA if _G_HAVE_PRINTF_FP is not defined. * libio/strops.c: Undo patch of 1997-07-08 02:18. Must find a different solution for the problem. * misc/search.h [__USE_GNU]: Define comparison_fn_t. * stdlib/stdlib.h: Define comparison_fn_t only if __COMPAR_FN_T is not defined. Fix typo. Pretty print inline functions. * sysdeps/i386/i486/string.h (__stpcpy_small): Increment __cp not cp. Patch by HJ Lu <hjl@gnu.ai.mit.edu>. 1997-09-20 16:45 Ulrich Drepper <drepper@cygnus.com> * hesiod/hesiod.c (hesiod_init): Use __secure_getenv to get HES_DOMAIN environment variable. Suggested by Mark Kettenis <kettenis@phys.uva.nl>. * hesiod/README.hesiod: A bit of information about Hesiod and how to use it. Written by Mark Kettenis <kettenis@phys.uva.nl>. 1997-09-20 05:15 Ulrich Drepper <drepper@cygnus.com> * manual/maint.texi: Update requirement list. * io/ftw.h: Don't use parameter names from global namespace in prototypes. * stdlib/strtol.c: If used outside glibc handle broken systems which have character classification functions which are not 8-bit clean gracefully. Patch by Bruno Haible <haible@ilog.fr>. 1997-09-19 21:42 David S. Miller <davem@tanya.rutgers.edu> * sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h: ssize_t is a long long int. 1997-09-19 15:12 H.J. Lu <hjl@gnu.ai.mit.edu> * posix/Makefile (test-srcs): New, set to globtest. 1997-09-20 00:24 Ulrich Drepper <drepper@cygnus.com> * manual/filesys.texi: Document ftw, nftw and needed data types. 1997-09-19 12:53 H.J. Lu <hjl@gnu.ai.mit.edu> * sysdeps/i386/i486/bits/string.h: Fix typo. 1997-09-19 14:11 Ulrich Drepper <drepper@cygnus.com> * io/ftwtest.c (cb): Print level. * io/ftwtest-sh: Updated for ftwtest.c change. * string/argz.h (__argz_next): Cast NULL to char * to satisfy C++ compilers. Reported by Mirko Streckenbach <mirko@ramz.ing.tu-bs.de>. * catgets/catgets.c (catopen): Correctly allocate string of nlspath. Reported by Charles C. Fu <ccwf@klab.caltech.edu>. 1997-09-18 13:30 Klaus Espenlaub <kespenla@student.informatik.uni-ulm.de> * sysdeps/i386/init-first.c: Call __getopt_clean_environment with additional argument. * sysdeps/mach/hurd/i386/init-first.c: Likewise. * sysdeps/mach/hurd/mips/init-first.c: Likewise. * sysdeps/stub/init-first.c: Likewise. 1997-09-18 03:16 Ulrich Drepper <drepper@cygnus.com> * manual/search.texi: Document lsearch, lfind, the hsearch and tsearch functions. 1997-09-18 00:04 Ulrich Drepper <drepper@cygnus.com> * misc/hsearch_r.c (hsearch_r): Only return error for ENTER action if the table is full and we *really* have to enter a new entry. 1997-09-17 19:44 Ulrich Drepper <drepper@cygnus.com> * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela): Get rid of hack for handling flush opcode. Patch by Richard Henderson <rth@cygnus.com>.
160 lines
6.2 KiB
C
160 lines
6.2 KiB
C
/* Routines for dealing with '\0' separated arg vectors.
|
||
Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
|
||
Written by Miles Bader <miles@gnu.ai.mit.edu>
|
||
|
||
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. */
|
||
|
||
#ifndef _ARGZ_H
|
||
#define _ARGZ_H 1
|
||
|
||
#include <features.h>
|
||
|
||
#define __need_error_t
|
||
#include <errno.h>
|
||
#include <string.h> /* Need size_t, and strchr is called below. */
|
||
|
||
#ifndef __const
|
||
# define __const const
|
||
#endif
|
||
|
||
#ifndef __error_t_defined
|
||
typedef int error_t;
|
||
#endif
|
||
|
||
|
||
__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. */
|
||
extern error_t __argz_create __P ((char *__const __argv[], char **__argz,
|
||
size_t *__len));
|
||
extern error_t argz_create __P ((char *__const __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. */
|
||
extern error_t __argz_create_sep __P ((__const char *__string, int __sep,
|
||
char **__argz, size_t *__len));
|
||
extern error_t argz_create_sep __P ((__const char *__string, int __sep,
|
||
char **__argz, size_t *__len));
|
||
|
||
/* Returns the number of strings in ARGZ. */
|
||
extern size_t __argz_count __P ((__const char *__argz, size_t __len));
|
||
extern 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. */
|
||
extern void __argz_extract __P ((char *__argz, size_t __len, char **__argv));
|
||
extern void argz_extract __P ((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. */
|
||
extern void __argz_stringify __P ((char *__argz, size_t __len, int __sep));
|
||
extern 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. */
|
||
extern error_t __argz_append __P ((char **__argz, size_t *__argz_len,
|
||
__const char *__buf, size_t _buf_len));
|
||
extern 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. */
|
||
extern error_t __argz_add __P ((char **__argz, size_t *__argz_len,
|
||
__const char *__str));
|
||
extern error_t argz_add __P ((char **__argz, size_t *__argz_len,
|
||
__const char *__str));
|
||
|
||
/* Append SEP separated list in STRING to the argz vector in ARGZ &
|
||
ARGZ_LEN. */
|
||
extern error_t __argz_add_sep __P ((char **__argz, size_t *__argz_len,
|
||
__const char *__string, int __delim));
|
||
extern error_t argz_add_sep __P ((char **__argz, size_t *__argz_len,
|
||
__const char *__string, int __delim));
|
||
|
||
/* Delete ENTRY from ARGZ & ARGZ_LEN, if it appears there. */
|
||
extern void __argz_delete __P ((char **__argz, size_t *__argz_len,
|
||
char *__entry));
|
||
extern 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.
|
||
Since ARGZ's first entry is the same as ARGZ, argz_insert (ARGZ, ARGZ_LEN,
|
||
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. */
|
||
extern error_t __argz_insert __P ((char **__argz, size_t *__argz_len,
|
||
char *__before, __const char *__entry));
|
||
extern error_t argz_insert __P ((char **__argz, size_t *__argz_len,
|
||
char *__before, __const char *__entry));
|
||
|
||
/* Replace any occurances of the string STR in ARGZ with WITH, reallocating
|
||
ARGZ as necessary. If REPLACE_COUNT is non-zero, *REPLACE_COUNT will be
|
||
incremented by number of replacements performed. */
|
||
extern error_t __argz_replace (char **__argz, size_t *__argz_len,
|
||
__const char *__str, __const char *__with,
|
||
unsigned *__replace_count);
|
||
extern error_t argz_replace (char **__argz, size_t *__argz_len,
|
||
__const char *__str, __const char *__with,
|
||
unsigned *__replace_count);
|
||
|
||
/* 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)))
|
||
...;
|
||
|
||
or
|
||
|
||
char *entry;
|
||
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)
|
||
{
|
||
if (__entry)
|
||
{
|
||
if (__entry < __argz + __argz_len)
|
||
__entry = strchr (__entry, '\0') + 1;
|
||
|
||
return __entry >= __argz + __argz_len ? (char *) NULL : (char *) __entry;
|
||
}
|
||
else
|
||
return __argz_len > 0 ? __argz : 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 */
|
||
|
||
__END_DECLS
|
||
|
||
#endif /* argz.h */
|