diff options
| author | Paul Eggert | 2013-08-12 00:12:07 -0700 |
|---|---|---|
| committer | Paul Eggert | 2013-08-12 00:12:07 -0700 |
| commit | 94fcd171894e3a14d3548c028c4229229e32d184 (patch) | |
| tree | 5db95055c61a05f2b4edb6d0d74cb4e2692f6533 /src/process.h | |
| parent | 4750fd7bf40585eb3956e86e521a7508eaa0f35f (diff) | |
| download | emacs-94fcd171894e3a14d3548c028c4229229e32d184.tar.gz emacs-94fcd171894e3a14d3548c028c4229229e32d184.zip | |
Fix some fd issues when running subprocesses.
Fix bugs that can leak files or file descriptors on errors.
Don't unlink open temp files, as that's hard for users to diagnose
when things go awry (e.g., temp disk exhausted).
Don't bother to lock temp files. Check for invalid recursion.
* callproc.c (synch_process_fd): Remove. All uses removed.
(synch_process_tempfile): New var or macro.
(CALLPROC_STDOUT, CALLPROC_STDERR, CALLPROC_PIPEREAD, CALLPROC_FDS):
New constants.
(record_kill_process): New arg, the temp name. All callers changed.
(delete_temp_file): Now just a simple wrapper around unlink.
(call_process_kill): New arg, the call_process_fd array.
Close them all. Clear synch_process_pid. Remove the temp file,
or arrange for it to be removed.
(call_process_cleanup) [MSDOS]: Arg no longer contains file name;
that's been moved to synch_process_tempfile. Caller changed.
Do not remove the tempfile; that's now call_process_kill's
responsibility.
(call_process_cleanup) [!MSDOS]: Do not record unwind-protect for
call_process_kill; the caller now does that.
(call_process_cleanup): Do not close the process fd; that's now
call_process_kill's responsibility.
(Fcall_process): Implement via new function call_process, which
has most of the old body of Fcall_process, but with a different API.
(call_process): New function that does not open or close filefd if
it is nonnegative. Record which fds need to be closed, and let
call_process_kill close (and remove the tempfile, on MSDOS) on error.
Signal an error if invoked recursively (could be done via a hook).
Simplify creation of the tempfile in the MSDOS case.
Don't create the output file until after checking for the executable.
Report any failure to open /dev/null.
Don't open /dev/null for writing twice; once is enough.
Don't create pipe if all output is being discarded or sent to file.
Don't worry about setting up the coding system or reading from the
pipe if all output is being discarded.
Hoist fd_error local into top level, to lessen block nesting.
Don't record deleted pid here; now done by Fcall_process_region.
(Fcall_process) [MSDOS]: Report mktemp failure immediately,
and note its success in synch_process_tempfile.
Do not leak resources when child_setup fails.
(Fcall_process) [!MSDOS && !WINDOWSNT]: Remove duplicate assignment
to child_errno. Remove unnecessary close of fd0; it's close-on-exec.
(create_temp_file): Now returns open fd, with an additional
Lisp_Object * argument to return the name. All callers changed.
Do not close the file; rewind it instead, and leave it open for
the caller. Do not lock the temp file. Unwind-protect the file
and the file-descriptor.
(Fcall_process_region): If the input is /dev/null, unwind-protect it.
If an asynchrounous process, record it here, not in call_process.
(syms_of_callproc) [MSDOS]: Initialize synch_process_tempfile.
* eval.c (set_unwind_protect): New function.
* fileio.c (write_region): New function, generalized from the
old Fwrite_region. Do not lock temp files.
(Fwrite_region): Use it.
* lisp.h (set_unwind_protect, write_region): New decls.
* process.c: Include <verify.h>.
(make_process): Mark fds as initially closed.
(deleted_pid_list): Now a list of pid-filename pairs.
All uses changed.
(close_process_fd): New function.
(SUBPROCESS_STDIN, WRITE_TO_SUBPROCESS, READ_FROM_SUBPROCESS)
(SUBPROCESS_STDOUT, READ_FROM_EXEC_MONITOR, EXEC_MONITOR_OUTPUT):
New constants. Verify that their number matches PROCESS_OPEN_FDS.
(create_process, create_pty, Fmake_serial_process)
(server_accept_connection): Record which fds need to be closed,
and let deactivate_process close them.
(Fmake_network_process): Do not discard the unwind-protect
until it's safe to do so.
(deactivate_process): Close the fds opened by create_process etc.
(Fprocess_send_eof): Adjust to new way of recording open fds.
Report an error if /dev/null can't be opened, instead of aborting.
* process.h (PROCESS_OPEN_FDS): New constant.
(struct Lisp_Process): New member open_fds.
(record_kill_process, record_deleted_pid): Adjust signatures.
(record_deleted_pid): Move decl here ...
* syswait.h (record_deleted_pid): ... from here.
Fixes: debbugs:15035
Diffstat (limited to 'src/process.h')
| -rw-r--r-- | src/process.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/process.h b/src/process.h index 8ae33aebf39..b312f7f2425 100644 --- a/src/process.h +++ b/src/process.h | |||
| @@ -31,6 +31,11 @@ INLINE_HEADER_BEGIN | |||
| 31 | # define PROCESS_INLINE INLINE | 31 | # define PROCESS_INLINE INLINE |
| 32 | #endif | 32 | #endif |
| 33 | 33 | ||
| 34 | /* Bound on number of file descriptors opened on behalf of a process, | ||
| 35 | that need to be closed. */ | ||
| 36 | |||
| 37 | enum { PROCESS_OPEN_FDS = 6 }; | ||
| 38 | |||
| 34 | /* This structure records information about a subprocess | 39 | /* This structure records information about a subprocess |
| 35 | or network connection. */ | 40 | or network connection. */ |
| 36 | 41 | ||
| @@ -115,6 +120,9 @@ struct Lisp_Process | |||
| 115 | int infd; | 120 | int infd; |
| 116 | /* Descriptor by which we write to this process */ | 121 | /* Descriptor by which we write to this process */ |
| 117 | int outfd; | 122 | int outfd; |
| 123 | /* Descriptors that were created for this process and that need | ||
| 124 | closing. Unused entries are negative. */ | ||
| 125 | int open_fd[PROCESS_OPEN_FDS]; | ||
| 118 | /* Event-count of last event in which this process changed status. */ | 126 | /* Event-count of last event in which this process changed status. */ |
| 119 | EMACS_INT tick; | 127 | EMACS_INT tick; |
| 120 | /* Event-count of last such event reported. */ | 128 | /* Event-count of last such event reported. */ |
| @@ -210,13 +218,16 @@ enum | |||
| 210 | 218 | ||
| 211 | extern void block_child_signal (void); | 219 | extern void block_child_signal (void); |
| 212 | extern void unblock_child_signal (void); | 220 | extern void unblock_child_signal (void); |
| 213 | extern void record_kill_process (struct Lisp_Process *); | 221 | extern void record_kill_process (struct Lisp_Process *, Lisp_Object); |
| 214 | 222 | ||
| 215 | /* Defined in process.c. */ | 223 | /* Defined in sysdep.c. */ |
| 216 | 224 | ||
| 217 | extern Lisp_Object list_system_processes (void); | 225 | extern Lisp_Object list_system_processes (void); |
| 218 | extern Lisp_Object system_process_attributes (Lisp_Object); | 226 | extern Lisp_Object system_process_attributes (Lisp_Object); |
| 219 | 227 | ||
| 228 | /* Defined in process.c. */ | ||
| 229 | |||
| 230 | extern void record_deleted_pid (pid_t, Lisp_Object); | ||
| 220 | extern void hold_keyboard_input (void); | 231 | extern void hold_keyboard_input (void); |
| 221 | extern void unhold_keyboard_input (void); | 232 | extern void unhold_keyboard_input (void); |
| 222 | extern bool kbd_on_hold_p (void); | 233 | extern bool kbd_on_hold_p (void); |