octave-nkf: src/main.in.cc annotate

annotate src/main.in.cc @ 18549:16b0cd465ecd

Handle special case of 0 for pinv with Diagonal matrices. * CDiagMatrix.cc (pseudo_inverse), dDiagMatrix.cc (pseudo_inverse), fCDiagMatrix.cc (pseudo_inverse), fDiagMatrix.cc (pseudo_inverse): Check for special case where element is 0 to avoid a division by zero error.

author	Rik <rik@octave.org>
date	Mon, 17 Feb 2014 10:04:27 -0800
parents	87d96a7d50e0
children	f8203daed9d4

rev	line source
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	1 // %NO_EDIT_WARNING%
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	2 /*
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	3
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	4 Copyright (C) 2012-2013 John W. Eaton
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	5
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	6 This file is part of Octave.
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	7
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	8 Octave is free software; you can redistribute it and/or modify it
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	9 under the terms of the GNU General Public License as published by the
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	10 Free Software Foundation; either version 3 of the License, or (at your
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	11 option) any later version.
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	12
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	13 Octave is distributed in the hope that it will be useful, but WITHOUT
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	16 for more details.
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	17
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	18 You should have received a copy of the GNU General Public License
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	19 along with Octave; see the file COPYING. If not, see
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	20 <http://www.gnu.org/licenses/>.
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	21
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	22 */
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	23
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	24 // NOTE: This program is supposed to be a small wrapper that exists
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	25 // primarily to give up the controlling TTY and then exec Octave with
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	26 // its GUI. It may also execute Octave without the GUI or the command
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	27 // line version of Octave that is not linked with GUI libraries. So
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	28 // that it remains small, it should NOT depend on or be linked with
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	29 // liboctave or libinterp.
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	30
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	31 #ifdef HAVE_CONFIG_H
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	32 #include <config.h>
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	33 #endif
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	34
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	35 #include <cstdlib>
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	36 #include <cstring>
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	37
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	38 #include <algorithm>
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	39 #include <iostream>
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	40 #include <string>
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	41
17805 2a15970da7f0 allow main.cc to build again with --disable-gui John W. Eaton <jwe@octave.org> parents: 17803 diff changeset	42 #include <sys/types.h>
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	43 #include <unistd.h>
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	44
18151 91a3858ef8cf invoke versioned binaries from octave driver program (bug #40957) John W. Eaton <jwe@octave.org> parents: 18052 diff changeset	45 #ifndef OCTAVE_VERSION
91a3858ef8cf invoke versioned binaries from octave driver program (bug #40957) John W. Eaton <jwe@octave.org> parents: 18052 diff changeset	46 #define OCTAVE_VERSION %OCTAVE_VERSION%
91a3858ef8cf invoke versioned binaries from octave driver program (bug #40957) John W. Eaton <jwe@octave.org> parents: 18052 diff changeset	47 #endif
91a3858ef8cf invoke versioned binaries from octave driver program (bug #40957) John W. Eaton <jwe@octave.org> parents: 18052 diff changeset	48
18162 65e4e0569ed4 install octave-gui binary in libexec directory John W. Eaton <jwe@octave.org> parents: 18151 diff changeset	49 #ifndef OCTAVE_ARCHLIBDIR
65e4e0569ed4 install octave-gui binary in libexec directory John W. Eaton <jwe@octave.org> parents: 18151 diff changeset	50 #define OCTAVE_ARCHLIBDIR %OCTAVE_ARCHLIBDIR%
65e4e0569ed4 install octave-gui binary in libexec directory John W. Eaton <jwe@octave.org> parents: 18151 diff changeset	51 #endif
65e4e0569ed4 install octave-gui binary in libexec directory John W. Eaton <jwe@octave.org> parents: 18151 diff changeset	52
18151 91a3858ef8cf invoke versioned binaries from octave driver program (bug #40957) John W. Eaton <jwe@octave.org> parents: 18052 diff changeset	53 #ifndef OCTAVE_BINDIR
91a3858ef8cf invoke versioned binaries from octave driver program (bug #40957) John W. Eaton <jwe@octave.org> parents: 18052 diff changeset	54 #define OCTAVE_BINDIR %OCTAVE_BINDIR%
91a3858ef8cf invoke versioned binaries from octave driver program (bug #40957) John W. Eaton <jwe@octave.org> parents: 18052 diff changeset	55 #endif
91a3858ef8cf invoke versioned binaries from octave driver program (bug #40957) John W. Eaton <jwe@octave.org> parents: 18052 diff changeset	56
91a3858ef8cf invoke versioned binaries from octave driver program (bug #40957) John W. Eaton <jwe@octave.org> parents: 18052 diff changeset	57 #ifndef OCTAVE_PREFIX
91a3858ef8cf invoke versioned binaries from octave driver program (bug #40957) John W. Eaton <jwe@octave.org> parents: 18052 diff changeset	58 #define OCTAVE_PREFIX %OCTAVE_PREFIX%
91a3858ef8cf invoke versioned binaries from octave driver program (bug #40957) John W. Eaton <jwe@octave.org> parents: 18052 diff changeset	59 #endif
91a3858ef8cf invoke versioned binaries from octave driver program (bug #40957) John W. Eaton <jwe@octave.org> parents: 18052 diff changeset	60
18428 f1ee47866e6b use common code to get OCTAVE_HOME in main, octave-config and mkoctfile John W. Eaton <jwe@octave.org> parents: 18162 diff changeset	61 #include "shared-fcns.h"
17782 136a9e27256e automatically locate wrapper binary on Windows systems (bug #40381) John W. Eaton <jwe@octave.org> parents: 17780 diff changeset	62
17994 a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	63 #include <cstdlib>
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	64
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	65 #if defined (OCTAVE_USE_WINDOWS_API)
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	66 #include <windows.h>
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	67 #elif defined (HAVE_FRAMEWORK_CARBON)
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	68 #include <Carbon/Carbon.h>
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	69 #elif defined (HAVE_X_WINDOWS)
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	70 #include <X11/Xlib.h>
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	71 #endif
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	72
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	73 bool
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	74 display_available (std::string& err_msg)
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	75 {
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	76 bool dpy_avail = false;
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	77
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	78 err_msg = "";
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	79
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	80 #if defined (OCTAVE_USE_WINDOWS_API)
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	81
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	82 HDC hdc = GetDC (0);
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	83
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	84 if (hdc)
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	85 dpy_avail = true;
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	86 else
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	87 err_msg = "no graphical display found";
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	88
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	89 #elif defined (HAVE_FRAMEWORK_CARBON)
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	90
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	91 CGDirectDisplayID display = CGMainDisplayID ();
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	92
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	93 if (display)
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	94 dpy_avail = true;
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	95 else
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	96 err_msg = "no graphical display found";
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	97
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	98 #elif defined (HAVE_X_WINDOWS)
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	99
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	100 const char *display_name = getenv ("DISPLAY");
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	101
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	102 if (display_name && *display_name)
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	103 {
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	104 Display *display = XOpenDisplay (display_name);
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	105
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	106 if (display)
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	107 {
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	108 Screen *screen = DefaultScreenOfDisplay (display);
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	109
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	110 if (! screen)
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	111 err_msg = "X11 display has no default screen";
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	112
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	113 XCloseDisplay (display);
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	114
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	115 dpy_avail = true;
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	116 }
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	117 else
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	118 err_msg = "unable to open X11 DISPLAY";
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	119 }
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	120 else
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	121 err_msg = "X11 DISPLAY environment variable not set";
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	122
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	123 #else
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	124
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	125 err_msg = "no graphical display found";
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	126
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	127 #endif
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	128
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	129 return dpy_avail;
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	130 }
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	131
17814 e50a3664bd45 make compilation of main.cc work again when not building GUI John W. Eaton <jwe@octave.org> parents: 17813 diff changeset	132 #if (defined (HAVE_OCTAVE_GUI) \
e50a3664bd45 make compilation of main.cc work again when not building GUI John W. Eaton <jwe@octave.org> parents: 17813 diff changeset	133 && ! defined (__WIN32__) \|\| defined (__CYGWIN__))
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	134
17780 8b353af4a1ca allow octave main program to work on Windows systems John W. Eaton <jwe@octave.org> parents: 17778 diff changeset	135 #include <signal.h>
17813 0a887758d1cc fix compilation of main.cc on Windows John W. Eaton <jwe@octave.org> parents: 17805 diff changeset	136 #include <fcntl.h>
0a887758d1cc fix compilation of main.cc on Windows John W. Eaton <jwe@octave.org> parents: 17805 diff changeset	137
0a887758d1cc fix compilation of main.cc on Windows John W. Eaton <jwe@octave.org> parents: 17805 diff changeset	138 // This is a liboctave header, but it doesn't include any other Octave
0a887758d1cc fix compilation of main.cc on Windows John W. Eaton <jwe@octave.org> parents: 17805 diff changeset	139 // headers or declare any functions that are defined in liboctave.
0a887758d1cc fix compilation of main.cc on Windows John W. Eaton <jwe@octave.org> parents: 17805 diff changeset	140 #include "syswait.h"
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	141
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	142 typedef void sig_handler (int);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	143
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	144 // Forward signals to the GUI process.
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	145
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	146 static pid_t gui_pid = 0;
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	147
17865 dde06c2ac6c6 improve signal handling in driver program John W. Eaton <jwe@octave.org> parents: 17814 diff changeset	148 static int caught_signal = -1;
dde06c2ac6c6 improve signal handling in driver program John W. Eaton <jwe@octave.org> parents: 17814 diff changeset	149
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	150 static void
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	151 gui_driver_sig_handler (int sig)
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	152 {
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	153 if (gui_pid > 0)
17865 dde06c2ac6c6 improve signal handling in driver program John W. Eaton <jwe@octave.org> parents: 17814 diff changeset	154 caught_signal = sig;
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	155 }
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	156
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	157 static sig_handler *
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	158 octave_set_signal_handler (int sig, sig_handler *handler)
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	159 {
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	160 struct sigaction act, oact;
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	161
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	162 act.sa_handler = handler;
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	163 act.sa_flags = 0;
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	164
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	165 gnulib::sigemptyset (&act.sa_mask);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	166 gnulib::sigemptyset (&oact.sa_mask);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	167
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	168 gnulib::sigaction (sig, &act, &oact);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	169
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	170 return oact.sa_handler;
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	171 }
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	172
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	173 static void
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	174 install_signal_handlers (void)
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	175 {
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	176
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	177 #ifdef SIGINT
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	178 octave_set_signal_handler (SIGINT, gui_driver_sig_handler);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	179 #endif
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	180
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	181 #ifdef SIGBREAK
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	182 octave_set_signal_handler (SIGBREAK, gui_driver_sig_handler);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	183 #endif
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	184
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	185 #ifdef SIGABRT
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	186 octave_set_signal_handler (SIGABRT, gui_driver_sig_handler);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	187 #endif
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	188
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	189 #ifdef SIGALRM
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	190 octave_set_signal_handler (SIGALRM, gui_driver_sig_handler);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	191 #endif
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	192
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	193 #ifdef SIGBUS
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	194 octave_set_signal_handler (SIGBUS, gui_driver_sig_handler);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	195 #endif
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	196
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	197 // SIGCHLD
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	198 // SIGCLD
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	199 // SIGCONT
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	200
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	201 #ifdef SIGEMT
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	202 octave_set_signal_handler (SIGEMT, gui_driver_sig_handler);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	203 #endif
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	204
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	205 #ifdef SIGFPE
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	206 octave_set_signal_handler (SIGFPE, gui_driver_sig_handler);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	207 #endif
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	208
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	209 #ifdef SIGHUP
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	210 octave_set_signal_handler (SIGHUP, gui_driver_sig_handler);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	211 #endif
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	212
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	213 #ifdef SIGILL
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	214 octave_set_signal_handler (SIGILL, gui_driver_sig_handler);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	215 #endif
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	216
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	217 // SIGINFO
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	218 // SIGINT
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	219
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	220 #ifdef SIGIOT
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	221 octave_set_signal_handler (SIGIOT, gui_driver_sig_handler);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	222 #endif
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	223
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	224 #ifdef SIGLOST
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	225 octave_set_signal_handler (SIGLOST, gui_driver_sig_handler);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	226 #endif
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	227
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	228 #ifdef SIGPIPE
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	229 octave_set_signal_handler (SIGPIPE, gui_driver_sig_handler);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	230 #endif
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	231
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	232 #ifdef SIGPOLL
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	233 octave_set_signal_handler (SIGPOLL, gui_driver_sig_handler);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	234 #endif
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	235
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	236 // SIGPROF
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	237 // SIGPWR
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	238
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	239 #ifdef SIGQUIT
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	240 octave_set_signal_handler (SIGQUIT, gui_driver_sig_handler);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	241 #endif
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	242
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	243 #ifdef SIGSEGV
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	244 octave_set_signal_handler (SIGSEGV, gui_driver_sig_handler);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	245 #endif
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	246
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	247 // SIGSTOP
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	248
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	249 #ifdef SIGSYS
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	250 octave_set_signal_handler (SIGSYS, gui_driver_sig_handler);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	251 #endif
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	252
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	253 #ifdef SIGTERM
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	254 octave_set_signal_handler (SIGTERM, gui_driver_sig_handler);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	255 #endif
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	256
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	257 #ifdef SIGTRAP
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	258 octave_set_signal_handler (SIGTRAP, gui_driver_sig_handler);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	259 #endif
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	260
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	261 // SIGTSTP
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	262 // SIGTTIN
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	263 // SIGTTOU
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	264 // SIGURG
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	265
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	266 #ifdef SIGUSR1
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	267 octave_set_signal_handler (SIGUSR1, gui_driver_sig_handler);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	268 #endif
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	269
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	270 #ifdef SIGUSR2
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	271 octave_set_signal_handler (SIGUSR2, gui_driver_sig_handler);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	272 #endif
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	273
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	274 #ifdef SIGVTALRM
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	275 octave_set_signal_handler (SIGVTALRM, gui_driver_sig_handler);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	276 #endif
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	277
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	278 #ifdef SIGIO
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	279 octave_set_signal_handler (SIGIO, gui_driver_sig_handler);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	280 #endif
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	281
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	282 // SIGWINCH
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	283
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	284 #ifdef SIGXCPU
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	285 octave_set_signal_handler (SIGXCPU, gui_driver_sig_handler);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	286 #endif
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	287
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	288 #ifdef SIGXFSZ
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	289 octave_set_signal_handler (SIGXFSZ, gui_driver_sig_handler);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	290 #endif
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	291
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	292 }
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	293
17803 f5ada8597078 * main.in.cc (have_controlling_terminal): Return bool, not int. John W. Eaton <jwe@octave.org> parents: 17802 diff changeset	294 static bool
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	295 have_controlling_terminal (void)
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	296 {
17803 f5ada8597078 * main.in.cc (have_controlling_terminal): Return bool, not int. John W. Eaton <jwe@octave.org> parents: 17802 diff changeset	297 int retval = false;
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	298
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	299 #if defined (HAVE_CTERMID)
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	300 const char *ctty = ctermid (0);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	301 #else
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	302 const char *ctty = "/dev/tty";
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	303 #endif
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	304
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	305 int fd = gnulib::open (ctty, O_RDWR, 0);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	306
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	307 if (fd >= 0)
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	308 {
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	309 gnulib::close (fd);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	310
17803 f5ada8597078 * main.in.cc (have_controlling_terminal): Return bool, not int. John W. Eaton <jwe@octave.org> parents: 17802 diff changeset	311 retval = true;
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	312 }
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	313
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	314 return retval;
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	315 }
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	316
17813 0a887758d1cc fix compilation of main.cc on Windows John W. Eaton <jwe@octave.org> parents: 17805 diff changeset	317 #endif
0a887758d1cc fix compilation of main.cc on Windows John W. Eaton <jwe@octave.org> parents: 17805 diff changeset	318
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	319 static std::string
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	320 get_octave_bindir (void)
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	321 {
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	322 // Accept value from the environment literally, but substitute
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	323 // OCTAVE_HOME in the configuration value OCTAVE_BINDIR in case Octave
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	324 // has been relocated to some installation directory other than the
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	325 // one originally configured.
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	326
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	327 std::string obd = octave_getenv ("OCTAVE_BINDIR");
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	328
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	329 return obd.empty () ? subst_octave_home (std::string (OCTAVE_BINDIR)) : obd;
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	330 }
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	331
18162 65e4e0569ed4 install octave-gui binary in libexec directory John W. Eaton <jwe@octave.org> parents: 18151 diff changeset	332 static std::string
65e4e0569ed4 install octave-gui binary in libexec directory John W. Eaton <jwe@octave.org> parents: 18151 diff changeset	333 get_octave_archlibdir (void)
65e4e0569ed4 install octave-gui binary in libexec directory John W. Eaton <jwe@octave.org> parents: 18151 diff changeset	334 {
65e4e0569ed4 install octave-gui binary in libexec directory John W. Eaton <jwe@octave.org> parents: 18151 diff changeset	335 // Accept value from the environment literally, but substitute
65e4e0569ed4 install octave-gui binary in libexec directory John W. Eaton <jwe@octave.org> parents: 18151 diff changeset	336 // OCTAVE_HOME in the configuration value OCTAVE_ARCHLIBDIR in case
65e4e0569ed4 install octave-gui binary in libexec directory John W. Eaton <jwe@octave.org> parents: 18151 diff changeset	337 // Octave has been relocated to some installation directory other than
65e4e0569ed4 install octave-gui binary in libexec directory John W. Eaton <jwe@octave.org> parents: 18151 diff changeset	338 // the one originally configured.
65e4e0569ed4 install octave-gui binary in libexec directory John W. Eaton <jwe@octave.org> parents: 18151 diff changeset	339
65e4e0569ed4 install octave-gui binary in libexec directory John W. Eaton <jwe@octave.org> parents: 18151 diff changeset	340 std::string dir = octave_getenv ("OCTAVE_ARCHLIBDIR");
65e4e0569ed4 install octave-gui binary in libexec directory John W. Eaton <jwe@octave.org> parents: 18151 diff changeset	341
65e4e0569ed4 install octave-gui binary in libexec directory John W. Eaton <jwe@octave.org> parents: 18151 diff changeset	342 return dir.empty ()
65e4e0569ed4 install octave-gui binary in libexec directory John W. Eaton <jwe@octave.org> parents: 18151 diff changeset	343 ? subst_octave_home (std::string (OCTAVE_ARCHLIBDIR)) : dir;
65e4e0569ed4 install octave-gui binary in libexec directory John W. Eaton <jwe@octave.org> parents: 18151 diff changeset	344 }
65e4e0569ed4 install octave-gui binary in libexec directory John W. Eaton <jwe@octave.org> parents: 18151 diff changeset	345
18006 b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	346 // Adapted from libtool wrapper.
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	347 #if defined (__WIN32__) && ! defined (__CYGWIN__)
17959 1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	348
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	349 /* Prepares an argument vector before calling spawn().
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	350 Note that spawn() does not by itself call the command interpreter
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	351 (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	352 ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	353 GetVersionEx(&v);
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	354 v.dwPlatformId == VER_PLATFORM_WIN32_NT;
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	355 }) ? "cmd.exe" : "command.com").
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	356 Instead it simply concatenates the arguments, separated by ' ', and calls
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	357 CreateProcess(). We must quote the arguments since Win32 CreateProcess()
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	358 interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	359 special way:
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	360 - Space and tab are interpreted as delimiters. They are not treated as
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	361 delimiters if they are surrounded by double quotes: "...".
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	362 - Unescaped double quotes are removed from the input. Their only effect is
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	363 that within double quotes, space and tab are treated like normal
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	364 characters.
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	365 - Backslashes not followed by double quotes are not special.
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	366 - But 2*n+1 backslashes followed by a double quote become
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	367 n backslashes followed by a double quote (n >= 0):
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	368 \" -> "
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	369 \\\" -> \"
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	370 \\\\\" -> \\"
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	371 */
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	372 #define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	373 #define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	374 char **
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	375 prepare_spawn (char **argv)
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	376 {
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	377 size_t argc;
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	378 char **new_argv;
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	379 size_t i;
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	380
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	381 /* Count number of arguments. */
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	382 for (argc = 0; argv[argc] != NULL; argc++)
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	383 ;
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	384
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	385 /* Allocate new argument vector. */
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	386 new_argv = new char* [argc + 1];
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	387
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	388 /* Put quoted arguments into the new argument vector. */
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	389 for (i = 0; i < argc; i++)
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	390 {
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	391 const char *string = argv[i];
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	392
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	393 if (string[0] == '\0')
18006 b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	394 new_argv[i] = strdup ("\"\"");
17959 1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	395 else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
18006 b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	396 {
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	397 int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	398 size_t length;
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	399 unsigned int backslashes;
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	400 const char *s;
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	401 char *quoted_string;
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	402 char *p;
17959 1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	403
18006 b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	404 length = 0;
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	405 backslashes = 0;
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	406 if (quote_around)
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	407 length++;
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	408 for (s = string; *s != '\0'; s++)
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	409 {
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	410 char c = *s;
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	411 if (c == '"')
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	412 length += backslashes + 1;
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	413 length++;
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	414 if (c == '\\')
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	415 backslashes++;
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	416 else
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	417 backslashes = 0;
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	418 }
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	419 if (quote_around)
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	420 length += backslashes + 1;
17959 1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	421
18006 b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	422 quoted_string = new char [length + 1];
17959 1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	423
18006 b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	424 p = quoted_string;
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	425 backslashes = 0;
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	426 if (quote_around)
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	427 *p++ = '"';
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	428 for (s = string; *s != '\0'; s++)
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	429 {
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	430 char c = *s;
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	431 if (c == '"')
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	432 {
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	433 unsigned int j;
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	434 for (j = backslashes + 1; j > 0; j--)
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	435 *p++ = '\\';
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	436 }
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	437 *p++ = c;
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	438 if (c == '\\')
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	439 backslashes++;
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	440 else
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	441 backslashes = 0;
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	442 }
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	443 if (quote_around)
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	444 {
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	445 unsigned int j;
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	446 for (j = backslashes; j > 0; j--)
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	447 *p++ = '\\';
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	448 *p++ = '"';
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	449 }
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	450 *p = '\0';
17959 1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	451
18006 b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	452 new_argv[i] = quoted_string;
b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	453 }
17959 1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	454 else
18006 b992a17767fe main.in.cc: Replace tabs with spaces. Shorten lines > 80 chars. Rik <rik@octave.org> parents: 17994 diff changeset	455 new_argv[i] = (char *) string;
17959 1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	456 }
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	457 new_argv[argc] = NULL;
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	458
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	459 return new_argv;
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	460 }
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	461
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	462 #endif // __WIN32__ && ! __CYGWIN__
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	463
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	464 static int
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	465 octave_exec (const std::string& file, char **argv)
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	466 {
17959 1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	467 #if defined (__WIN32__) && ! defined (__CYGWIN__)
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	468 argv = prepare_spawn (argv);
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	469 return _spawnv (_P_WAIT, file.c_str (), argv);
1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	470 #else
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	471 execv (file.c_str (), argv);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	472
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	473 std::cerr << "octave: failed to exec '" << file << "'" << std::endl;
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	474
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	475 return 1;
17959 1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	476 #endif
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	477 }
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	478
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	479 static char *
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	480 strsave (const char *s)
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	481 {
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	482 if (! s)
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	483 return 0;
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	484
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	485 int len = strlen (s);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	486 char *tmp = new char [len+1];
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	487 tmp = strcpy (tmp, s);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	488 return tmp;
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	489 }
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	490
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	491 int
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	492 main (int argc, char **argv)
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	493 {
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	494 int retval = 0;
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	495
18014 6df05f2fd354 maint: Back out changeset 25b6fbe82827 and set default to GUI for 4.0 release. Rik <rik@octave.org> parents: 18008 diff changeset	496 bool start_gui = true;
6df05f2fd354 maint: Back out changeset 25b6fbe82827 and set default to GUI for 4.0 release. Rik <rik@octave.org> parents: 18008 diff changeset	497 bool gui_libs = true;
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	498
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	499 std::string octave_bindir = get_octave_bindir ();
18162 65e4e0569ed4 install octave-gui binary in libexec directory John W. Eaton <jwe@octave.org> parents: 18151 diff changeset	500 std::string octave_archlibdir = get_octave_archlibdir ();
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	501
18014 6df05f2fd354 maint: Back out changeset 25b6fbe82827 and set default to GUI for 4.0 release. Rik <rik@octave.org> parents: 18008 diff changeset	502 #if defined (HAVE_OCTAVE_GUI)
18163 eb51f47d9dee maint: Periodic merge of stable to gui-release. John W. Eaton <jwe@octave.org> parents: 18156 18162 diff changeset	503 // The Octave version number is already embedded in the
eb51f47d9dee maint: Periodic merge of stable to gui-release. John W. Eaton <jwe@octave.org> parents: 18156 18162 diff changeset	504 // octave_archlibdir directory name so we don't need to append it to
eb51f47d9dee maint: Periodic merge of stable to gui-release. John W. Eaton <jwe@octave.org> parents: 18156 18162 diff changeset	505 // the octave-gui file name.
eb51f47d9dee maint: Periodic merge of stable to gui-release. John W. Eaton <jwe@octave.org> parents: 18156 18162 diff changeset	506
eb51f47d9dee maint: Periodic merge of stable to gui-release. John W. Eaton <jwe@octave.org> parents: 18156 18162 diff changeset	507 std::string file = octave_archlibdir + dir_sep_char + "octave-gui";
18014 6df05f2fd354 maint: Back out changeset 25b6fbe82827 and set default to GUI for 4.0 release. Rik <rik@octave.org> parents: 18008 diff changeset	508 #else
18151 91a3858ef8cf invoke versioned binaries from octave driver program (bug #40957) John W. Eaton <jwe@octave.org> parents: 18052 diff changeset	509 std::string file
18163 eb51f47d9dee maint: Periodic merge of stable to gui-release. John W. Eaton <jwe@octave.org> parents: 18156 18162 diff changeset	510 = octave_bindir + dir_sep_char + "octave-cli-" OCTAVE_VERSION;
18014 6df05f2fd354 maint: Back out changeset 25b6fbe82827 and set default to GUI for 4.0 release. Rik <rik@octave.org> parents: 18008 diff changeset	511 #endif
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	512
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	513 char *new_argv = new char [argc + 1];
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	514
17959 1329866151be [Win32] Use spawn instead of exec for main octave wrapper executable. Michael Goffioul <michael.goffioul@gmail.com> parents: 17865 diff changeset	515 int k = 1;
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	516
17994 a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	517 bool warn_display = true;
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	518
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	519 for (int i = 1; i < argc; i++)
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	520 {
18014 6df05f2fd354 maint: Back out changeset 25b6fbe82827 and set default to GUI for 4.0 release. Rik <rik@octave.org> parents: 18008 diff changeset	521 if (! strcmp (argv[i], "--no-gui-libs"))
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	522 {
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	523 // Run the version of Octave that is not linked with any GUI
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	524 // libraries. It may not be possible to do plotting or any
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	525 // ui* calls, but it will be a little faster to start and
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	526 // require less memory. Don't pass the --no-gui-libs option
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	527 // on as that option is not recognized by Octave.
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	528
18014 6df05f2fd354 maint: Back out changeset 25b6fbe82827 and set default to GUI for 4.0 release. Rik <rik@octave.org> parents: 18008 diff changeset	529 start_gui = false;
6df05f2fd354 maint: Back out changeset 25b6fbe82827 and set default to GUI for 4.0 release. Rik <rik@octave.org> parents: 18008 diff changeset	530 gui_libs = false;
6df05f2fd354 maint: Back out changeset 25b6fbe82827 and set default to GUI for 4.0 release. Rik <rik@octave.org> parents: 18008 diff changeset	531 file = octave_bindir + dir_sep_char + "octave-cli";
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	532 }
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	533 else if (! strcmp (argv[i], "--no-gui"))
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	534 {
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	535 // If we see this option, then we can just exec octave; we
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	536 // don't have to create a child process and wait for it to
18151 91a3858ef8cf invoke versioned binaries from octave driver program (bug #40957) John W. Eaton <jwe@octave.org> parents: 18052 diff changeset	537 // exit. But do exec "octave-gui", not "octave-cli", because
91a3858ef8cf invoke versioned binaries from octave driver program (bug #40957) John W. Eaton <jwe@octave.org> parents: 18052 diff changeset	538 // even if the --no-gui option is given, we may be asked to do
91a3858ef8cf invoke versioned binaries from octave driver program (bug #40957) John W. Eaton <jwe@octave.org> parents: 18052 diff changeset	539 // some plotting or ui* calls.
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	540
18014 6df05f2fd354 maint: Back out changeset 25b6fbe82827 and set default to GUI for 4.0 release. Rik <rik@octave.org> parents: 18008 diff changeset	541 start_gui = false;
6df05f2fd354 maint: Back out changeset 25b6fbe82827 and set default to GUI for 4.0 release. Rik <rik@octave.org> parents: 18008 diff changeset	542 new_argv[k++] = argv[i];
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	543 }
18008 2831a949a219 Restore passing '--silent' option from octave wrapper executable Mike Miller <mtmiller@ieee.org> parents: 18007 diff changeset	544 else if (! strcmp (argv[i], "--silent") \|\| ! strcmp (argv[i], "--quiet")
2831a949a219 Restore passing '--silent' option from octave wrapper executable Mike Miller <mtmiller@ieee.org> parents: 18007 diff changeset	545 \|\| ! strcmp (argv[i], "-q"))
18010 dc58d4810de6 main.in.cc: Respect --silent option and don't print startup message. Rik <rik@octave.org> parents: 18007 diff changeset	546 {
dc58d4810de6 main.in.cc: Respect --silent option and don't print startup message. Rik <rik@octave.org> parents: 18007 diff changeset	547 warn_display = false;
dc58d4810de6 main.in.cc: Respect --silent option and don't print startup message. Rik <rik@octave.org> parents: 18007 diff changeset	548 new_argv[k++] = argv[i];
dc58d4810de6 main.in.cc: Respect --silent option and don't print startup message. Rik <rik@octave.org> parents: 18007 diff changeset	549 }
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	550 else
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	551 new_argv[k++] = argv[i];
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	552 }
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	553
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	554 new_argv[k] = 0;
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	555
17994 a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	556 if (gui_libs \|\| start_gui)
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	557 {
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	558 std::string display_check_err_msg;
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	559
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	560 if (! display_available (display_check_err_msg))
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	561 {
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	562 start_gui = false;
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	563 gui_libs = false;
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	564
18151 91a3858ef8cf invoke versioned binaries from octave driver program (bug #40957) John W. Eaton <jwe@octave.org> parents: 18052 diff changeset	565 file = octave_bindir + dir_sep_char + "octave-cli-" OCTAVE_VERSION;
17994 a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	566
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	567 if (warn_display)
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	568 {
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	569 std::cerr << "octave: " << display_check_err_msg << std::endl;
18052 0c4a2e95c768 Correct typo in error message when no DISPLAY var set. Rik <rik@octave.org> parents: 18012 diff changeset	570 std::cerr << "octave: disabling GUI features" << std::endl;
17994 a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	571 }
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	572 }
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	573 }
a99b7d656a6c start in CLI mode if display is not available (bug #40685) John W. Eaton <jwe@octave.org> parents: 17959 diff changeset	574
18151 91a3858ef8cf invoke versioned binaries from octave driver program (bug #40957) John W. Eaton <jwe@octave.org> parents: 18052 diff changeset	575 #if defined (__WIN32__) && ! defined (__CYGWIN__)
91a3858ef8cf invoke versioned binaries from octave driver program (bug #40957) John W. Eaton <jwe@octave.org> parents: 18052 diff changeset	576 file += ".exe";
91a3858ef8cf invoke versioned binaries from octave driver program (bug #40957) John W. Eaton <jwe@octave.org> parents: 18052 diff changeset	577 #endif
91a3858ef8cf invoke versioned binaries from octave driver program (bug #40957) John W. Eaton <jwe@octave.org> parents: 18052 diff changeset	578
91a3858ef8cf invoke versioned binaries from octave driver program (bug #40957) John W. Eaton <jwe@octave.org> parents: 18052 diff changeset	579 new_argv[0] = strsave (file.c_str ());
91a3858ef8cf invoke versioned binaries from octave driver program (bug #40957) John W. Eaton <jwe@octave.org> parents: 18052 diff changeset	580
17814 e50a3664bd45 make compilation of main.cc work again when not building GUI John W. Eaton <jwe@octave.org> parents: 17813 diff changeset	581 #if (defined (HAVE_OCTAVE_GUI) \
e50a3664bd45 make compilation of main.cc work again when not building GUI John W. Eaton <jwe@octave.org> parents: 17813 diff changeset	582 && ! defined (__WIN32__) \|\| defined (__CYGWIN__))
17813 0a887758d1cc fix compilation of main.cc on Windows John W. Eaton <jwe@octave.org> parents: 17805 diff changeset	583
17801 0b81d65d3c49 only fork and exec when starting gui John W. Eaton <jwe@octave.org> parents: 17789 diff changeset	584 if (gui_libs && start_gui && have_controlling_terminal ())
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	585 {
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	586 install_signal_handlers ();
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	587
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	588 gui_pid = fork ();
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	589
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	590 if (gui_pid < 0)
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	591 {
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	592 std::cerr << "octave: fork failed!" << std::endl;
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	593
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	594 retval = 1;
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	595 }
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	596 else if (gui_pid == 0)
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	597 {
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	598 // Child.
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	599
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	600 if (setsid () < 0)
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	601 {
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	602 std::cerr << "octave: error calling setsid!" << std::endl;
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	603
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	604 retval = 1;
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	605 }
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	606
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	607 retval = octave_exec (file, new_argv);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	608 }
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	609 else
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	610 {
18007 25b6fbe82827 Make the CLI the default for the 3.8 release. Rik <rik@octave.org> parents: 18006 diff changeset	611 // Parent. Forward signals to child while waiting for it to exit.
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	612
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	613 int status;
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	614
17865 dde06c2ac6c6 improve signal handling in driver program John W. Eaton <jwe@octave.org> parents: 17814 diff changeset	615 while (true)
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	616 {
17780 8b353af4a1ca allow octave main program to work on Windows systems John W. Eaton <jwe@octave.org> parents: 17778 diff changeset	617 WAITPID (gui_pid, &status, 0);
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	618
17865 dde06c2ac6c6 improve signal handling in driver program John W. Eaton <jwe@octave.org> parents: 17814 diff changeset	619 if (caught_signal > 0)
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	620 {
17865 dde06c2ac6c6 improve signal handling in driver program John W. Eaton <jwe@octave.org> parents: 17814 diff changeset	621 int sig = caught_signal;
dde06c2ac6c6 improve signal handling in driver program John W. Eaton <jwe@octave.org> parents: 17814 diff changeset	622
dde06c2ac6c6 improve signal handling in driver program John W. Eaton <jwe@octave.org> parents: 17814 diff changeset	623 caught_signal = -1;
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	624
17865 dde06c2ac6c6 improve signal handling in driver program John W. Eaton <jwe@octave.org> parents: 17814 diff changeset	625 kill (gui_pid, sig);
dde06c2ac6c6 improve signal handling in driver program John W. Eaton <jwe@octave.org> parents: 17814 diff changeset	626 }
dde06c2ac6c6 improve signal handling in driver program John W. Eaton <jwe@octave.org> parents: 17814 diff changeset	627 else if (WIFEXITED (status))
dde06c2ac6c6 improve signal handling in driver program John W. Eaton <jwe@octave.org> parents: 17814 diff changeset	628 {
dde06c2ac6c6 improve signal handling in driver program John W. Eaton <jwe@octave.org> parents: 17814 diff changeset	629 retval = WEXITSTATUS (status);
dde06c2ac6c6 improve signal handling in driver program John W. Eaton <jwe@octave.org> parents: 17814 diff changeset	630 break;
dde06c2ac6c6 improve signal handling in driver program John W. Eaton <jwe@octave.org> parents: 17814 diff changeset	631 }
dde06c2ac6c6 improve signal handling in driver program John W. Eaton <jwe@octave.org> parents: 17814 diff changeset	632 else if (WIFSIGNALLED (status))
dde06c2ac6c6 improve signal handling in driver program John W. Eaton <jwe@octave.org> parents: 17814 diff changeset	633 {
dde06c2ac6c6 improve signal handling in driver program John W. Eaton <jwe@octave.org> parents: 17814 diff changeset	634 std::cerr << "octave exited with signal "
dde06c2ac6c6 improve signal handling in driver program John W. Eaton <jwe@octave.org> parents: 17814 diff changeset	635 << WTERMSIG (status) << std::endl;
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	636 break;
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	637 }
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	638 }
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	639 }
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	640 }
17801 0b81d65d3c49 only fork and exec when starting gui John W. Eaton <jwe@octave.org> parents: 17789 diff changeset	641 else
0b81d65d3c49 only fork and exec when starting gui John W. Eaton <jwe@octave.org> parents: 17789 diff changeset	642 retval = octave_exec (file, new_argv);
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	643
17813 0a887758d1cc fix compilation of main.cc on Windows John W. Eaton <jwe@octave.org> parents: 17805 diff changeset	644 #else
0a887758d1cc fix compilation of main.cc on Windows John W. Eaton <jwe@octave.org> parents: 17805 diff changeset	645
0a887758d1cc fix compilation of main.cc on Windows John W. Eaton <jwe@octave.org> parents: 17805 diff changeset	646 retval = octave_exec (file, new_argv);
0a887758d1cc fix compilation of main.cc on Windows John W. Eaton <jwe@octave.org> parents: 17805 diff changeset	647
0a887758d1cc fix compilation of main.cc on Windows John W. Eaton <jwe@octave.org> parents: 17805 diff changeset	648 #endif
0a887758d1cc fix compilation of main.cc on Windows John W. Eaton <jwe@octave.org> parents: 17805 diff changeset	649
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	650 return retval;
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	651 }
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	652
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	653 /*!
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	654 @mainpage Source code documentation for GNU Octave
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	655
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	656 GNU Octave is a high-level language, primarily intended for numerical
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	657 computations. It provides a convenient interactive command line
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	658 interface for solving linear and nonlinear problems numerically, and
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	659 for performing other numerical experiments. It may also be used as a
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	660 batch-oriented language for data processing.
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	661
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	662 GNU Octave is free software. You may redistribute it and/or modify it
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	663 under the terms of the <a href="http://www.gnu.org/licenses/">GNU
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	664 General Public License</a> as published by the Free Software Foundation.
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	665
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	666 This is the developer documentation for Octave's own source code. It is
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	667 intended to help for hacking Octave. It may also be useful for
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	668 understanding the Octave API when writing your own .oct files.
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: diff changeset	669 */

Mercurial > hg > octave-nkf

annotate src/main.in.cc @ 18549:16b0cd465ecd