octave-lyh: src/octave.cc comparison

comparison src/octave.cc @ 2926:66ef74ee5d9f

[project @ 1997-05-05 03:20:52 by jwe]

author	jwe
date	Mon, 05 May 1997 03:40:21 +0000
parents	1da1af95082e
children	20f5cec4f11c

comparison

equal deleted inserted replaced

-:f0665dac8e33
+:66ef74ee5d9f
 #include <sys/types.h>
 #endif
 #include <unistd.h>
 #endif
-#ifdef HAVE_PWD_H
+#include "cmd-edit.h"
-#include <pwd.h>
+#include "file-stat.h"
-#endif
 #include "lo-error.h"
+#include "oct-env.h"
 #include "str-vec.h"
 #include <defaults.h>
 #include "defun.h"
 #include "dynamic-ld.h"
 #include "error.h"
 #include "file-io.h"
-#include "file-ops.h"
 #include "help.h"
 #include "input.h"
 #include "lex.h"
 #include "oct-hist.h"
 #include "ops.h"
 extern char *program_invocation_name;
 extern char *program_invocation_short_name;
 #else
 char *program_invocation_name;
 char *program_invocation_short_name;
-#endif
-#if defined (USE_READLINE)
-// This is from readline's paren.c:
-extern int rl_blink_matching_paren;
 #endif
 // The command-line options.
 static string_vector octave_argv;
 // 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);
 }
 bind_builtin_variable ("nargin", static_cast<double> (argc-1), 1, 1, 0);
 }
-// Initialize some global variables for later use.
-static void
-initialize_globals (const string& name)
-{
-// Kpathsea needs this.
-#if ! defined (HAVE_PROGRAM_INVOCATION_NAME)
-program_invocation_name = strsave (name.c_str ());
-program_invocation_short_name = strrchr (program_invocation_name, '/');
-if (! program_invocation_short_name)
-program_invocation_short_name = program_invocation_name;
-#endif
-Vprogram_invocation_name = name;
-size_t pos = Vprogram_invocation_name.rfind ('/');
-Vprogram_name = (pos == NPOS)
-? Vprogram_invocation_name : Vprogram_invocation_name.substr (pos+1);
-struct passwd *entry = getpwuid (getuid ());
-Vuser_name = entry ? entry->pw_name : "I have no name!";
-char hostname[256];
-int status = gethostname (hostname, 255);
-Vhost_name = (status < 0) ? "I have no host!" : hostname;
-char *hd = getenv ("HOME");
-Vhome_directory = hd ? hd : "I have no home!";
-install_defaults ();
-}
 static void
 initialize_pathsearch (void)
 {
 // This may seem odd, but doing it this way means that we don't have
 // to modify the kpathsea library...
-char *odb = getenv ("OCTAVE_DB_DIR");
+string odb = octave_env::getenv ("OCTAVE_DB_DIR");
-if (odb)
+if (odb.empty ())
-oct_putenv ("TEXMF", odb);
+{
+string oh = octave_env::getenv ("OCTAVE_HOME");
+if (oh.empty ())
+	octave_env::putenv ("TEXMF", OCTAVE_DATADIR "/octave");
+else
+	{
+	  oh.append ("/lib/octave");
+	  octave_env::putenv ("TEXMF", oh);
+	}
+}
 else
-{
+octave_env::putenv ("TEXMF", odb);
-char *oh = getenv ("OCTAVE_HOME");
-if (oh)
-	{
-	  int len = strlen (oh) + 12;
-	  char *putenv_val = new char [len];
-	  sprintf (putenv_val, "%s/lib/octave", oh);
-	  oct_putenv ("TEXMF", putenv_val);
-	}
-else
-	oct_putenv ("TEXMF", OCTAVE_DATADIR "/octave");
-}
 }
 // Initialize by reading startup files.
 static void
 // $OCTAVE_INITFILE.  If $OCTAVE_INITFILE is not set, .octaverc
 // is assumed.
 int home_rc_already_executed = 0;
-const char *initfile = getenv ("OCTAVE_INITFILE");
+string initfile = octave_env::getenv ("OCTAVE_INITFILE");
-if (! initfile)
+if (initfile.empty ())
 	initfile = ".octaverc";
-string home_rc = Vhome_directory + "/" + initfile;
+string home_dir = octave_env::get_home_directory ();
+string home_rc = home_dir + "/" + initfile;
 string local_rc = string ("./") + initfile;
-if (! Vhome_directory.empty ())
+if (! home_dir.empty ())
 	{
 	  parse_and_execute (home_rc, verbose);
 	  // Names alone are not enough.
 int
 main (int argc, char **argv)
 {
 // The order of these calls is important.  The call to
-// initialize_globals must come before install_builtins because
+// install_defaults must come before install_builtins because
 // default variable values must be available for the varaibles 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 ();
 initialize_error_handlers ();
-initialize_globals (argv[0]);
+install_defaults ();
 initialize_pathsearch ();
 install_signal_handlers ();
 	case NO_INIT_FILE_OPTION:
 	  read_init_files = false;
 	  break;
 	case NO_LINE_EDITING_OPTION:
-	  using_readline = false;
+	  line_editing = 0;
 	  break;
 	case NO_SITE_FILE_OPTION:
 	  read_site_files = 0;
 	  break;
 #endif
 // These can come after command line args since none of them set any
 // defaults that might be changed by command line options.
-initialize_readline ();
+initialize_command_input ();
 if (! inhibit_startup_message)
 cout << OCTAVE_STARTUP_MESSAGE "\n" << endl;
 if (traditional)
 maximum_braindamage ();
 execute_startup_files ();
-octave_command_history.read (false);
+command_history::read (false);
 if (! inhibit_startup_message && reading_startup_message_printed)
 cout << endl;
 // Avoid counting commands executed from startup files.
-current_command_number = 1;
+command_editor::reset_current_command_number (1);
 // 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.
 	  bind_builtin_variable ("program_name", tmp);
 	  intern_argv (remaining_args, argv+last_arg_idx);
-	  rl_blink_matching_paren = 0;
+	  command_editor::blink_matching_paren (false);
 	  switch_to_buffer (create_buffer (infile));
 	}
 else
 	clean_up_and_exit (1);
 }
 // Force input to be echoed if not really interactive, but the user
 // has forced interactive behavior.
 if (! interactive && forced_interactive)
 {
-rl_blink_matching_paren = 0;
+command_editor::blink_matching_paren (false);
 // XXX FIXME XXX -- is this the right thing to do?
 bind_builtin_variable ("echo_executing_commands",
 			     static_cast<double> (ECHO_CMD_LINE));
 }
 if (! interactive)
-using_readline = 0;
+line_editing = 0;
 int retval = main_loop ();
 if (retval == 1 && ! error_state)
 retval = 0;

Mercurial > hg > octave-lyh

comparison src/octave.cc @ 2926:66ef74ee5d9f