Mercurial > hg > xemacs-beta

comparison src/callproc.c @ 215:1f0dabaa0855 r20-4b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-4b6
author cvs
date Mon, 13 Aug 2007 10:07:35 +0200
parents 78f53ef88e17
children 677f6a0ee643
comparison
equal deleted inserted replaced
214:c5d88c05e1e9 215:1f0dabaa0855
128 int speccount = specpdl_depth (); 128 int speccount = specpdl_depth ();
129 129
130 record_unwind_protect (call_process_kill, fdpid); 130 record_unwind_protect (call_process_kill, fdpid);
131 /* #### "c-G" -- need non-consing Single-key-description */ 131 /* #### "c-G" -- need non-consing Single-key-description */
132 message ("Waiting for process to die...(type C-g again to kill it instantly)"); 132 message ("Waiting for process to die...(type C-g again to kill it instantly)");
133
134 wait_for_termination (pid);
133 135
134 /* "Discard" the unwind protect. */ 136 /* "Discard" the unwind protect. */
135 XCAR (fdpid) = Qnil; 137 XCAR (fdpid) = Qnil;
136 XCDR (fdpid) = Qnil; 138 XCDR (fdpid) = Qnil;
137 unbind_to (speccount, Qnil); 139 unbind_to (speccount, Qnil);
484 } 486 }
485 #ifdef EMACS_BTL 487 #ifdef EMACS_BTL
486 else if (logging_on) 488 else if (logging_on)
487 cadillac_start_logging (); 489 cadillac_start_logging ();
488 #endif 490 #endif
491 if (fd_error >= 0)
492 close (fd_error);
489 493
490 #endif /* not MSDOS */ 494 #endif /* not MSDOS */
491 #endif /* not WINDOWSNT */ 495 #endif /* not WINDOWSNT */
492 496
493 environ = save_environ; 497 environ = save_environ;
587 #ifdef DOS_NT 591 #ifdef DOS_NT
588 /* Until we pull out of MULE things like 592 /* Until we pull out of MULE things like
589 make_decoding_input_stream(), we do the following which is 593 make_decoding_input_stream(), we do the following which is
590 less elegant. --marcpa */ 594 less elegant. --marcpa */
591 { 595 {
592 int lf_count; 596 int lf_count = 0;
593 if (NILP (Vbinary_process_output)) { 597 if (NILP (Vbinary_process_output)) {
594 nread = nread - crlf_to_lf(nread, bufptr, &lf_count); 598 nread = crlf_to_lf(nread, bufptr, &lf_count);
595 } 599 }
596 } 600 }
597 #endif 601 #endif
598 602
599 total_read += nread; 603 total_read += nread;