Mercurial > hg > xemacs-beta

diff 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
line wrap: on
line diff
--- a/src/callproc.c	Mon Aug 13 10:06:48 2007 +0200
+++ b/src/callproc.c	Mon Aug 13 10:07:35 2007 +0200
@@ -131,6 +131,8 @@
     /* #### "c-G" -- need non-consing Single-key-description */
     message ("Waiting for process to die...(type C-g again to kill it instantly)");
 
+    wait_for_termination (pid);
+
     /* "Discard" the unwind protect.  */
     XCAR (fdpid) = Qnil;
     XCDR (fdpid) = Qnil;
@@ -486,6 +488,8 @@
     else if (logging_on)
       cadillac_start_logging ();
 #endif
+    if (fd_error >= 0)
+      close (fd_error);
 
 #endif /* not MSDOS */
 #endif /* not WINDOWSNT */
@@ -589,9 +593,9 @@
 	  make_decoding_input_stream(), we do the following which is
 	  less elegant. --marcpa */
        {
-	 int lf_count;
+	 int lf_count = 0;
 	 if (NILP (Vbinary_process_output)) {
-	   nread = nread - crlf_to_lf(nread, bufptr, &lf_count);
+	   nread = crlf_to_lf(nread, bufptr, &lf_count);
          }
        }
 #endif