[Emacs-diffs] trunk r115799: Fix pipe bug with OS X emacs --daemon (Bug#16262).

[Paul Eggert]

------------------------------------------------------------
revno: 115799
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sat 2013-12-28 14:56:58 -0800
message:
  Fix pipe bug with OS X emacs --daemon (Bug#16262).
  
  * emacs.c (main) [DAEMON_MUST_EXEC]: Clear the close-on-exec
  flags on the daemon pipe ends before execing.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/emacs.c                    emacs.c-20091113204419-o5vbwnq5f7feedwu-241

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-12-28 11:47:26 +0000
+++ b/src/ChangeLog     2013-12-28 22:56:58 +0000
@@ -1,3 +1,9 @@
+2013-12-28  Paul Eggert  <address@hidden>
+
+       Fix pipe bug with OS X emacs --daemon (Bug#16262).
+       * emacs.c (main) [DAEMON_MUST_EXEC]: Clear the close-on-exec
+       flags on the daemon pipe ends before execing.
+
 2013-12-28  Eli Zaretskii  <address@hidden>
 
        * w32fns.c (Fx_create_frame): Error out if called from a TTY

=== modified file 'src/emacs.c'
--- a/src/emacs.c       2013-12-18 20:36:50 +0000
+++ b/src/emacs.c       2013-12-28 22:56:58 +0000
@@ -1099,6 +1099,8 @@
 
             argv[skip_args] = fdStr;
 
+           fcntl (daemon_pipe[0], F_SETFD, 0);
+           fcntl (daemon_pipe[1], F_SETFD, 0);
             execvp (argv[0], argv);
            emacs_perror (argv[0]);
            exit (errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE);