xemacs-beta: src/process.c comparison

comparison src/process.c @ 359:8e84bee8ddd0 r21-1-9

Import from CVS: tag r21-1-9

author	cvs
date	Mon, 13 Aug 2007 10:57:55 +0200
parents	e11d67e05968
children	cc15677e0335

comparison

equal deleted inserted replaced

-:fed6e0f6a03a
+:8e84bee8ddd0
 #include "systime.h"
 #include "syssignal.h" /* Always include before systty.h */
 #include "systty.h"
 #include "syswait.h"
-Lisp_Object Qprocessp;
+Lisp_Object Qprocessp, Qprocess_live_p;
 /* Process methods */
 struct process_methods the_process_methods;
 /* a process object is a network connection when its pid field a cons
 Return t if OBJECT is a process.
 */
 (obj))
 {
 return PROCESSP (obj) ? Qt : Qnil;
+}
+DEFUN ("process-live-p", Fprocess_live_p, 1, 1, 0, /*
+Return t if OBJECT is a process that is alive.
+*/
+(obj))
+{
+return PROCESSP (obj) && PROCESS_LIVE_P (XPROCESS (obj)) ? Qt : Qnil;
 }
 DEFUN ("process-list", Fprocess_list, 0, 0, 0, /*
 Return a list of all processes.
 */
 p->exit_code = 0;
 pid = PROCMETH (create_process, (p, argv, nargv, program, cur_dir));
 p->pid = make_int (pid);
-if (!NILP(p->pipe_instream))
+if (PROCESS_LIVE_P (p))
 event_stream_select_process (p);
 }
 /* This function is the unwind_protect form for Fstart_process_internal.  If
 PROC doesn't have its pid set, then we know someone has signalled
 calls set the filter to t, we have to stop now.  Return -1 rather
 than 0 so execute_internal_event() doesn't close the process.
 Really, the loop in execute_internal_event() should check itself
 for a process-filter change, like in status_notify(); but the
 struct Lisp_Process is not exported outside of this file. */
-if (NILP(p->pipe_instream))
+if (!PROCESS_LIVE_P (p))
 return -1; /* already closed */
 if (!NILP (p->filter) && (p->filter_does_read))
 {
 Lisp_Object filter_result;
 void
 set_process_filter (Lisp_Object proc, Lisp_Object filter, int filter_does_read)
 {
 CHECK_PROCESS (proc);
-if (PROCESS_LIVE_P (proc)) {
+if (PROCESS_LIVE_P (XPROCESS (proc))) {
 if (EQ (filter, Qt))
 event_stream_unselect_process (XPROCESS (proc));
 else
 event_stream_select_process (XPROCESS (proc));
 }
 Return PROCESS's input coding system.
 */
 (process))
 {
 process = get_process (process);
+CHECK_LIVE_PROCESS (process);
 return decoding_stream_coding_system (XLSTREAM (XPROCESS (process)->coding_instream) );
 }
 DEFUN ("process-output-coding-system", Fprocess_output_coding_system, 1, 1, 0, /*
 Return PROCESS's output coding system.
 */
 (process))
 {
 process = get_process (process);
+CHECK_LIVE_PROCESS (process);
 return encoding_stream_coding_system (XLSTREAM (XPROCESS (process)->coding_outstream));
 }
 DEFUN ("process-coding-system", Fprocess_coding_system, 1, 1, 0, /*
 Return a pair of coding-system for decoding and encoding of PROCESS.
 */
 (process))
 {
 process = get_process (process);
+CHECK_LIVE_PROCESS (process);
 return Fcons (decoding_stream_coding_system
 		(XLSTREAM (XPROCESS (process)->coding_instream)),
 		encoding_stream_coding_system
 		(XLSTREAM (XPROCESS (process)->coding_outstream)));
 }
 */
 (process, codesys))
 {
 codesys = Fget_coding_system (codesys);
 process = get_process (process);
+CHECK_LIVE_PROCESS (process);
 set_decoding_stream_coding_system
 (XLSTREAM (XPROCESS (process)->coding_instream), codesys);
 return Qnil;
 }
 */
 (process, codesys))
 {
 codesys = Fget_coding_system (codesys);
 process = get_process (process);
+CHECK_LIVE_PROCESS (process);
 set_encoding_stream_coding_system
 (XLSTREAM (XPROCESS (process)->coding_outstream), codesys);
 return Qnil;
 }
 Lisp_Object proc = get_process (process);
 if (network_connection_p (proc))
 error ("Network connection %s is not a subprocess",
 	   XSTRING_DATA (XPROCESS(proc)->name));
-if (!PROCESS_LIVE_P (proc))
+CHECK_LIVE_PROCESS (proc);
-error ("Process %s is not active",
-	   XSTRING_DATA (XPROCESS(proc)->name));
 MAYBE_PROCMETH (kill_child_process, (proc, signo, current_group, nomsg));
 }
 DEFUN ("interrupt-process", Finterrupt_process, 0, 2, 0, /*
 p->exit_code = 0;
 p->core_dumped = 0;
 p->tick++;
 process_tick++;
 }
-else if (!NILP(p->pipe_instream))
+else if (PROCESS_LIVE_P (p))
 {
 Fkill_process (proc, Qnil);
 /* Do this now, since remove_process will make sigchld_handler do nothing.  */
 p->status_symbol = Qsignal;
 p->exit_code = SIGKILL;
 if (GC_PROCESSP (proc)
 	  && (GC_NILP (buffer) || GC_EQ (XPROCESS (proc)->buffer, buffer)))
 	{
 	  if (network_connection_p (proc))
 	    Fdelete_process (proc);
-	  else if (!NILP (XPROCESS (proc)->pipe_instream))
+	  else if (PROCESS_LIVE_P (XPROCESS (proc)))
 	    process_send_signal (proc, SIGHUP, 0, 1);
 	}
 }
 }
 void
 syms_of_process (void)
 {
 defsymbol (&Qprocessp, "processp");
+defsymbol (&Qprocess_live_p, "process-live-p");
 defsymbol (&Qrun, "run");
 defsymbol (&Qstop, "stop");
 defsymbol (&Qopen, "open");
 defsymbol (&Qclosed, "closed");
 #ifdef HAVE_MULTICAST
 defsymbol(&Qmulticast, "multicast"); /* Used for occasional warnings */
 #endif
 DEFSUBR (Fprocessp);
+DEFSUBR (Fprocess_live_p);
 DEFSUBR (Fget_process);
 DEFSUBR (Fget_buffer_process);
 DEFSUBR (Fdelete_process);
 DEFSUBR (Fprocess_status);
 DEFSUBR (Fprocess_exit_status);

Mercurial > hg > xemacs-beta

comparison src/process.c @ 359:8e84bee8ddd0 r21-1-9