mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-18 02:50:09 +00:00
50304ef057
1998-07-16 10:23 Ulrich Drepper <drepper@cygnus.com> * argp/argp-fmtstream.c: Unify names of used global functions. * argp/argp-help.c: Likewise. * assert/assert-perr.c: Likewise * assert/assert.c: Likewise * dirent/scandir.c: Likewise * dirent/scandir64.c: Likewise * dirent/versionsort.c: Likewise * dirent/versionsort64.c: Likewise * gmon/bb_exit_func.c: Likewise. * gmon/gmon.c: Likewise. * grp/initgroups.c: Likewise. * iconv/gconv_conf.c: Likewise. * inet/getnameinfo.c: Likewise. * inet/getnetgrent_r.c: Likewise. * inet/inet_ntoa.c: Likewise. * inet/rcmd.c: Likewise. * inet/rexec.c: Likewise. * inet/ruserpass.c: Likewise. * io/fts.c: Likewise. * io/ftw.c: Likewise. * io/ftw64.c: Likewise. * io/getdirname.c: Likewise. * io/getwd.c: Likewise. * io/lockf.c: Likewise. * libio/iofdopen.c: Likewise. * libio/iopopen.c: Likewise. * login/utmp_daemon.c: Likewise. * malloc/mtrace.c: Likewise. * malloc/obstack.c * misc/daemon.c: Likewise. * misc/efgcvt_r.c: Likewise. * misc/err.c: Likewise. * misc/error.c: Likewise. * misc/fstab.c: Likewise. * misc/getpass.c: Likewise. * misc/getttyent.c: Likewise. * misc/mntent_r.c: Likewise. * misc/search.h: Likewise. * misc/syslog.c: Likewise. * nscd/nscd_getgr_r.c: Likewise. * nscd/nscd_getpw_r.c: Likewise. * posix/getpgrp.c: Likewise. * posix/wordexp.c: Likewise. * pwd/fgetpwent_r.c: Likewise. * pwd/getpw.c: Likewise. * resolv/herror.c: Likewise. * resolv/res_init.c: Likewise. * shadow/fgetspent_r.c: Likewise. * shadow/lckpwdf.c: Likewise. * signal/sigrelse.c: Likewise. * stdio-common/asprintf.c: Likewise. * stdio-common/dprintf.c: Likewise. * stdio-common/getw.c: Likewise. * stdio-common/putw.c: Likewise. * stdio-common/snprintf.c: Likewise. * stdio-common/sprintf.c: Likewise. * stdio-common/sscanf.c: Likewise. * stdlib/lrand48_r.c: Likewise. * stdlib/mrand48_r.c: Likewise. * string/argz-replace.c: Likewise. * string/envz.c: Likewise. * sunrpc/auth_des.c: Likewise. * sunrpc/auth_unix.c: Likewise. * sunrpc/bindrsvprt.c: Likewise. * sunrpc/clnt_gen.c: Likewise. * sunrpc/clnt_perr.c: Likewise. * sunrpc/clnt_simp.c: Likewise. * sunrpc/clnt_tcp.c: Likewise. * sunrpc/clnt_udp.c: Likewise. * sunrpc/get_myaddr.c: Likewise. * sunrpc/key_call.c: Likewise. * sunrpc/netname.c: Likewise. * sunrpc/openchild.c: Likewise. * sunrpc/pmap_rmt.c: Likewise. * sunrpc/rpc_dtable.c: Likewise. * sunrpc/rtime.c: Likewise. * sunrpc/svc_run.c: Likewise. * sunrpc/svc_simple.c: Likewise. * sunrpc/svc_tcp.c: Likewise. * sunrpc/svc_udp.c: Likewise. * sunrpc/svcauth_des.c: Likewise. * sunrpc/xdr_array.c: Likewise. * sunrpc/xdr_rec.c: Likewise. * sunrpc/xdr_ref.c: Likewise. * sunrpc/xdr_stdio.c: Likewise. * sysdeps/generic/abort.c: Likewise. * sysdeps/generic/dl-sysdep.c: Likewise. * sysdeps/generic/fstatfs64.c: Likewise. * sysdeps/generic/ftruncate64.c: Likewise. * sysdeps/generic/getrlimit64.c: Likewise. * sysdeps/generic/glob.c: Likewise. * sysdeps/generic/prof-freq.c: Likewise. * sysdeps/generic/putenv.c: Likewise. * sysdeps/generic/statfs64.c: Likewise. * sysdeps/generic/ttyname_r.c: Likewise. * sysdeps/generic/utmp_file.c: Likewise. * sysdeps/generic/vlimit.c: Likewise. * sysdeps/generic/vtimes.c: Likewise. * sysdeps/posix/cuserid.c: Likewise. * sysdeps/posix/euidaccess.c: Likewise. * sysdeps/posix/mkstemp.c: Likewise. * sysdeps/posix/mktemp.c: Likewise. * sysdeps/posix/pread.c: Likewise. * sysdeps/posix/pread64.c: Likewise. * sysdeps/posix/profil.c: Likewise. * sysdeps/posix/pwrite.c: Likewise. * sysdeps/posix/pwrite64.c: Likewise. * sysdeps/posix/sigblock.c: Likewise. * sysdeps/posix/sigpause.c: Likewise. * sysdeps/posix/ttyname.c: Likewise. * sysdeps/posix/ttyname_r.c: Likewise. * sysdeps/posix/waitid.c: Likewise. * sysdeps/unix/getlogin_r.c: Likewise. * sysdeps/unix/grantpt.c: Likewise. * sysdeps/unix/rewinddir.c: Likewise. * sysdeps/unix/sysv/linux/gethostid.c: Likewise. * sysdeps/unix/sysv/linux/getpt.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c: Likewise. * sysdeps/unix/sysv/linux/ptsname.c: Likewise. * sysdeps/unix/sysv/linux/sendmsg.c: Likewise. * sysdeps/unix/sysv/linux/statvfs.c: Likewise. * sysdeps/unix/sysv/linux/ttyname.c: Likewise. * sysdeps/unix/sysv/linux/ttyname_r.c: Likewise. * sysdeps/unix/sysv/linux/ulimit.c: Likewise. * sysdeps/unix/sysv/linux/unlockpt.c: Likewise. * sysvipc/sys/shm.h: Likewise. * time/ctime_r.c: Likewise. * time/strptime.c: Likewise. * wcsmbs/mbrlen.c: Likewise. * wcsmbs/wcsdup.c: Likewise. * wcsmbs/wcsxfrm.c: Likewise. * wctype/wcfuncs.c: Likewise. * sysdeps/unix/sysv/linux/i386/socker.S: Change to honor NO_WEAK_ALIAS. * sysdeps/unix/sysv/linux/accept.S: Don't generate __ name. * sysdeps/unix/sysv/linux/bind.S: Likewise. * sysdeps/unix/sysv/linux/getsockname.S: Likewise. * sysdeps/unix/sysv/linux/listen.S: Likewise. * sysdeps/unix/sysv/linux/recvfrom.S: Likewise. * sysdeps/unix/sysv/linux/sendto.S: Likewise. * sysdeps/unix/sysv/linux/setsockopt.S: Likewise. * grp/fgetgrent_r.c: Use explicit locking of the stream. * elf/Makefile (rtld-routines): Add dl-environ. * sysdeps/generic/dl-environ.c: New file. * libio/Makefile [REENTRANT] (routines): Add iofputs_u. * libio/Versions: Add fputs_unlocked. * libio/iofputs_u.c: New file. * libio/stdio.h: Add prototype for fputs_unlocked. * sunrpc/rpc/auth.h: Use __PMT instead of __P in type definitions. * sunrpc/rpc/clnt.h: Likewise. * sunrpc/rpc/pmap_clnt.h: Likewise. * sunrpc/rpc/svc.h: Likewise. * sunrpc/rpc/xdr.h: Likewise. * sysdeps/i386/memchr.S: Correct for more strict gas. * sysdeps/i386/fpu/bits/mathinline.h: Likewise. * sysdeps/libm-i387/i686/s_fdim.S: Likewise. * sysdeps/libm-i387/i686/s_fdimf.S: Likewise. * sysdeps/libm-i387/i686/s_fdiml.S: Likewise. 1998-07-15 Andreas Jaeger <aj@arthur.rhein-neckar.de> * configure.in: Change message for binutils version from 2.8.1.0.17->2.8.1.0.23. 1998-07-15 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.h: Define LOC. Patch by John Tobey <jtobey@banta-im.com>.
172 lines
4.9 KiB
C
172 lines
4.9 KiB
C
/* Routines for dealing with '\0' separated environment vectors
|
||
Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
|
||
This file is part of the GNU C Library.
|
||
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. */
|
||
|
||
#include <malloc.h>
|
||
#include <string.h>
|
||
|
||
#include "envz.h"
|
||
|
||
/* The character separating names from values in an envz. */
|
||
#define SEP '='
|
||
|
||
/* Returns a pointer to the entry in ENVZ for NAME, or 0 if there is none.
|
||
If NAME contains the separator character, only the portion before it is
|
||
used in the comparison. */
|
||
char *
|
||
envz_entry (const char *envz, size_t envz_len, const char *name)
|
||
{
|
||
while (envz_len)
|
||
{
|
||
const char *p = name;
|
||
const char *entry = envz; /* Start of this entry. */
|
||
|
||
/* See how far NAME and ENTRY match. */
|
||
while (envz_len && *p == *envz && *p && *p != SEP)
|
||
p++, envz++, envz_len--;
|
||
|
||
if ((*envz == '\0' || *envz == SEP) && (*p == '\0' || *p == SEP))
|
||
/* Bingo! */
|
||
return (char *) entry;
|
||
|
||
/* No match, skip to the next entry. */
|
||
while (envz_len && *envz)
|
||
envz++, envz_len--;
|
||
if (envz_len)
|
||
envz++, envz_len--; /* skip '\0' */
|
||
}
|
||
|
||
return 0;
|
||
}
|
||
|
||
/* Returns a pointer to the value portion of the entry in ENVZ for NAME, or 0
|
||
if there is none. */
|
||
char *
|
||
envz_get (const char *envz, size_t envz_len, const char *name)
|
||
{
|
||
char *entry = envz_entry (envz, envz_len, name);
|
||
if (entry)
|
||
{
|
||
while (*entry && *entry != SEP)
|
||
entry++;
|
||
if (*entry)
|
||
entry++;
|
||
else
|
||
entry = 0; /* A null entry. */
|
||
}
|
||
return entry;
|
||
}
|
||
|
||
/* Remove the entry for NAME from ENVZ & ENVZ_LEN, if any. */
|
||
void
|
||
envz_remove (char **envz, size_t *envz_len, const char *name)
|
||
{
|
||
char *entry = envz_entry (*envz, *envz_len, name);
|
||
if (entry)
|
||
argz_delete (envz, envz_len, entry);
|
||
}
|
||
|
||
/* Adds an entry for NAME with value VALUE to ENVZ & ENVZ_LEN. If an entry
|
||
with the same name already exists in ENVZ, it is removed. If VALUE is
|
||
NULL, then the new entry will a special null one, for which envz_get will
|
||
return NULL, although envz_entry will still return an entry; this is handy
|
||
because when merging with another envz, the null entry can override an
|
||
entry in the other one. Null entries can be removed with envz_strip (). */
|
||
error_t
|
||
envz_add (char **envz, size_t *envz_len, const char *name, const char *value)
|
||
{
|
||
envz_remove (envz, envz_len, name);
|
||
|
||
if (value)
|
||
/* Add the new value, if there is one. */
|
||
{
|
||
size_t name_len = strlen (name);
|
||
size_t value_len = strlen (value);
|
||
size_t old_envz_len = *envz_len;
|
||
size_t new_envz_len = old_envz_len + name_len + 1 + value_len + 1;
|
||
char *new_envz = realloc (*envz, new_envz_len);
|
||
|
||
if (new_envz)
|
||
{
|
||
bcopy (name, new_envz + old_envz_len, name_len);
|
||
new_envz[old_envz_len + name_len] = SEP;
|
||
bcopy (value, new_envz + old_envz_len + name_len + 1, value_len);
|
||
new_envz[new_envz_len - 1] = 0;
|
||
|
||
*envz = new_envz;
|
||
*envz_len = new_envz_len;
|
||
|
||
return 0;
|
||
}
|
||
else
|
||
return ENOMEM;
|
||
}
|
||
else
|
||
/* Add a null entry. */
|
||
return __argz_add (envz, envz_len, name);
|
||
}
|
||
|
||
/* Adds each entry in ENVZ2 to ENVZ & ENVZ_LEN, as if with envz_add(). If
|
||
OVERRIDE is true, then values in ENVZ2 will supersede those with the same
|
||
name in ENV, otherwise not. */
|
||
error_t
|
||
envz_merge (char **envz, size_t *envz_len, const char *envz2,
|
||
size_t envz2_len, int override)
|
||
{
|
||
error_t err = 0;
|
||
|
||
while (envz2_len && ! err)
|
||
{
|
||
char *old = envz_entry (*envz, *envz_len, envz2);
|
||
size_t new_len = strlen (envz2) + 1;
|
||
|
||
if (! old)
|
||
err = __argz_append (envz, envz_len, envz2, new_len);
|
||
else if (override)
|
||
{
|
||
argz_delete (envz, envz_len, old);
|
||
err = __argz_append (envz, envz_len, envz2, new_len);
|
||
}
|
||
|
||
envz2 += new_len;
|
||
envz2_len -= new_len;
|
||
}
|
||
|
||
return err;
|
||
}
|
||
|
||
/* Remove null entries. */
|
||
void
|
||
envz_strip (char **envz, size_t *envz_len)
|
||
{
|
||
char *entry = *envz;
|
||
size_t left = *envz_len;
|
||
while (left)
|
||
{
|
||
size_t entry_len = strlen (entry) + 1;
|
||
left -= entry_len;
|
||
if (! index (entry, SEP))
|
||
/* Null entry. */
|
||
bcopy (entry, entry + entry_len, left);
|
||
else
|
||
entry += entry_len;
|
||
}
|
||
*envz_len = entry - *envz;
|
||
}
|