mirror of git://gcc.gnu.org/git/gcc.git
* pexecute.c: Don't use vfork. Initialize 'pid' before retry loop.
From-SVN: r35436
This commit is contained in:
parent
f536cd95fb
commit
c9b6494a24
|
@ -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>
|
2000-07-26 Dave Pitts <dpitts@cozx.com>
|
||||||
|
|
||||||
* config/mh-openedition.h: Added -DLE370 definition.
|
* config/mh-openedition.h: Added -DLE370 definition.
|
||||||
|
|
|
@ -46,19 +46,6 @@ extern int errno;
|
||||||
#include <sys/wait.h>
|
#include <sys/wait.h>
|
||||||
#endif
|
#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"
|
#include "libiberty.h"
|
||||||
|
|
||||||
/* stdin file number. */
|
/* 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. */
|
/* Fork a subprocess; wait and retry if it fails. */
|
||||||
sleep_interval = 1;
|
sleep_interval = 1;
|
||||||
|
pid = -1;
|
||||||
for (retries = 0; retries < 4; retries++)
|
for (retries = 0; retries < 4; retries++)
|
||||||
{
|
{
|
||||||
pid = vfork ();
|
pid = fork ();
|
||||||
if (pid >= 0)
|
if (pid >= 0)
|
||||||
break;
|
break;
|
||||||
sleep (sleep_interval);
|
sleep (sleep_interval);
|
||||||
|
@ -726,11 +714,9 @@ pexecute (program, argv, this_pname, temp_base, errmsg_fmt, errmsg_arg, flags)
|
||||||
switch (pid)
|
switch (pid)
|
||||||
{
|
{
|
||||||
case -1:
|
case -1:
|
||||||
{
|
*errmsg_fmt = "fork";
|
||||||
*errmsg_fmt = VFORK_STRING;
|
*errmsg_arg = NULL;
|
||||||
*errmsg_arg = NULL;
|
return -1;
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
case 0: /* child */
|
case 0: /* child */
|
||||||
/* Move the input and output pipes into place, if necessary. */
|
/* 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. */
|
/* Exec the program. */
|
||||||
(*func) (program, argv);
|
(*func) (program, argv);
|
||||||
|
|
||||||
/* Note: Calling fprintf and exit here doesn't seem right for vfork. */
|
|
||||||
fprintf (stderr, "%s: ", this_pname);
|
fprintf (stderr, "%s: ", this_pname);
|
||||||
fprintf (stderr, install_error_msg, program);
|
fprintf (stderr, install_error_msg, program);
|
||||||
fprintf (stderr, ": %s\n", xstrerror (errno));
|
fprintf (stderr, ": %s\n", xstrerror (errno));
|
||||||
|
|
Loading…
Reference in New Issue