d7cf8390c7
include/ 2005-05-24 Gabriel Dos Reis <gdr@integrable-solutions.net> * libiberty.h (ACONCAT): Properly cast value of alloca(). * ansidecl.h (ATTRIBUTE_UNUSED_LABEL): Don't define if __cplusplus. libiberty/ 2005-05-24 Gabriel Dos Reis <gdr@integrable-solutions.net> * configure.ac: Check declarations for calloc(), getenv(), malloc(), realloc() and sbrk(). * config.in: Regenerate. * configure: Likewise. * alloca.c (C_alloca): Change "new" to "new_storage". Use XNEWVEC instead of xmalloc. * choose-temp.c (choose_temp_base): Use XNEWVEC instea od xmalloc. * concat.c (liiberty_concat_ptr): Surround definition with an extern "C" block, if __cplusplus. (concat): Use XNEWVEC instead of xmalloc. (reconcat): Likewise. * cp-demangle.c (struct d_print_template): Rename member "template" to "template_decl". Adjust use throughout the file. (d_print_resize): Properly cast return value of realloc(). (cplus_demangle_print): Same for malloc(). (d_demangle): Likewise. * cp-demint.c (cplus_demangle_fill_builtin_type): Rename parameter "typename" to "type_name". * cplus-dem.c (grow_vect): Use XRESIZEVEC instead of xrealloc(). (work_stuff_copy_to_from): Use XNEWVEC insteand of xmalloc(). (demangle_template_value_parm): Likewise. (demangle_template): Likewise. (recursively_demangle): Likewise. (do_hpacc_template_literal): Likewise. (do_arg): Likewise. (remember_type): Likewise. (remember_Ktype): Likewise. (register_Btype): Likewise. (string_need): Use XRESIZEVEC instead of xrealloc(). * dyn-string.c (dyn_string_init): Use XNEWVEC. (dyn_string_new): Use XNEW. (dyn_string_resize): Use XRESIZEVEC. * fnmatch.c (fnmatch): Rename local variable "not" to "negate". * getopt.c (getenv): Declare only if !__cplusplus and !getenv. Otherwise include <stdlib.h>. (exchange): Cast return value of malloc(). * hashtab.c (htab_size): Define as both macro and non-inline function. (htab_elements): Likewise. * getpwd.c (getpwd): Use XNEWVEC. (htab_create_alloc_ex): Use C90 prototype-style. * lrealpath.c (lrealpath): Appropriately cast return value of malloc(). * make-relative-prefix.c (save_string): Likewise. * make-temp-file.c (try_dir): Rename from "try". Adjust use in the file. (choose_tmpdir): Use XNEWVEC. * mkstemps.c (mkstemps): Rename parameter "template" to "pattern". * pex-common.c (pex_init_common): Use XNEW. (pex_add_remove): Use XRESIZEVEC. (pex_run): Likewise. (pex_get_status_and_time): Likewise. * pex-djgpp.c (pex_djgpp_exec_child): Likewise. * pex-msdos.c (pex_init): Use XNEW. (pex_msdos_exec_child): Likewise. (pex_msdos_exec_child): Use XRESIZEVEC. * pex-unix.c (pex_wait): Use XNEW. * pex-win32.c (fix_argv): Use XNEWVEC. * pexecute.c (pwait): Likewise. * setenv.c (setenv): Properly cast return value of malloc(). * sigsetmask.c (sigsetmask): Rename local variables "old" and "new" to "old_sig" and "new_sig". * sort.c (main): Use XNEWVEC. * spaces.c (spaces): Cast return value of malloc(). * strndup.c (strndup): Likewise. * ternary.c (ternary_insert): Use XNEW. * xmalloc.c (malloc, realloc, calloc, sbrk): Surround declaration with an extern "C" block if __cplusplus. * xstrdup.c (xstrdup): Cast return value of memcpy(). * xstrerror.c (strerror): Enclose declaration in an extern "C" block if __cplusplus. * xstrndup.c (xstrndup): Use XNEW. Cast return value of memcpy(). From-SVN: r100115
122 lines
3.2 KiB
C
122 lines
3.2 KiB
C
/* Utilities to execute a program in a subprocess (possibly linked by pipes
|
|
with other subprocesses), and wait for it.
|
|
Copyright (C) 2004 Free Software Foundation, Inc.
|
|
|
|
This file is part of the libiberty library.
|
|
Libiberty 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.
|
|
|
|
Libiberty 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 libiberty; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
|
|
Boston, MA 02110-1301, USA. */
|
|
|
|
/* pexecute is an old routine. This implementation uses the newer
|
|
pex_init/pex_run/pex_get_status/pex_free routines. Don't use
|
|
pexecute in new code. Use the newer routines instead. */
|
|
|
|
#include "config.h"
|
|
#include "libiberty.h"
|
|
|
|
#ifdef HAVE_STDLIB_H
|
|
#include <stdlib.h>
|
|
#endif
|
|
|
|
/* We only permit a single pexecute chain to execute at a time. This
|
|
was always true anyhow, though it wasn't documented. */
|
|
|
|
static struct pex_obj *pex;
|
|
static int idx;
|
|
|
|
int
|
|
pexecute (const char *program, char * const *argv, const char *pname,
|
|
const char *temp_base, char **errmsg_fmt, char **errmsg_arg,
|
|
int flags)
|
|
{
|
|
const char *errmsg;
|
|
int err;
|
|
|
|
if ((flags & PEXECUTE_FIRST) != 0)
|
|
{
|
|
if (pex != NULL)
|
|
{
|
|
*errmsg_fmt = "pexecute already in progress";
|
|
*errmsg_arg = NULL;
|
|
return -1;
|
|
}
|
|
pex = pex_init (PEX_USE_PIPES, pname, temp_base);
|
|
idx = 0;
|
|
}
|
|
else
|
|
{
|
|
if (pex == NULL)
|
|
{
|
|
*errmsg_fmt = "pexecute not in progress";
|
|
*errmsg_arg = NULL;
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
errmsg = pex_run (pex,
|
|
(((flags & PEXECUTE_LAST) != 0 ? PEX_LAST : 0)
|
|
| ((flags & PEXECUTE_SEARCH) != 0 ? PEX_SEARCH : 0)),
|
|
program, argv, NULL, NULL, &err);
|
|
if (errmsg != NULL)
|
|
{
|
|
*errmsg_fmt = (char *) errmsg;
|
|
*errmsg_arg = NULL;
|
|
return -1;
|
|
}
|
|
|
|
/* Instead of a PID, we just return a one-based index into the
|
|
status values. We avoid zero just because the old pexecute would
|
|
never return it. */
|
|
return ++idx;
|
|
}
|
|
|
|
int
|
|
pwait (int pid, int *status, int flags ATTRIBUTE_UNUSED)
|
|
{
|
|
/* The PID returned by pexecute is one-based. */
|
|
--pid;
|
|
|
|
if (pex == NULL || pid < 0 || pid >= idx)
|
|
return -1;
|
|
|
|
if (pid == 0 && idx == 1)
|
|
{
|
|
if (!pex_get_status (pex, 1, status))
|
|
return -1;
|
|
}
|
|
else
|
|
{
|
|
int *vector;
|
|
|
|
vector = XNEWVEC (int, idx);
|
|
if (!pex_get_status (pex, idx, vector))
|
|
return -1;
|
|
*status = vector[pid];
|
|
free (vector);
|
|
}
|
|
|
|
/* Assume that we are done after the caller has retrieved the last
|
|
exit status. The original implementation did not require that
|
|
the exit statuses be retrieved in order, but this implementation
|
|
does. */
|
|
if (pid + 1 == idx)
|
|
{
|
|
pex_free (pex);
|
|
pex = NULL;
|
|
idx = 0;
|
|
}
|
|
|
|
return pid + 1;
|
|
}
|