# HG changeset patch
# User Andreas Schwab <schwab@linux-m68k.org>
# Date 1277939231 -7200
# Node ID a089fae479760ad9de56a2be6c13365a28187253
# Parent  49e082b9ea231c5b5be499bd0f8c6c29be839992
Avoid erroneous syscalls

* process.c (create_process): Avoid using invalid file descriptors.

* callproc.c (child_setup): Avoid closing a file descriptor twice.

diff -r 49e082b9ea23 -r a089fae47976 src/ChangeLog
--- a/src/ChangeLog	Thu Jul 01 01:07:00 2010 +0200
+++ b/src/ChangeLog	Thu Jul 01 01:07:11 2010 +0200
@@ -1,3 +1,9 @@
+2010-06-30  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* process.c (create_process): Avoid using invalid file descriptors.
+
+	* callproc.c (child_setup): Avoid closing a file descriptor twice.
+
 2010-06-30  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* xsettings.c (Ffont_get_system_normal_font, Ffont_get_system_font):
diff -r 49e082b9ea23 -r a089fae47976 src/callproc.c
--- a/src/callproc.c	Thu Jul 01 01:07:00 2010 +0200
+++ b/src/callproc.c	Thu Jul 01 01:07:11 2010 +0200
@@ -1244,8 +1244,10 @@
   dup2 (out, 1);
   dup2 (err, 2);
   emacs_close (in);
-  emacs_close (out);
-  emacs_close (err);
+  if (out != in)
+    emacs_close (out);
+  if (err != in && err != out)
+    emacs_close (err);
 #endif /* not MSDOS */
 #endif /* not WINDOWSNT */
 
diff -r 49e082b9ea23 -r a089fae47976 src/process.c
--- a/src/process.c	Thu Jul 01 01:07:00 2010 +0200
+++ b/src/process.c	Thu Jul 01 01:07:11 2010 +0200
@@ -2038,7 +2038,7 @@
 	   process_set_signal to fail on SGI when using a pipe.  */
 	setsid ();
 	/* Make the pty's terminal the controlling terminal.  */
-	if (pty_flag)
+	if (pty_flag && xforkin >= 0)
 	  {
 #ifdef TIOCSCTTY
 	    /* We ignore the return value
@@ -2081,8 +2081,11 @@
 	    /* I wonder: would just ioctl (0, TIOCNOTTY, 0) work here?
 	       I can't test it since I don't have 4.3.  */
 	    int j = emacs_open ("/dev/tty", O_RDWR, 0);
-	    ioctl (j, TIOCNOTTY, 0);
-	    emacs_close (j);
+	    if (j >= 0)
+	      {
+		ioctl (j, TIOCNOTTY, 0);
+		emacs_close (j);
+	      }
 #ifndef USG
 	    /* In order to get a controlling terminal on some versions
 	       of BSD, it is necessary to put the process in pgrp 0