# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1380917422 14400
# Node ID 1c7d768c3847f01f336b6e62ba7bd5ccf41b402e
# Parent  9d0992c6df30a54e02bab5bb6831c8f0b958164f
don't fork if there is no controlling tty

* configure.ac: Check for ctermid.
* octave.cc (octave_fork_gui): Check for controlling tty and return
false one is not found.

diff -r 9d0992c6df30 -r 1c7d768c3847 configure.ac
--- a/configure.ac	Fri Oct 04 15:26:10 2013 -0400
+++ b/configure.ac	Fri Oct 04 16:10:22 2013 -0400
@@ -2082,7 +2082,7 @@
 dnl These checks define/undefine HAVE_FUNCNAME in config.h.
 dnl Code tests HAVE_FUNCNAME and either uses function or provides workaround.
 dnl Use multiple AC_CHECKs to avoid line continuations '\' in list
-AC_CHECK_FUNCS([canonicalize_file_name dup2])
+AC_CHECK_FUNCS([canonicalize_file_name ctermid dup2])
 AC_CHECK_FUNCS([endgrent endpwent execvp expm1 expm1f fork])
 AC_CHECK_FUNCS([getegid geteuid getgid getgrent getgrgid getgrnam])
 AC_CHECK_FUNCS([getpgrp getpid getppid getpwent getpwuid getuid])
diff -r 9d0992c6df30 -r 1c7d768c3847 libinterp/octave.cc
--- a/libinterp/octave.cc	Fri Oct 04 15:26:10 2013 -0400
+++ b/libinterp/octave.cc	Fri Oct 04 16:10:22 2013 -0400
@@ -33,6 +33,7 @@
 
 #include <iostream>
 
+#include <fcntl.h>
 #include <getopt.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -1085,7 +1086,21 @@
 int
 octave_fork_gui (void)
 {
-  return ! no_fork_option;
+  bool have_ctty = false;
+
+#if ! (defined (__WIN32__) || defined (__APPLE__)) || defined (__CYGWIN__)
+
+#if defined (HAVE_CTERMID)
+  const char *ctty = ctermid (0);
+#else
+  const char *ctty = "/dev/tty";
+#endif
+
+  have_ctty = gnulib::open (ctty, O_RDWR, 0) > 0;
+
+#endif
+
+  return (have_ctty && ! no_fork_option);
 }
 
 DEFUN (isguirunning, args, ,