Makefile.in (CFILES): Add pex-*.c.
* Makefile.in (CFILES): Add pex-*.c.
(REQUIRED_OFILES): Change pexecute.o to @pexecute@
(CONFIGURED_OFILES): Add pex-*.o.
(TEXIFILES): Add pexecute.txh.
(pexecute.o): Delete rule.
(pex-cygwin.o, pex-djgpp.o, pex-mpw.o, pex-msdos.o, pex-os2.o,
pex-unix.o, pex-win32.o): New rules.
* configure.in: Change AC_INIT argument to xmalloc.c.
Compute appropriate pexecute implementation and substitute it
as @pexecute@.
* pexecute.c: Split up into...
* pex-cygwin.c, pex-djgpp.c, pex-mpw.c, pex-msdos.c, pex-os2.c,
pex-unix.c, pex-win32.c, pex-common.h, pexecute.txh: ... these
new files.
* functions.texi: Regenerate.
* configure: Regenerate.
From-SVN: r61728
2003-01-25 04:02:11 +08:00
|
|
|
/* Utilities to execute a program in a subprocess (possibly linked by pipes
|
|
|
|
with other subprocesses), and wait for it. Generic MSDOS specialization.
|
|
|
|
Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
|
|
|
|
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., 59 Temple Place - Suite 330,
|
|
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
|
|
|
|
#include "pex-common.h"
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#ifdef NEED_DECLARATION_ERRNO
|
|
|
|
extern int errno;
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_STRING_H
|
|
|
|
#include <string.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_STDLIB_H
|
|
|
|
#include <stdlib.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include "safe-ctype.h"
|
|
|
|
#include <process.h>
|
|
|
|
|
|
|
|
/* MSDOS doesn't multitask, but for the sake of a consistent interface
|
|
|
|
the code behaves like it does. pexecute runs the program, tucks the
|
|
|
|
exit code away, and returns a "pid". pwait must be called to fetch the
|
|
|
|
exit code. */
|
|
|
|
|
|
|
|
/* For communicating information from pexecute to pwait. */
|
|
|
|
static int last_pid = 0;
|
|
|
|
static int last_status = 0;
|
|
|
|
static int last_reaped = 0;
|
|
|
|
|
|
|
|
int
|
partition.h: Remove use of PARAMS.
include/
2005-03-27 Gabriel Dos Reis <gdr@integrable-solutions.net>
* partition.h: Remove use of PARAMS.
* obstack.h: Remove conditional prototypes __STDC__.
* objalloc.h: Remove use of PARAMS.
* splay-tree.h: Likewise.
libiberty/
2005-03-27 Gabriel Dos Reis <gdr@integrable-solutions.net>
Convert libiberty to use ISO C prototype style 5/n.
* random.c (srandom, initstate, setstate, random): Use ISO C
prototypes.
* putenv.c (putenv): Likewise.
* physmem.c (physmem_available, physmem_total, main):
Likewise.
* pex-win32.c (fix_argv, pexecute, pwait): Likewise.
* pex-unix.c (pexecute, pwait): Likewise.
* pex-msdos.c (pexecute, pwait): Likewise.
* pex-djgpp.c (pexecute, pwait): Likewise.
* partition.c (partition_new, partition_delete,
partition_union)
(elem_compare, partition_print): Likewise.
* obstack.c (_obstack_begin, _obstack_begin_1,
_obstack_newchunk,
_obstack_allocated_p, _obstack_free, obstack_free,
_obstack_memory_used, print_and_abort, obstack_next_free,
obstack_object_size, obstack_base): Likewise. Remove codes
predicated on !defined(__STDC__).
* objalloc.c (objalloc_create, _objalloc_alloc, objalloc_free,
objalloc_free_block): Use ISO C prototypes.
* mkstemps.c (mkstemps): Likewise.
* memset.c (memset): Likewise.
* mempcpy.c (mempcpy): Likewise.
* rename.c (rename): Likewise.
* rindex.c (rindex): Likewise.
* setenv.c (setenv, unsetenv): Likewise.
* sigsetmask.c (sigsetmask): Likewise.
* snprintf.c (snprintf): Likewise.
* sort.c (sort_pointers, xmalloc): Likewise.
* spaces.c (spaces): Likewise.
* splay-tree.c (splay_tree_delete_helper,
splay_tree_splay_helper, splay_tree_splay,
splay_tree_foreach_helper, splay_tree_xmalloc_allocate,
splay_tree_new, splay_tree_xmalloc_allocate,
splay_tree_new_with_allocator, splay_tree_delete,
splay_tree_insert, splay_tree_remove, splay_tree_lookup,
splay_tree_max, splay_tree_min, splay_tree_predecessor,
splay_tree_successor, splay_tree_foreach,
splay_tree_compare_ints, splay_tree_compare_pointers):
Likewise.
* stpcpy.c (stpcpy): Likewise.
* stpncpy.c (stpncpy): Likewise.
* strcasecmp.c (strcasecmp): Likewise.
* strchr.c (strchr): Likewise.
* strdup.c (strdup): Likewise.
From-SVN: r97125
2005-03-28 12:22:33 +08:00
|
|
|
pexecute (const char *program, char * const *argv, const char *this_pname,
|
|
|
|
const char *temp_base, char **errmsg_fmt, char **errmsg_arg,
|
|
|
|
int flags)
|
Makefile.in (CFILES): Add pex-*.c.
* Makefile.in (CFILES): Add pex-*.c.
(REQUIRED_OFILES): Change pexecute.o to @pexecute@
(CONFIGURED_OFILES): Add pex-*.o.
(TEXIFILES): Add pexecute.txh.
(pexecute.o): Delete rule.
(pex-cygwin.o, pex-djgpp.o, pex-mpw.o, pex-msdos.o, pex-os2.o,
pex-unix.o, pex-win32.o): New rules.
* configure.in: Change AC_INIT argument to xmalloc.c.
Compute appropriate pexecute implementation and substitute it
as @pexecute@.
* pexecute.c: Split up into...
* pex-cygwin.c, pex-djgpp.c, pex-mpw.c, pex-msdos.c, pex-os2.c,
pex-unix.c, pex-win32.c, pex-common.h, pexecute.txh: ... these
new files.
* functions.texi: Regenerate.
* configure: Regenerate.
From-SVN: r61728
2003-01-25 04:02:11 +08:00
|
|
|
{
|
|
|
|
int rc;
|
|
|
|
char *scmd, *rf;
|
|
|
|
FILE *argfile;
|
|
|
|
int i, el = flags & PEXECUTE_SEARCH ? 4 : 0;
|
|
|
|
|
|
|
|
last_pid++;
|
|
|
|
if (last_pid < 0)
|
|
|
|
last_pid = 1;
|
|
|
|
|
|
|
|
if ((flags & PEXECUTE_ONE) != PEXECUTE_ONE)
|
|
|
|
abort ();
|
|
|
|
|
|
|
|
if (temp_base == 0)
|
|
|
|
temp_base = choose_temp_base ();
|
|
|
|
scmd = (char *) xmalloc (strlen (program) + strlen (temp_base) + 6 + el);
|
|
|
|
rf = scmd + strlen(program) + 2 + el;
|
|
|
|
sprintf (scmd, "%s%s @%s.gp", program,
|
|
|
|
(flags & PEXECUTE_SEARCH ? ".exe" : ""), temp_base);
|
|
|
|
argfile = fopen (rf, "w");
|
|
|
|
if (argfile == 0)
|
|
|
|
{
|
|
|
|
int errno_save = errno;
|
|
|
|
free (scmd);
|
|
|
|
errno = errno_save;
|
|
|
|
*errmsg_fmt = "cannot open `%s.gp'";
|
|
|
|
*errmsg_arg = temp_base;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i=1; argv[i]; i++)
|
|
|
|
{
|
|
|
|
char *cp;
|
|
|
|
for (cp = argv[i]; *cp; cp++)
|
|
|
|
{
|
|
|
|
if (*cp == '"' || *cp == '\'' || *cp == '\\' || ISSPACE (*cp))
|
|
|
|
fputc ('\\', argfile);
|
|
|
|
fputc (*cp, argfile);
|
|
|
|
}
|
|
|
|
fputc ('\n', argfile);
|
|
|
|
}
|
|
|
|
fclose (argfile);
|
|
|
|
|
|
|
|
rc = system (scmd);
|
|
|
|
|
|
|
|
{
|
|
|
|
int errno_save = errno;
|
|
|
|
remove (rf);
|
|
|
|
free (scmd);
|
|
|
|
errno = errno_save;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (rc == -1)
|
|
|
|
{
|
|
|
|
*errmsg_fmt = install_error_msg;
|
|
|
|
*errmsg_arg = (char *)program;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Tuck the status away for pwait, and return a "pid". */
|
|
|
|
last_status = rc << 8;
|
|
|
|
return last_pid;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Use ECHILD if available, otherwise use EINVAL. */
|
|
|
|
#ifdef ECHILD
|
|
|
|
#define PWAIT_ERROR ECHILD
|
|
|
|
#else
|
|
|
|
#define PWAIT_ERROR EINVAL
|
|
|
|
#endif
|
|
|
|
|
|
|
|
int
|
partition.h: Remove use of PARAMS.
include/
2005-03-27 Gabriel Dos Reis <gdr@integrable-solutions.net>
* partition.h: Remove use of PARAMS.
* obstack.h: Remove conditional prototypes __STDC__.
* objalloc.h: Remove use of PARAMS.
* splay-tree.h: Likewise.
libiberty/
2005-03-27 Gabriel Dos Reis <gdr@integrable-solutions.net>
Convert libiberty to use ISO C prototype style 5/n.
* random.c (srandom, initstate, setstate, random): Use ISO C
prototypes.
* putenv.c (putenv): Likewise.
* physmem.c (physmem_available, physmem_total, main):
Likewise.
* pex-win32.c (fix_argv, pexecute, pwait): Likewise.
* pex-unix.c (pexecute, pwait): Likewise.
* pex-msdos.c (pexecute, pwait): Likewise.
* pex-djgpp.c (pexecute, pwait): Likewise.
* partition.c (partition_new, partition_delete,
partition_union)
(elem_compare, partition_print): Likewise.
* obstack.c (_obstack_begin, _obstack_begin_1,
_obstack_newchunk,
_obstack_allocated_p, _obstack_free, obstack_free,
_obstack_memory_used, print_and_abort, obstack_next_free,
obstack_object_size, obstack_base): Likewise. Remove codes
predicated on !defined(__STDC__).
* objalloc.c (objalloc_create, _objalloc_alloc, objalloc_free,
objalloc_free_block): Use ISO C prototypes.
* mkstemps.c (mkstemps): Likewise.
* memset.c (memset): Likewise.
* mempcpy.c (mempcpy): Likewise.
* rename.c (rename): Likewise.
* rindex.c (rindex): Likewise.
* setenv.c (setenv, unsetenv): Likewise.
* sigsetmask.c (sigsetmask): Likewise.
* snprintf.c (snprintf): Likewise.
* sort.c (sort_pointers, xmalloc): Likewise.
* spaces.c (spaces): Likewise.
* splay-tree.c (splay_tree_delete_helper,
splay_tree_splay_helper, splay_tree_splay,
splay_tree_foreach_helper, splay_tree_xmalloc_allocate,
splay_tree_new, splay_tree_xmalloc_allocate,
splay_tree_new_with_allocator, splay_tree_delete,
splay_tree_insert, splay_tree_remove, splay_tree_lookup,
splay_tree_max, splay_tree_min, splay_tree_predecessor,
splay_tree_successor, splay_tree_foreach,
splay_tree_compare_ints, splay_tree_compare_pointers):
Likewise.
* stpcpy.c (stpcpy): Likewise.
* stpncpy.c (stpncpy): Likewise.
* strcasecmp.c (strcasecmp): Likewise.
* strchr.c (strchr): Likewise.
* strdup.c (strdup): Likewise.
From-SVN: r97125
2005-03-28 12:22:33 +08:00
|
|
|
pwait (int pid, int *status, int flags)
|
Makefile.in (CFILES): Add pex-*.c.
* Makefile.in (CFILES): Add pex-*.c.
(REQUIRED_OFILES): Change pexecute.o to @pexecute@
(CONFIGURED_OFILES): Add pex-*.o.
(TEXIFILES): Add pexecute.txh.
(pexecute.o): Delete rule.
(pex-cygwin.o, pex-djgpp.o, pex-mpw.o, pex-msdos.o, pex-os2.o,
pex-unix.o, pex-win32.o): New rules.
* configure.in: Change AC_INIT argument to xmalloc.c.
Compute appropriate pexecute implementation and substitute it
as @pexecute@.
* pexecute.c: Split up into...
* pex-cygwin.c, pex-djgpp.c, pex-mpw.c, pex-msdos.c, pex-os2.c,
pex-unix.c, pex-win32.c, pex-common.h, pexecute.txh: ... these
new files.
* functions.texi: Regenerate.
* configure: Regenerate.
From-SVN: r61728
2003-01-25 04:02:11 +08:00
|
|
|
{
|
|
|
|
/* On MSDOS each pexecute must be followed by its associated pwait. */
|
|
|
|
if (pid != last_pid
|
|
|
|
/* Called twice for the same child? */
|
|
|
|
|| pid == last_reaped)
|
|
|
|
{
|
|
|
|
errno = PWAIT_ERROR;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
/* ??? Here's an opportunity to canonicalize the values in STATUS.
|
|
|
|
Needed? */
|
|
|
|
*status = last_status;
|
|
|
|
last_reaped = last_pid;
|
|
|
|
return last_pid;
|
|
|
|
}
|