From db7d66ec442c66316d18784e9e85ac10f1e30d53 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Fri, 9 Feb 2007 17:21:45 +0000 Subject: [PATCH] merge from gcc --- include/ChangeLog | 4 ++++ include/libiberty.h | 27 --------------------------- 2 files changed, 4 insertions(+), 27 deletions(-) diff --git a/include/ChangeLog b/include/ChangeLog index c105dbe0a..7c5ba23b9 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,7 @@ +2007-02-09 Joseph S. Myers + + * libiberty.h (pex_write_input): Remove prototype. + 2007-02-05 Dave Brolley * Contribute the following changes: diff --git a/include/libiberty.h b/include/libiberty.h index cc6cce3d2..7a58b711c 100644 --- a/include/libiberty.h +++ b/include/libiberty.h @@ -485,33 +485,6 @@ extern const char *pex_run_in_environment (struct pex_obj *obj, int flags, const char *outname, const char *errname, int *err); -/* Return a `FILE' pointer FP for the standard input of the first - program in the pipeline; FP is opened for writing. You must have - passed `PEX_USE_PIPES' to the `pex_init' call that returned OBJ. - You must close FP yourself with `fclose' to indicate that the - pipeline's input is complete. - - The file descriptor underlying FP is marked not to be inherited by - child processes. - - This call is not supported on systems which do not support pipes; - it returns with an error. (We could implement it by writing a - temporary file, but then you would need to write all your data and - close FP before your first call to `pex_run' -- and that wouldn't - work on systems that do support pipes: the pipe would fill up, and - you would block. So there isn't any easy way to conceal the - differences between the two types of systems.) - - If you call both `pex_write_input' and `pex_read_output', be - careful to avoid deadlock. If the output pipe fills up, so that - each program in the pipeline is waiting for the next to read more - data, and you fill the input pipe by writing more data to FP, then - there is no way to make progress: the only process that could read - data from the output pipe is you, but you are blocked on the input - pipe. */ - -extern FILE *pex_write_input (struct pex_obj *obj, int binary); - /* Return a stream for a temporary file to pass to the first program in the pipeline as input. The file name is chosen as for pex_run. pex_run closes the file automatically; don't close it yourself. */