projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make fflush after ungetc work on BSD platforms.
[gnulib.git]
/
lib
/
execute.c
diff --git
a/lib/execute.c
b/lib/execute.c
index
add7163
..
cfac196
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-2004, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2001-2004, 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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"
@@
-32,7
+29,6
@@
#include <unistd.h>
#include "error.h"
#include <unistd.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"
@@
-48,20
+44,16
@@
#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
#endif
# include <vfork.h>
# endif
# endif
#endif
-#ifndef HAVE_ENVIRON_DECL
-extern char **environ;
-#endif
-
#ifndef STDIN_FILENO
# define STDIN_FILENO 0
#endif
#ifndef STDIN_FILENO
# define STDIN_FILENO 0
#endif
@@
-72,6
+64,11
@@
extern char **environ;
# 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
@@
-308,7
+305,7
@@
execute (const char *progname,
unblock_fatal_signals ();
}
unblock_fatal_signals ();
}
- return wait_subprocess (child, progname,
NULL,
ignore_sigpipe, null_stderr,
+ return wait_subprocess (child, progname, ignore_sigpipe, null_stderr,
slave_process, exit_on_error);
#endif
slave_process, exit_on_error);
#endif