diff options
| author | Zack Weinberg <zack@wolery.cumb.org> | 2000-08-02 22:03:53 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2000-08-02 22:03:53 +0000 |
| commit | c9b6494a2415efed8ad89952adc3640f54d87c3f (patch) | |
| tree | a86437b22a6ae8809536c2587df64ce5859255d4 /libiberty | |
| parent | f536cd95fb5cfbfa54809514fd89dc55d6b8e1a4 (diff) | |
| download | gcc-c9b6494a2415efed8ad89952adc3640f54d87c3f.zip gcc-c9b6494a2415efed8ad89952adc3640f54d87c3f.tar.gz gcc-c9b6494a2415efed8ad89952adc3640f54d87c3f.tar.bz2 | |
* pexecute.c: Don't use vfork. Initialize 'pid' before retry loop.
From-SVN: r35436
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/ChangeLog | 4 | ||||
| -rw-r--r-- | libiberty/pexecute.c | 25 |
2 files changed, 9 insertions, 20 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 7278f30..95ea811 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,7 @@ +2000-08-02 Zack Weinberg <zack@wolery.cumb.org> + + * pexecute.c: Don't use vfork. Initialize 'pid' before retry loop. + 2000-07-26 Dave Pitts <dpitts@cozx.com> * config/mh-openedition.h: Added -DLE370 definition. diff --git a/libiberty/pexecute.c b/libiberty/pexecute.c index 9c62b57..34d2deb 100644 --- a/libiberty/pexecute.c +++ b/libiberty/pexecute.c @@ -46,19 +46,6 @@ extern int errno; #include <sys/wait.h> #endif -#ifdef vfork /* Autoconf may define this to fork for us. */ -# define VFORK_STRING "fork" -#else -# define VFORK_STRING "vfork" -#endif -#ifdef HAVE_VFORK_H -#include <vfork.h> -#endif -#ifdef VMS -#define vfork() (decc$$alloc_vfork_blocks() >= 0 ? \ - lib$get_current_invo_context(decc$$get_vfork_jmpbuf()) : -1) -#endif /* VMS */ - #include "libiberty.h" /* stdin file number. */ @@ -714,9 +701,10 @@ pexecute (program, argv, this_pname, temp_base, errmsg_fmt, errmsg_arg, flags) /* Fork a subprocess; wait and retry if it fails. */ sleep_interval = 1; + pid = -1; for (retries = 0; retries < 4; retries++) { - pid = vfork (); + pid = fork (); if (pid >= 0) break; sleep (sleep_interval); @@ -726,11 +714,9 @@ pexecute (program, argv, this_pname, temp_base, errmsg_fmt, errmsg_arg, flags) switch (pid) { case -1: - { - *errmsg_fmt = VFORK_STRING; - *errmsg_arg = NULL; - return -1; - } + *errmsg_fmt = "fork"; + *errmsg_arg = NULL; + return -1; case 0: /* child */ /* Move the input and output pipes into place, if necessary. */ @@ -754,7 +740,6 @@ pexecute (program, argv, this_pname, temp_base, errmsg_fmt, errmsg_arg, flags) /* Exec the program. */ (*func) (program, argv); - /* Note: Calling fprintf and exit here doesn't seem right for vfork. */ fprintf (stderr, "%s: ", this_pname); fprintf (stderr, install_error_msg, program); fprintf (stderr, ": %s\n", xstrerror (errno)); |