glibc/string/envz.c
Roland McGrath 8f0c527e13 Sat May 4 05:44:25 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* hurd/hurd-raise.c (_hurd_raise_signal): Pass sigcode in msg_sig_post
	rpc.

	* hurd/hurdmsg.c (_S_msg_set_environment): Use argz.h functions
	instead of _hurd_split_args.
	(_S_msg_*_exec_flags): Functions removed.
	(_S_msg_startup_dosync): Stub removed.

Sat May  4 02:11:55 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>

	* sysdeps/mach/hurd/ptrace.c: Set _hurdsig_traced instead of
	EXEC_TRACED bit in _hurd_exec_flags.
	Pass sigcode arg in msg_sig_post_untraced rpc.

	* sysdeps/mach/hurd/access.c: Don't pass io port in
	auth_user_authenticate rpc.

	* posix/sched.h: Fix typos.

	* sysdeps/mach/hurd/fork.c: Use new critical section lock.
	Clear _hurdsig_traced instead of EXEC_TRACED.

	* sysdeps/stub/nanosleep.c (nanosleep): Fix typo.

	* wcsmbs/wcstol.c: Find strtol.c in ../stdlib.
	* wcsmbs/wcstof.c: Find strtod.c in ../stdlib.
	* wcsmbs/wcstod.c: Likewise.
	* wcsmbs/wcstold.c: Likewise.

	* wcsmbs/wcwidth.h: Find cname-lookup.h in ../wctype.

	* string/envz.c (envz_entry): Use const.
	(envz_get, envz_remove): Likewise.
	(envz_entry): Return char *, not const char *.

	* string/envz.h: Fix decl.

	* string/argz-create.c: Use const in prototype.
	* string/argz-next.c: Likewise.

	* sysdeps/mach/hurd/sigprocmask.c: Pass sigcode arg to msg_sig_post.
	* sysdeps/mach/hurd/i386/sigreturn.c: Likewise.
	* sysdeps/mach/hurd/sigsuspend.c: Likewise.
	* sysdeps/mach/hurd/kill.c: Likewise.

	* hurd/hurdexec.c (_hurd_exec): Use new critical section lock.
	* hurd/catch-exc.c (_S_catch_exception_raise): Likewise.
	* hurd/sigunwind.c (_hurdsig_longjmp_from_handler): Likewise.
	* hurd/thread-cancel.c (hurd_thread_cancel, hurd_check_cancel):
	Likewise.
	* sysdeps/mach/hurd/jmp-unwind.c (_longjmp_unwind): Likewise.
	* sysdeps/mach/hurd/sigaction.c: Likewise.

	* sysdeps/mach/hurd/errnos.awk: Don't use ARGV in comment; it can
	change meaninglessly.

	* hurd/hurd/signal.h (struct hurd_sigstate): Replace critical section
 	flag with a spin lock.
	(_hurd_critical_section_lock): Use spin_try_lock on that to see if we
 	get it.  No need to take SS->lock at all.
	(_hurd_critical_section_unlock): Unlock SS->critical_section_lock
	instead of clearing the old flag member.
	* hurd/hurdsig.c (_hurd_internal_post_signal): Use spin_lock_locked to
	test the critical section state.

	* hurd/hurdinit.c (_hurd_init): Set _hurdsig_traced from the intarray.

	* hurd/hurdkill.c (_hurd_sig_post): Pass 0 sigcode in msg_sig_post.

	* hurd/hurdsig.c (_hurd_internal_post_signal): Test _hurdsig_traced
 	instead of testing (_hurd_exec_flags & EXEC_TRACED).
	(_S_msg_sig_post): Take sigcode arg and pass it through.
	(_S_msg_sig_post_untraced): Likewise.
	(reauth_proc): Don't pass proc port in auth_user_authenticate.

	* hurd/setauth.c (_hurd_setauth): Don't pass object ports in
	auth_user_authenticate RPCs, just the one-off rendezvous port.
	* hurd/dtable.c (reauth_dtable): Likewise.
	* hurd/hurdlookup.c (__hurd_file_name_lookup_retry): Likewise.

	* hurd/hurdexec.c (_hurd_exec): Pass 0 flags to file_exec.
	Pass sigcode arg to msg_sig_post.

	* string/argz.h (argz_create): Use const in prototype.

	* hurd/hurdinit.c (_hurd_proc_init): Test _hurdsig_traced instead of
	testing (_hurd_exec_flags & EXEC_TRACED).
	Pass sigcode arg to msg_sig_post.

	* hurd/hurd.h: Declare _hurdsig_traced.

	* string/argz.h (__argz_next): Cast ENTRY before returning it.

	* hurd/hurd/signal.h (_hurd_critical_section_unlock): Pass sigcode arg
	to msg_sig_post.

	* hurd/path-lookup.c: New file.
	* hurd/Makefile (routines): Add path-lookup.
	* hurd/hurd/lookup.h: Declare file_name_path_scan,
	hurd_file_name_path_lookup.
	* hurd/hurd.h: Declare file_name_path_lookup.

	* sysdeps/mach/hurd/select.c: The io_select rpc no longer has a TAG_ID
	argument.  Instead, use a separate reply port for each RPC and put them
	all in a port set to wait for slow replies.
1996-05-04 09:46:57 +00:00

172 lines
4.7 KiB
C
Raw Blame History

This file contains invisible Unicode characters

This file contains invisible Unicode characters that are indistinguishable to humans but may be processed differently by a computer. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

/* Routines for dealing with '\0' separated environment vectors
Copyright (C) 1995, 1996 Free Software Foundation, Inc.
Written by Miles Bader <miles@gnu.ai.mit.edu>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2, or (at
your option) any later version.
This program 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
General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, 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. */
const char *
envz_get (const char *envz, size_t envz_len, const char *name)
{
const 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, unsigned *envz_len, const char *name, const char *value)
{
envz_remove (envz, envz_len, name);
if (value)
/* Add the new value, if there is one. */
{
unsigned name_len = strlen (name);
unsigned value_len = strlen (value);
unsigned old_envz_len = *envz_len;
unsigned 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 supercede those with the same
name in ENV, otherwise not. */
error_t
envz_merge (char **envz, unsigned *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, unsigned *envz_len)
{
char *entry = *envz;
unsigned left = *envz_len;
while (left)
{
unsigned 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;
}