8f0c527e13
* 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.
132 lines
4.9 KiB
C
132 lines
4.9 KiB
C
/* Routines for dealing with '\0' separated arg 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. */
|
||
|
||
#ifndef __ARGZ_H__
|
||
#define __ARGZ_H__ 1
|
||
|
||
#include <features.h>
|
||
|
||
#include <errno.h> /* Define error_t. */
|
||
#include <string.h> /* Need size_t, and strchr is called below. */
|
||
|
||
|
||
__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. */
|
||
error_t __argz_create __P ((char *const argv[], char **argz, size_t *len));
|
||
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. */
|
||
error_t __argz_create_sep __P ((__const char *string, int sep,
|
||
char **argz, size_t *len));
|
||
error_t argz_create_sep __P ((__const char *string, int sep,
|
||
char **argz, size_t *len));
|
||
|
||
/* Returns the number of strings in ARGZ. */
|
||
size_t __argz_count __P ((__const char *argz, size_t len));
|
||
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. */
|
||
void __argz_extract __P ((__const char *argz, size_t len, char **argv));
|
||
void argz_extract __P ((__const 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. */
|
||
void __argz_stringify __P ((char *argz, size_t len, int sep));
|
||
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. */
|
||
error_t __argz_append __P ((char **argz, size_t *argz_len,
|
||
__const char *buf, size_t buf_len));
|
||
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. */
|
||
error_t __argz_add __P ((char **argz, size_t *argz_len,
|
||
__const char *str));
|
||
error_t argz_add __P ((char **argz, size_t *argz_len,
|
||
__const char *str));
|
||
|
||
/* Delete ENTRY from ARGZ & ARGZ_LEN, if it appears there. */
|
||
void __argz_delete __P ((char **argz, size_t *argz_len, char *entry));
|
||
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. */
|
||
error_t __argz_insert __P ((char **argz, size_t *argz_len,
|
||
char *before, __const char *entry));
|
||
error_t argz_insert __P ((char **argz, size_t *argz_len,
|
||
char *before, __const char *entry));
|
||
|
||
/* 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 ? NULL : (char *) entry;
|
||
}
|
||
else
|
||
if (argz_len > 0)
|
||
return argz;
|
||
else
|
||
return 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 */
|
||
|
||
#endif /* __ARGZ_H__ */
|