projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "poll-win32"
[gnulib.git]
/
lib
/
execute.c
diff --git
a/lib/execute.c
b/lib/execute.c
index
86df308
..
751dcb3
100644
(file)
--- a/
lib/execute.c
+++ b/
lib/execute.c
@@
-1,11
+1,11
@@
/* Creation of autonomous subprocesses.
/* Creation of autonomous subprocesses.
- Copyright (C) 2001-200
3
Free Software Foundation, Inc.
+ Copyright (C) 2001-200
4, 2006-2008
Free Software Foundation, Inc.
Written by Bruno Haible <haible@clisp.cons.org>, 2001.
Written by Bruno Haible <haible@clisp.cons.org>, 2001.
- This program is free software
;
you can redistribute it and/or modify
+ This program is free software
:
you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version
2, or (at your option)
- any later version.
+ the Free Software Foundation; either version
3 of the License, or
+
(at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-13,13
+13,10
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
/* Specification. */
#include "execute.h"
/* Specification. */
#include "execute.h"
@@
-29,13
+26,9
@@
#include <stdbool.h>
#include <stdlib.h>
#include <signal.h>
#include <stdbool.h>
#include <stdlib.h>
#include <signal.h>
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
#include "error.h"
#include "error.h"
-#include "exit.h"
#include "fatal-signal.h"
#include "wait-process.h"
#include "gettext.h"
#include "fatal-signal.h"
#include "wait-process.h"
#include "gettext.h"
@@
-51,10
+44,10
@@
#else
/* Unix API. */
#else
/* Unix API. */
-# if
def
HAVE_POSIX_SPAWN
+# if HAVE_POSIX_SPAWN
# include <spawn.h>
# else
# include <spawn.h>
# else
-# if
def
HAVE_VFORK_H
+# if HAVE_VFORK_H
# include <vfork.h>
# endif
# endif
# include <vfork.h>
# endif
# endif
@@
-71,6
+64,11
@@
# define STDERR_FILENO 2
#endif
# define STDERR_FILENO 2
#endif
+/* The results of open() in this file are not used with fchdir,
+ therefore save some unnecessary work in fchdir.c. */
+#undef open
+#undef close
+
#ifdef EINTR
#ifdef EINTR
@@
-119,7
+117,8
@@
execute (const char *progname,
const char *prog_path, char **prog_argv,
bool ignore_sigpipe,
bool null_stdin, bool null_stdout, bool null_stderr,
const char *prog_path, char **prog_argv,
bool ignore_sigpipe,
bool null_stdin, bool null_stdout, bool null_stderr,
- bool slave_process, bool exit_on_error)
+ bool slave_process, bool exit_on_error,
+ int *termsigp)
{
#if defined _MSC_VER || defined __MINGW32__
{
#if defined _MSC_VER || defined __MINGW32__
@@
-175,6
+174,9
@@
execute (const char *progname,
if (null_stdin)
dup2 (orig_stdin, STDIN_FILENO), close (orig_stdin);
if (null_stdin)
dup2 (orig_stdin, STDIN_FILENO), close (orig_stdin);
+ if (termsigp != NULL)
+ *termsigp = 0;
+
if (exitcode == -1)
{
if (exit_on_error || !null_stderr)
if (exitcode == -1)
{
if (exit_on_error || !null_stderr)
@@
-253,6
+255,8
@@
execute (const char *progname,
posix_spawnattr_destroy (&attrs);
if (slave_process)
unblock_fatal_signals ();
posix_spawnattr_destroy (&attrs);
if (slave_process)
unblock_fatal_signals ();
+ if (termsigp != NULL)
+ *termsigp = 0;
if (exit_on_error || !null_stderr)
error (exit_on_error ? EXIT_FAILURE : 0, err,
_("%s subprocess failed"), progname);
if (exit_on_error || !null_stderr)
error (exit_on_error ? EXIT_FAILURE : 0, err,
_("%s subprocess failed"), progname);
@@
-295,6
+299,8
@@
execute (const char *progname,
{
if (slave_process)
unblock_fatal_signals ();
{
if (slave_process)
unblock_fatal_signals ();
+ if (termsigp != NULL)
+ *termsigp = 0;
if (exit_on_error || !null_stderr)
error (exit_on_error ? EXIT_FAILURE : 0, errno,
_("%s subprocess failed"), progname);
if (exit_on_error || !null_stderr)
error (exit_on_error ? EXIT_FAILURE : 0, errno,
_("%s subprocess failed"), progname);
@@
-308,7
+314,7
@@
execute (const char *progname,
}
return wait_subprocess (child, progname, ignore_sigpipe, null_stderr,
}
return wait_subprocess (child, progname, ignore_sigpipe, null_stderr,
- slave_process, exit_on_error);
+ slave_process, exit_on_error
, termsigp
);
#endif
}
#endif
}