X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fmain.c;h=7e9d4ee51a8960f2d52cb365076888e2eeca715e;hb=9ade26c8349b4434008c46cf09bc7473ec743972;hp=a5e054f02d527d21020257f015eebea1b2b0b2a3;hpb=9df711bda03419b3a68e22b43d7b32f2963617a2;p=pspp-builds.git

diff --git a/src/ui/gui/main.c b/src/ui/gui/main.c
index a5e054f0..7e9d4ee5 100644
--- a/src/ui/gui/main.c
+++ b/src/ui/gui/main.c
@@ -21,12 +21,14 @@
 #include <gtk/gtk.h>
 #include <stdlib.h>
 
+#include "language/lexer/include-path.h"
 #include "libpspp/argv-parser.h"
 #include "libpspp/assertion.h"
-#include "libpspp/getl.h"
-#include "libpspp/version.h"
+#include "libpspp/cast.h"
 #include "libpspp/copyleft.h"
 #include "libpspp/str.h"
+#include "libpspp/string-array.h"
+#include "libpspp/version.h"
 #include "ui/source-init-opts.h"
 
 #include "gl/configmake.h"
@@ -57,28 +59,10 @@ static const struct argv_option startup_options[N_STARTUP_OPTIONS] =
     {"no-splash", 'q', no_argument, OPT_NO_SPLASH}
   };
 
-static char *
-get_default_include_path (void)
-{
-  struct source_stream *ss;
-  struct string dst;
-  char **path;
-  size_t i;
-
-  ss = create_source_stream ();
-  path = getl_include_path (ss);
-  ds_init_empty (&dst);
-  for (i = 0; path[i] != NULL; i++)
-    ds_put_format (&dst, " %s", path[i]);
-  destroy_source_stream (ss);
-
-  return ds_steal_cstr (&dst);
-}
-
 static void
 usage (void)
 {
-  char *default_include_path = get_default_include_path ();
+  char *inc_path = string_array_join (include_path_default (), " ");
   GOptionGroup *gtk_options;
   GOptionContext *ctx;
   gchar *gtk_help_base, *gtk_help;
@@ -115,16 +99,16 @@ Language options:\n\
                             set to `compatible' to disable PSPP extensions\n\
   -i, --interactive         interpret syntax in interactive mode\n\
   -s, --safer               don't allow some unsafe operations\n\
-Default search path:%s\n\
+Default search path: %s\n\
 \n\
 Informative output:\n\
   -h, --help                display this help and exit\n\
   -V, --version             output version information and exit\n\
 \n\
 A non-option argument is interpreted as a .sav or .por file to load.\n"),
-          program_name, gtk_help, default_include_path);
+          program_name, gtk_help, inc_path);
 
-  free (default_include_path);
+  free (inc_path);
   g_free (gtk_help_base);
 
   emit_bug_reporting_address ();
@@ -145,7 +129,7 @@ startup_option_callback (int id, void *show_splash_)
     case OPT_VERSION:
       version_etc (stdout, "psppire", PACKAGE_NAME, PACKAGE_VERSION,
                    "Ben Pfaff", "John Darrington", "Jason Stover",
-                   (char *) NULL);
+                   NULL_SENTINEL);
       exit (EXIT_SUCCESS);
 
     case OPT_NO_SPLASH:
@@ -201,7 +185,6 @@ quit_one_loop (gpointer data)
 
 struct initialisation_parameters
 {
-  struct source_stream *ss;
   const char *data_file;
   GtkWidget *splash_window;
 };
@@ -211,7 +194,7 @@ static gboolean
 run_inner_loop (gpointer data)
 {
   struct initialisation_parameters *ip = data;
-  initialize (ip->ss, ip->data_file);
+  initialize (ip->data_file);
 
   g_timeout_add (500, hide_splash_window, ip->splash_window);
 
@@ -239,7 +222,6 @@ main (int argc, char *argv[])
   struct initialisation_parameters init_p;
   gboolean show_splash = TRUE;
   struct argv_parser *parser;
-  struct source_stream *ss;
   const gchar *vers;
 
   set_program_name (argv[0]);
@@ -263,7 +245,6 @@ main (int argc, char *argv[])
     }
 
 
-  ss = create_source_stream ();
   /* Parse our own options. 
      This must come BEFORE gdk_init otherwise options such as 
      --help --version which ought to work without an X server, won't.
@@ -271,7 +252,7 @@ main (int argc, char *argv[])
   parser = argv_parser_create ();
   argv_parser_add_options (parser, startup_options, N_STARTUP_OPTIONS,
                            startup_option_callback, &show_splash);
-  source_init_register_argv_parser (parser, ss);
+  source_init_register_argv_parser (parser);
   if (!argv_parser_run (parser, argc, argv))
     exit (EXIT_FAILURE);
   argv_parser_destroy (parser);
@@ -282,7 +263,6 @@ main (int argc, char *argv[])
   gdk_init (&argc, &argv);
 
   init_p.splash_window = create_splash_window ();
-  init_p.ss = ss;
   init_p.data_file = optind < argc ? argv[optind] : NULL;
 
   if ( show_splash )