pex-common.c: New file.
libiberty:
* pex-common.c: New file.
* pex-one.c: New file.
* pexecute.c: New file.
* pex-common.h: Include <stdio.h>.
(struct pex_obj): Define.
(struct pex_funcs): Define.
(pex_init_common): Declare.
* pex-unix.c: Rewrite.
* pex-win32.c: Rewrite.
* pex-djgpp.c: Rewrite.
* pex-msdos.c: Rewrite.
* testsuite/text-pexecute.c: New file.
* pexecute.txh: Rewrite.
* configure.ac: Check for wait3 and wait4. Set CHECK to
really-check rather than check-cplus-dem.
* functions.texi: Rebuild.
* Makefile.in: Rebuild dependencies.
(CFILES): Add pexecute.c, pex-common.c, pex-one.c.
(REQUIRED_OFILES): Add pexecute.o, pex-common.o, pex-one.o.
* testsuite/Makefile.in (really-check): New target.
(check-pexecute, test-pexecute): New targets.
* configure: Rebuild.
include:
* libiberty.h: Include <stdio.h>.
(PEX_RECORD_TIMES, PEX_USE_PIPES, PEX_SAVE_TEMPS): Define.
(PEX_LAST, PEX_SEARCH, PEX_SUFFIX, PEX_STDERR_TO_STDOUT): Define.
(PEX_BINARY_INPUT, PEX_BINARY_OUTPUT): Define.
(pex_init, pex_run, pex_read_output): Declare.
(pex_get_status, pex_get_times, pex_free, pex_one): Declare.
(struct pex_time): Define.
From-SVN: r97148
2005-03-29 04:08:46 +02:00
|
|
|
/* Common code for executing a program in a sub-process.
|
|
|
|
Copyright (C) 2005 Free Software Foundation, Inc.
|
|
|
|
Written by Ian Lance Taylor <ian@airs.com>.
|
|
|
|
|
|
|
|
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,
|
2005-05-10 17:33:18 +02:00
|
|
|
write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
|
|
|
|
Boston, MA 02110-1301, USA. */
|
pex-common.c: New file.
libiberty:
* pex-common.c: New file.
* pex-one.c: New file.
* pexecute.c: New file.
* pex-common.h: Include <stdio.h>.
(struct pex_obj): Define.
(struct pex_funcs): Define.
(pex_init_common): Declare.
* pex-unix.c: Rewrite.
* pex-win32.c: Rewrite.
* pex-djgpp.c: Rewrite.
* pex-msdos.c: Rewrite.
* testsuite/text-pexecute.c: New file.
* pexecute.txh: Rewrite.
* configure.ac: Check for wait3 and wait4. Set CHECK to
really-check rather than check-cplus-dem.
* functions.texi: Rebuild.
* Makefile.in: Rebuild dependencies.
(CFILES): Add pexecute.c, pex-common.c, pex-one.c.
(REQUIRED_OFILES): Add pexecute.o, pex-common.o, pex-one.o.
* testsuite/Makefile.in (really-check): New target.
(check-pexecute, test-pexecute): New targets.
* configure: Rebuild.
include:
* libiberty.h: Include <stdio.h>.
(PEX_RECORD_TIMES, PEX_USE_PIPES, PEX_SAVE_TEMPS): Define.
(PEX_LAST, PEX_SEARCH, PEX_SUFFIX, PEX_STDERR_TO_STDOUT): Define.
(PEX_BINARY_INPUT, PEX_BINARY_OUTPUT): Define.
(pex_init, pex_run, pex_read_output): Declare.
(pex_get_status, pex_get_times, pex_free, pex_one): Declare.
(struct pex_time): Define.
From-SVN: r97148
2005-03-29 04:08:46 +02:00
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
#include "libiberty.h"
|
|
|
|
#include "pex-common.h"
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#ifdef NEED_DECLARATION_ERRNO
|
|
|
|
extern int errno;
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_STDLIB_H
|
|
|
|
#include <stdlib.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_STRING_H
|
|
|
|
#include <string.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_UNISTD_H
|
|
|
|
#include <unistd.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
extern int mkstemps (char *, int);
|
|
|
|
|
|
|
|
/* This file contains subroutines for the program execution routines
|
|
|
|
(pex_init, pex_run, etc.). This file is compiled on all
|
|
|
|
systems. */
|
|
|
|
|
|
|
|
static void pex_add_remove (struct pex_obj *, const char *, int);
|
|
|
|
static int pex_get_status_and_time (struct pex_obj *, int, const char **,
|
|
|
|
int *);
|
|
|
|
|
|
|
|
/* Initialize a pex_obj structure. */
|
|
|
|
|
|
|
|
struct pex_obj *
|
|
|
|
pex_init_common (int flags, const char *pname, const char *tempbase,
|
|
|
|
const struct pex_funcs *funcs)
|
|
|
|
{
|
|
|
|
struct pex_obj *obj;
|
|
|
|
|
2005-05-24 22:48:25 +02:00
|
|
|
obj = XNEW (struct pex_obj);
|
pex-common.c: New file.
libiberty:
* pex-common.c: New file.
* pex-one.c: New file.
* pexecute.c: New file.
* pex-common.h: Include <stdio.h>.
(struct pex_obj): Define.
(struct pex_funcs): Define.
(pex_init_common): Declare.
* pex-unix.c: Rewrite.
* pex-win32.c: Rewrite.
* pex-djgpp.c: Rewrite.
* pex-msdos.c: Rewrite.
* testsuite/text-pexecute.c: New file.
* pexecute.txh: Rewrite.
* configure.ac: Check for wait3 and wait4. Set CHECK to
really-check rather than check-cplus-dem.
* functions.texi: Rebuild.
* Makefile.in: Rebuild dependencies.
(CFILES): Add pexecute.c, pex-common.c, pex-one.c.
(REQUIRED_OFILES): Add pexecute.o, pex-common.o, pex-one.o.
* testsuite/Makefile.in (really-check): New target.
(check-pexecute, test-pexecute): New targets.
* configure: Rebuild.
include:
* libiberty.h: Include <stdio.h>.
(PEX_RECORD_TIMES, PEX_USE_PIPES, PEX_SAVE_TEMPS): Define.
(PEX_LAST, PEX_SEARCH, PEX_SUFFIX, PEX_STDERR_TO_STDOUT): Define.
(PEX_BINARY_INPUT, PEX_BINARY_OUTPUT): Define.
(pex_init, pex_run, pex_read_output): Declare.
(pex_get_status, pex_get_times, pex_free, pex_one): Declare.
(struct pex_time): Define.
From-SVN: r97148
2005-03-29 04:08:46 +02:00
|
|
|
obj->flags = flags;
|
|
|
|
obj->pname = pname;
|
|
|
|
obj->tempbase = tempbase;
|
|
|
|
obj->next_input = STDIN_FILE_NO;
|
|
|
|
obj->next_input_name = NULL;
|
|
|
|
obj->next_input_name_allocated = 0;
|
|
|
|
obj->count = 0;
|
|
|
|
obj->children = NULL;
|
|
|
|
obj->status = NULL;
|
|
|
|
obj->time = NULL;
|
|
|
|
obj->number_waited = 0;
|
|
|
|
obj->read_output = NULL;
|
|
|
|
obj->remove_count = 0;
|
|
|
|
obj->remove = NULL;
|
|
|
|
obj->funcs = funcs;
|
|
|
|
obj->sysdep = NULL;
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Add a file to be removed when we are done. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
pex_add_remove (struct pex_obj *obj, const char *name, int allocated)
|
|
|
|
{
|
|
|
|
char *add;
|
|
|
|
|
|
|
|
++obj->remove_count;
|
2005-05-24 22:48:25 +02:00
|
|
|
obj->remove = XRESIZEVEC (char *, obj->remove, obj->remove_count);
|
pex-common.c: New file.
libiberty:
* pex-common.c: New file.
* pex-one.c: New file.
* pexecute.c: New file.
* pex-common.h: Include <stdio.h>.
(struct pex_obj): Define.
(struct pex_funcs): Define.
(pex_init_common): Declare.
* pex-unix.c: Rewrite.
* pex-win32.c: Rewrite.
* pex-djgpp.c: Rewrite.
* pex-msdos.c: Rewrite.
* testsuite/text-pexecute.c: New file.
* pexecute.txh: Rewrite.
* configure.ac: Check for wait3 and wait4. Set CHECK to
really-check rather than check-cplus-dem.
* functions.texi: Rebuild.
* Makefile.in: Rebuild dependencies.
(CFILES): Add pexecute.c, pex-common.c, pex-one.c.
(REQUIRED_OFILES): Add pexecute.o, pex-common.o, pex-one.o.
* testsuite/Makefile.in (really-check): New target.
(check-pexecute, test-pexecute): New targets.
* configure: Rebuild.
include:
* libiberty.h: Include <stdio.h>.
(PEX_RECORD_TIMES, PEX_USE_PIPES, PEX_SAVE_TEMPS): Define.
(PEX_LAST, PEX_SEARCH, PEX_SUFFIX, PEX_STDERR_TO_STDOUT): Define.
(PEX_BINARY_INPUT, PEX_BINARY_OUTPUT): Define.
(pex_init, pex_run, pex_read_output): Declare.
(pex_get_status, pex_get_times, pex_free, pex_one): Declare.
(struct pex_time): Define.
From-SVN: r97148
2005-03-29 04:08:46 +02:00
|
|
|
if (allocated)
|
|
|
|
add = (char *) name;
|
|
|
|
else
|
|
|
|
add = xstrdup (name);
|
|
|
|
obj->remove[obj->remove_count - 1] = add;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Run a program. */
|
|
|
|
|
|
|
|
const char *
|
|
|
|
pex_run (struct pex_obj *obj, int flags, const char *executable,
|
|
|
|
char * const * argv, const char *orig_outname, const char *errname,
|
|
|
|
int *err)
|
|
|
|
{
|
|
|
|
const char *errmsg;
|
|
|
|
int in, out, errdes;
|
|
|
|
char *outname;
|
|
|
|
int outname_allocated;
|
|
|
|
int p[2];
|
|
|
|
long pid;
|
|
|
|
|
|
|
|
in = -1;
|
|
|
|
out = -1;
|
|
|
|
errdes = -1;
|
|
|
|
outname = (char *) orig_outname;
|
|
|
|
outname_allocated = 0;
|
|
|
|
|
|
|
|
/* Set IN. */
|
|
|
|
|
|
|
|
if (obj->next_input_name != NULL)
|
|
|
|
{
|
|
|
|
/* We have to make sure that the previous process has completed
|
|
|
|
before we try to read the file. */
|
|
|
|
if (!pex_get_status_and_time (obj, 0, &errmsg, err))
|
|
|
|
goto error_exit;
|
|
|
|
|
|
|
|
in = obj->funcs->open_read (obj, obj->next_input_name,
|
|
|
|
(flags & PEX_BINARY_INPUT) != 0);
|
|
|
|
if (in < 0)
|
|
|
|
{
|
|
|
|
*err = errno;
|
|
|
|
errmsg = "open temporary file";
|
|
|
|
goto error_exit;
|
|
|
|
}
|
|
|
|
if (obj->next_input_name_allocated)
|
|
|
|
{
|
|
|
|
free (obj->next_input_name);
|
|
|
|
obj->next_input_name_allocated = 0;
|
|
|
|
}
|
|
|
|
obj->next_input_name = NULL;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
in = obj->next_input;
|
|
|
|
if (in < 0)
|
|
|
|
{
|
|
|
|
*err = 0;
|
|
|
|
errmsg = "pipeline already complete";
|
|
|
|
goto error_exit;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Set OUT and OBJ->NEXT_INPUT/OBJ->NEXT_INPUT_NAME. */
|
|
|
|
|
|
|
|
if ((flags & PEX_LAST) != 0)
|
|
|
|
{
|
|
|
|
if (outname == NULL)
|
|
|
|
out = STDOUT_FILE_NO;
|
|
|
|
else if ((flags & PEX_SUFFIX) != 0)
|
|
|
|
{
|
|
|
|
outname = concat (obj->tempbase, outname, NULL);
|
|
|
|
outname_allocated = 1;
|
|
|
|
}
|
|
|
|
obj->next_input = -1;
|
|
|
|
}
|
|
|
|
else if ((obj->flags & PEX_USE_PIPES) == 0)
|
|
|
|
{
|
|
|
|
if (outname == NULL)
|
|
|
|
{
|
|
|
|
if (obj->tempbase == NULL)
|
|
|
|
{
|
|
|
|
outname = make_temp_file (NULL);
|
|
|
|
outname_allocated = 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
int len = strlen (obj->tempbase);
|
|
|
|
|
|
|
|
if (len >= 6
|
|
|
|
&& strcmp (obj->tempbase + len - 6, "XXXXXX") == 0)
|
|
|
|
outname = xstrdup (obj->tempbase);
|
|
|
|
else
|
|
|
|
outname = concat (obj->tempbase, "XXXXXX", NULL);
|
|
|
|
|
|
|
|
outname_allocated = 1;
|
|
|
|
|
|
|
|
out = mkstemps (outname, 0);
|
|
|
|
if (out < 0)
|
|
|
|
{
|
|
|
|
*err = 0;
|
|
|
|
errmsg = "could not create temporary output file";
|
|
|
|
goto error_exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This isn't obj->funcs->close because we got the
|
|
|
|
descriptor from mkstemps, not from a function in
|
|
|
|
obj->funcs. Calling close here is just like what
|
|
|
|
make_temp_file does. */
|
|
|
|
close (out);
|
|
|
|
out = -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if ((flags & PEX_SUFFIX) != 0)
|
|
|
|
{
|
|
|
|
if (obj->tempbase == NULL)
|
|
|
|
outname = make_temp_file (outname);
|
|
|
|
else
|
|
|
|
outname = concat (obj->tempbase, outname, NULL);
|
|
|
|
outname_allocated = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((obj->flags & PEX_SAVE_TEMPS) == 0)
|
|
|
|
{
|
|
|
|
pex_add_remove (obj, outname, outname_allocated);
|
|
|
|
outname_allocated = 0;
|
|
|
|
}
|
|
|
|
|
2006-03-24 23:39:45 +01:00
|
|
|
/* Hand off ownership of outname to the next stage. */
|
|
|
|
obj->next_input_name = outname;
|
|
|
|
obj->next_input_name_allocated = outname_allocated;
|
|
|
|
outname_allocated = 0;
|
pex-common.c: New file.
libiberty:
* pex-common.c: New file.
* pex-one.c: New file.
* pexecute.c: New file.
* pex-common.h: Include <stdio.h>.
(struct pex_obj): Define.
(struct pex_funcs): Define.
(pex_init_common): Declare.
* pex-unix.c: Rewrite.
* pex-win32.c: Rewrite.
* pex-djgpp.c: Rewrite.
* pex-msdos.c: Rewrite.
* testsuite/text-pexecute.c: New file.
* pexecute.txh: Rewrite.
* configure.ac: Check for wait3 and wait4. Set CHECK to
really-check rather than check-cplus-dem.
* functions.texi: Rebuild.
* Makefile.in: Rebuild dependencies.
(CFILES): Add pexecute.c, pex-common.c, pex-one.c.
(REQUIRED_OFILES): Add pexecute.o, pex-common.o, pex-one.o.
* testsuite/Makefile.in (really-check): New target.
(check-pexecute, test-pexecute): New targets.
* configure: Rebuild.
include:
* libiberty.h: Include <stdio.h>.
(PEX_RECORD_TIMES, PEX_USE_PIPES, PEX_SAVE_TEMPS): Define.
(PEX_LAST, PEX_SEARCH, PEX_SUFFIX, PEX_STDERR_TO_STDOUT): Define.
(PEX_BINARY_INPUT, PEX_BINARY_OUTPUT): Define.
(pex_init, pex_run, pex_read_output): Declare.
(pex_get_status, pex_get_times, pex_free, pex_one): Declare.
(struct pex_time): Define.
From-SVN: r97148
2005-03-29 04:08:46 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (obj->funcs->pipe (obj, p, (flags & PEX_BINARY_OUTPUT) != 0) < 0)
|
|
|
|
{
|
|
|
|
*err = errno;
|
|
|
|
errmsg = "pipe";
|
|
|
|
goto error_exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
out = p[WRITE_PORT];
|
|
|
|
obj->next_input = p[READ_PORT];
|
|
|
|
}
|
|
|
|
|
|
|
|
if (out < 0)
|
|
|
|
{
|
|
|
|
out = obj->funcs->open_write (obj, outname,
|
|
|
|
(flags & PEX_BINARY_OUTPUT) != 0);
|
|
|
|
if (out < 0)
|
|
|
|
{
|
|
|
|
*err = errno;
|
|
|
|
errmsg = "open temporary output file";
|
|
|
|
goto error_exit;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (outname_allocated)
|
|
|
|
{
|
|
|
|
free (outname);
|
|
|
|
outname_allocated = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Set ERRDES. */
|
|
|
|
|
|
|
|
if (errname == NULL)
|
|
|
|
errdes = STDERR_FILE_NO;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* We assume that stderr is in text mode--it certainly shouldn't
|
|
|
|
be controlled by PEX_BINARY_OUTPUT. If necessary, we can add
|
|
|
|
a PEX_BINARY_STDERR flag. */
|
|
|
|
errdes = obj->funcs->open_write (obj, errname, 0);
|
|
|
|
if (errdes < 0)
|
|
|
|
{
|
|
|
|
*err = errno;
|
|
|
|
errmsg = "open error file";
|
|
|
|
goto error_exit;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Run the program. */
|
|
|
|
|
|
|
|
pid = obj->funcs->exec_child (obj, flags, executable, argv, in, out, errdes,
|
|
|
|
&errmsg, err);
|
|
|
|
if (pid < 0)
|
|
|
|
goto error_exit;
|
|
|
|
|
|
|
|
++obj->count;
|
2005-05-24 22:48:25 +02:00
|
|
|
obj->children = XRESIZEVEC (long, obj->children, obj->count);
|
pex-common.c: New file.
libiberty:
* pex-common.c: New file.
* pex-one.c: New file.
* pexecute.c: New file.
* pex-common.h: Include <stdio.h>.
(struct pex_obj): Define.
(struct pex_funcs): Define.
(pex_init_common): Declare.
* pex-unix.c: Rewrite.
* pex-win32.c: Rewrite.
* pex-djgpp.c: Rewrite.
* pex-msdos.c: Rewrite.
* testsuite/text-pexecute.c: New file.
* pexecute.txh: Rewrite.
* configure.ac: Check for wait3 and wait4. Set CHECK to
really-check rather than check-cplus-dem.
* functions.texi: Rebuild.
* Makefile.in: Rebuild dependencies.
(CFILES): Add pexecute.c, pex-common.c, pex-one.c.
(REQUIRED_OFILES): Add pexecute.o, pex-common.o, pex-one.o.
* testsuite/Makefile.in (really-check): New target.
(check-pexecute, test-pexecute): New targets.
* configure: Rebuild.
include:
* libiberty.h: Include <stdio.h>.
(PEX_RECORD_TIMES, PEX_USE_PIPES, PEX_SAVE_TEMPS): Define.
(PEX_LAST, PEX_SEARCH, PEX_SUFFIX, PEX_STDERR_TO_STDOUT): Define.
(PEX_BINARY_INPUT, PEX_BINARY_OUTPUT): Define.
(pex_init, pex_run, pex_read_output): Declare.
(pex_get_status, pex_get_times, pex_free, pex_one): Declare.
(struct pex_time): Define.
From-SVN: r97148
2005-03-29 04:08:46 +02:00
|
|
|
obj->children[obj->count - 1] = pid;
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
error_exit:
|
|
|
|
if (in >= 0 && in != STDIN_FILE_NO)
|
|
|
|
obj->funcs->close (obj, in);
|
|
|
|
if (out >= 0 && out != STDOUT_FILE_NO)
|
|
|
|
obj->funcs->close (obj, out);
|
|
|
|
if (errdes >= 0 && errdes != STDERR_FILE_NO)
|
|
|
|
obj->funcs->close (obj, errdes);
|
|
|
|
if (outname_allocated)
|
|
|
|
free (outname);
|
|
|
|
return errmsg;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return a FILE pointer for the output of the last program
|
|
|
|
executed. */
|
|
|
|
|
|
|
|
FILE *
|
|
|
|
pex_read_output (struct pex_obj *obj, int binary)
|
|
|
|
{
|
|
|
|
if (obj->next_input_name != NULL)
|
|
|
|
{
|
|
|
|
const char *errmsg;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
/* We have to make sure that the process has completed before we
|
|
|
|
try to read the file. */
|
|
|
|
if (!pex_get_status_and_time (obj, 0, &errmsg, &err))
|
|
|
|
{
|
|
|
|
errno = err;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
obj->read_output = fopen (obj->next_input_name, binary ? "rb" : "r");
|
|
|
|
|
|
|
|
if (obj->next_input_name_allocated)
|
|
|
|
{
|
|
|
|
free (obj->next_input_name);
|
|
|
|
obj->next_input_name_allocated = 0;
|
|
|
|
}
|
|
|
|
obj->next_input_name = NULL;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
int o;
|
|
|
|
|
|
|
|
o = obj->next_input;
|
|
|
|
if (o < 0 || o == STDIN_FILE_NO)
|
|
|
|
return NULL;
|
|
|
|
obj->read_output = obj->funcs->fdopenr (obj, o, binary);
|
|
|
|
obj->next_input = -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return obj->read_output;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get the exit status and, if requested, the resource time for all
|
|
|
|
the child processes. Return 0 on failure, 1 on success. */
|
|
|
|
|
|
|
|
static int
|
|
|
|
pex_get_status_and_time (struct pex_obj *obj, int done, const char **errmsg,
|
|
|
|
int *err)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (obj->number_waited == obj->count)
|
|
|
|
return 1;
|
|
|
|
|
2005-05-24 22:48:25 +02:00
|
|
|
obj->status = XRESIZEVEC (int, obj->status, obj->count);
|
pex-common.c: New file.
libiberty:
* pex-common.c: New file.
* pex-one.c: New file.
* pexecute.c: New file.
* pex-common.h: Include <stdio.h>.
(struct pex_obj): Define.
(struct pex_funcs): Define.
(pex_init_common): Declare.
* pex-unix.c: Rewrite.
* pex-win32.c: Rewrite.
* pex-djgpp.c: Rewrite.
* pex-msdos.c: Rewrite.
* testsuite/text-pexecute.c: New file.
* pexecute.txh: Rewrite.
* configure.ac: Check for wait3 and wait4. Set CHECK to
really-check rather than check-cplus-dem.
* functions.texi: Rebuild.
* Makefile.in: Rebuild dependencies.
(CFILES): Add pexecute.c, pex-common.c, pex-one.c.
(REQUIRED_OFILES): Add pexecute.o, pex-common.o, pex-one.o.
* testsuite/Makefile.in (really-check): New target.
(check-pexecute, test-pexecute): New targets.
* configure: Rebuild.
include:
* libiberty.h: Include <stdio.h>.
(PEX_RECORD_TIMES, PEX_USE_PIPES, PEX_SAVE_TEMPS): Define.
(PEX_LAST, PEX_SEARCH, PEX_SUFFIX, PEX_STDERR_TO_STDOUT): Define.
(PEX_BINARY_INPUT, PEX_BINARY_OUTPUT): Define.
(pex_init, pex_run, pex_read_output): Declare.
(pex_get_status, pex_get_times, pex_free, pex_one): Declare.
(struct pex_time): Define.
From-SVN: r97148
2005-03-29 04:08:46 +02:00
|
|
|
if ((obj->flags & PEX_RECORD_TIMES) != 0)
|
2005-05-24 22:48:25 +02:00
|
|
|
obj->time = XRESIZEVEC (struct pex_time, obj->time, obj->count);
|
pex-common.c: New file.
libiberty:
* pex-common.c: New file.
* pex-one.c: New file.
* pexecute.c: New file.
* pex-common.h: Include <stdio.h>.
(struct pex_obj): Define.
(struct pex_funcs): Define.
(pex_init_common): Declare.
* pex-unix.c: Rewrite.
* pex-win32.c: Rewrite.
* pex-djgpp.c: Rewrite.
* pex-msdos.c: Rewrite.
* testsuite/text-pexecute.c: New file.
* pexecute.txh: Rewrite.
* configure.ac: Check for wait3 and wait4. Set CHECK to
really-check rather than check-cplus-dem.
* functions.texi: Rebuild.
* Makefile.in: Rebuild dependencies.
(CFILES): Add pexecute.c, pex-common.c, pex-one.c.
(REQUIRED_OFILES): Add pexecute.o, pex-common.o, pex-one.o.
* testsuite/Makefile.in (really-check): New target.
(check-pexecute, test-pexecute): New targets.
* configure: Rebuild.
include:
* libiberty.h: Include <stdio.h>.
(PEX_RECORD_TIMES, PEX_USE_PIPES, PEX_SAVE_TEMPS): Define.
(PEX_LAST, PEX_SEARCH, PEX_SUFFIX, PEX_STDERR_TO_STDOUT): Define.
(PEX_BINARY_INPUT, PEX_BINARY_OUTPUT): Define.
(pex_init, pex_run, pex_read_output): Declare.
(pex_get_status, pex_get_times, pex_free, pex_one): Declare.
(struct pex_time): Define.
From-SVN: r97148
2005-03-29 04:08:46 +02:00
|
|
|
|
|
|
|
ret = 1;
|
|
|
|
for (i = obj->number_waited; i < obj->count; ++i)
|
|
|
|
{
|
|
|
|
if (obj->funcs->wait (obj, obj->children[i], &obj->status[i],
|
|
|
|
obj->time == NULL ? NULL : &obj->time[i],
|
|
|
|
done, errmsg, err) < 0)
|
|
|
|
ret = 0;
|
|
|
|
}
|
|
|
|
obj->number_waited = i;
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get exit status of executed programs. */
|
|
|
|
|
|
|
|
int
|
|
|
|
pex_get_status (struct pex_obj *obj, int count, int *vector)
|
|
|
|
{
|
|
|
|
if (obj->status == NULL)
|
|
|
|
{
|
|
|
|
const char *errmsg;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
if (!pex_get_status_and_time (obj, 0, &errmsg, &err))
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (count > obj->count)
|
|
|
|
{
|
|
|
|
memset (vector + obj->count, 0, (count - obj->count) * sizeof (int));
|
|
|
|
count = obj->count;
|
|
|
|
}
|
|
|
|
|
|
|
|
memcpy (vector, obj->status, count * sizeof (int));
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get process times of executed programs. */
|
|
|
|
|
|
|
|
int
|
|
|
|
pex_get_times (struct pex_obj *obj, int count, struct pex_time *vector)
|
|
|
|
{
|
|
|
|
if (obj->status == NULL)
|
|
|
|
{
|
|
|
|
const char *errmsg;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
if (!pex_get_status_and_time (obj, 0, &errmsg, &err))
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (obj->time == NULL)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (count > obj->count)
|
|
|
|
{
|
|
|
|
memset (vector + obj->count, 0,
|
|
|
|
(count - obj->count) * sizeof (struct pex_time));
|
|
|
|
count = obj->count;
|
|
|
|
}
|
|
|
|
|
|
|
|
memcpy (vector, obj->time, count * sizeof (struct pex_time));
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Free a pex_obj structure. */
|
|
|
|
|
|
|
|
void
|
|
|
|
pex_free (struct pex_obj *obj)
|
|
|
|
{
|
|
|
|
if (obj->next_input >= 0 && obj->next_input != STDIN_FILE_NO)
|
|
|
|
obj->funcs->close (obj, obj->next_input);
|
|
|
|
|
|
|
|
/* If the caller forgot to wait for the children, we do it here, to
|
|
|
|
avoid zombies. */
|
|
|
|
if (obj->status == NULL)
|
|
|
|
{
|
|
|
|
const char *errmsg;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
obj->flags &= ~ PEX_RECORD_TIMES;
|
|
|
|
pex_get_status_and_time (obj, 1, &errmsg, &err);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (obj->next_input_name_allocated)
|
|
|
|
free (obj->next_input_name);
|
|
|
|
if (obj->children != NULL)
|
|
|
|
free (obj->children);
|
|
|
|
if (obj->status != NULL)
|
|
|
|
free (obj->status);
|
|
|
|
if (obj->time != NULL)
|
|
|
|
free (obj->time);
|
|
|
|
if (obj->read_output != NULL)
|
|
|
|
fclose (obj->read_output);
|
|
|
|
|
|
|
|
if (obj->remove_count > 0)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < obj->remove_count; ++i)
|
|
|
|
{
|
|
|
|
remove (obj->remove[i]);
|
|
|
|
free (obj->remove[i]);
|
|
|
|
}
|
|
|
|
free (obj->remove);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (obj->funcs->cleanup != NULL)
|
|
|
|
obj->funcs->cleanup (obj);
|
|
|
|
|
|
|
|
free (obj);
|
|
|
|
}
|