octave: src/octave.cc comparison

comparison src/octave.cc @ 3019:92aa3d651723

[project @ 1997-06-03 22:07:16 by jwe]

author	jwe
date	Tue, 03 Jun 1997 22:10:41 +0000
parents	38de16594cb4
children	95e8b5c4824a

comparison

equal deleted inserted replaced

-:5708b8bb4f06
+:92aa3d651723
 #include "cmd-edit.h"
 #include "file-stat.h"
 #include "lo-error.h"
 #include "oct-env.h"
+#include "pathsearch.h"
 #include "str-vec.h"
 #include <defaults.h>
 #include "defun.h"
 #include "dynamic-ld.h"
 #include "lex.h"
 #include "oct-hist.h"
 #include "ops.h"
 #include "toplev.h"
 #include "parse.h"
-#include "pathsearch.h"
 #include "pt-plot.h"
 #include "procstream.h"
 #include "prog-args.h"
 #include "sighandlers.h"
 #include "sysdep.h"
 #if !defined (HAVE_ATEXIT) && defined (HAVE_ON_EXIT)
 extern "C" int on_exit ();
 #define atexit on_exit
 #endif
-// Don't redefine the variables if glibc already has.
-#if defined (HAVE_PROGRAM_INVOCATION_NAME) || defined (WITH_KPATHSEARCH)
-extern char *program_invocation_name;
-extern char *program_invocation_short_name;
-#else
-char *program_invocation_name;
-char *program_invocation_short_name;
-#endif
 // The command-line options.
 static string_vector octave_argv;
 // TRUE means we read ~/.octaverc and ./.octaverc.
 // (--norc; --no-init-file; -f)
 // TRUE means we read the site-wide octaverc files.
 // (--norc; --no-site-file; -f)
 static bool read_site_files = true;
-// Nonzero means we don't print the usual startup message.
+// TRUE means we don't print the usual startup message.
 // (--quiet; --silent; -q)
 static bool inhibit_startup_message = false;
-// Nonzero means we turn on compatibility options.
+// TRUE means we turn on compatibility options.
 // (--traditional)
 static bool traditional = false;
-// If nonzero, print verbose info in some cases.
+// If TRUE, print verbose info in some cases.
 // (--verbose; -V)
 static bool verbose_flag = false;
 // Usage message
 static const char *usage_string =
 { "quiet",            prog_args::no_arg,       0, 'q' },
 { "silent",           prog_args::no_arg,       0, 'q' },
 { "traditional",      prog_args::no_arg,       0, TRADITIONAL_OPTION },
 { "verbose",          prog_args::no_arg,       0, 'V' },
 { "version",          prog_args::no_arg,       0, 'v' },
-{ 0,                  0,                 0, 0 }
+{ 0,                  0,                       0, 0 }
 };
 // Store the command-line options for later use.
 static void
 intern_argv (int argc, char **argv)
 {
-octave_env::set_program_name (argv[0]);
-// XXX FIXME XXX -- Kpathsea needs this.
-#if ! defined (HAVE_PROGRAM_INVOCATION_NAME)
-program_invocation_name
-= strsave (octave_env::get_program_invocation_name () . c_str ());
-program_invocation_short_name
-= strsave (octave_env::get_program_name () . c_str ());
-#endif
 if (argc > 1)
 {
 // Skip program name in argv.
 octave_argv = string_vector (argv+1, argc-1);
 unwind_protect::begin_frame ("execute_startup_files");
 // XXX FIXME XXX -- need to make it possible to set this in startup
 // files.
-unwind_protect_int (input_from_startup_file);
+unwind_protect_bool (input_from_startup_file);
-input_from_startup_file = 1;
+input_from_startup_file = true;
 int verbose = (verbose_flag && ! inhibit_startup_message);
 if (read_site_files)
 {
 // You guessed it.
 int
 main (int argc, char **argv)
 {
+octave_env::set_program_name (argv[0]);
 // The order of these calls is important.  The call to
 // install_defaults must come before install_builtins because
-// default variable values must be available for the varaibles to be
+// default variable values must be available for the variables to be
 // installed, and the call to install_builtins must come before the
 // options are processed because some command line options override
 // defaults by calling bind_builtin_variable.
 sysdep_init ();
 	case '?':
 	  verbose_usage ();
 	  break;
 	case 'i':
-	  forced_interactive = 1;
+	  forced_interactive = true;
 	  break;
 	case 'p':
 	  if (args.optarg ())
 	    bind_builtin_variable ("LOADPATH", args.optarg ());
 	case NO_INIT_FILE_OPTION:
 	  read_init_files = false;
 	  break;
 	case NO_LINE_EDITING_OPTION:
-	  line_editing = 0;
+	  line_editing = false;
 	  break;
 	case NO_SITE_FILE_OPTION:
 	  read_site_files = 0;
 	  break;
 // If there is an extra argument, see if it names a file to read.
 // Additional arguments are taken as command line options for the
 // script.
 int last_arg_idx = args.optind ();
 int remaining_args = argc - last_arg_idx;
 if (remaining_args > 0)
 {
-reading_script_file = 1;
+reading_script_file = true;
 curr_fcn_file_name = argv[last_arg_idx];
 curr_fcn_file_full_name = curr_fcn_file_name;
 FILE *infile = get_input_from_file (curr_fcn_file_name);
 if (infile)
 	{
-	  input_from_command_line_file = 1;
+	  input_from_command_line_file = true;
 	  bind_builtin_variable ("program_invocation_name",
 				 curr_fcn_file_name);
 	  size_t pos = curr_fcn_file_name.rfind ('/');
 bind_builtin_variable ("echo_executing_commands",
 			     static_cast<double> (ECHO_CMD_LINE));
 }
 if (! interactive)
-line_editing = 0;
+line_editing = false;
 int retval = main_loop ();
 if (retval == 1 && ! error_state)
 retval = 0;

Mercurial > octave

comparison src/octave.cc @ 3019:92aa3d651723