projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid macro redefinition warnings.
[gnulib.git]
/
lib
/
wait-process.h
diff --git
a/lib/wait-process.h
b/lib/wait-process.h
index
f1f7776
..
3d7a4cf
100644
(file)
--- a/
lib/wait-process.h
+++ b/
lib/wait-process.h
@@
-1,11
+1,11
@@
/* Waiting for a subprocess to finish.
/* Waiting for a subprocess to finish.
- Copyright (C) 2001-2003, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2001-2003, 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,8
+13,7
@@
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/>. */
#ifndef _WAIT_PROCESS_H
#define _WAIT_PROCESS_H
#ifndef _WAIT_PROCESS_H
#define _WAIT_PROCESS_H
@@
-34,14
+33,11
@@
extern "C" {
/* Wait for a subprocess to finish. Return its exit code.
If it didn't terminate correctly, exit if exit_on_error is true, otherwise
/* Wait for a subprocess to finish. Return its exit code.
If it didn't terminate correctly, exit if exit_on_error is true, otherwise
- return 127
and set exitsignal if the child terminated because of a signal
.
+ return 127.
Arguments:
- child is the pid of the subprocess.
- progname is the name of the program executed by the subprocess, used for
error messages.
Arguments:
- child is the pid of the subprocess.
- progname is the name of the program executed by the subprocess, used for
error messages.
- - exitsignal is an optional pointer to an int to hold the signal number of
- any signal that caused the child to exit. It will be set to zero if this
- function exits with an error not caused by the child catching a signal.
- If ignore_sigpipe is true, consider a subprocess termination due to
SIGPIPE as equivalent to a success. This is suitable for processes whose
only purpose is to write to standard output. This flag can be safely set
- If ignore_sigpipe is true, consider a subprocess termination due to
SIGPIPE as equivalent to a success. This is suitable for processes whose
only purpose is to write to standard output. This flag can be safely set
@@
-51,11
+47,14
@@
extern "C" {
- slave_process should be set to true if the process has been launched as a
slave process.
- If exit_on_error is true, any error will cause the main process to exit
- slave_process should be set to true if the process has been launched as a
slave process.
- If exit_on_error is true, any error will cause the main process to exit
- with an error status. */
+ with an error status.
+ - If termsigp is not NULL, *termsig will be set to the signal that
+ terminated the subprocess (if supported by the platform: not on native
+ Windows platforms), otherwise 0. */
extern int wait_subprocess (pid_t child, const char *progname,
extern int wait_subprocess (pid_t child, const char *progname,
- int *exitsignal,
bool ignore_sigpipe, bool null_stderr,
bool ignore_sigpipe, bool null_stderr,
- bool slave_process, bool exit_on_error);
+ bool slave_process, bool exit_on_error,
+ int *termsigp);
/* Register a subprocess as being a slave process. This means that the
subprocess will be terminated when its creator receives a catchable fatal
/* Register a subprocess as being a slave process. This means that the
subprocess will be terminated when its creator receives a catchable fatal