X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fcommand-line.c;h=9eb23d5319f8a021aee53d71d189ff005553efab;hb=d52355bcda20563736bd83aed3ab58e534672cb5;hp=54e4a7c2d90c51ce58bddbd7644275b90e4b65a3;hpb=f5574c6264163859a8eb94ab1e33bcc1b61fce5f;p=pspp

diff --git a/src/ui/terminal/command-line.c b/src/ui/terminal/command-line.c
index 54e4a7c2d9..9eb23d5319 100644
--- a/src/ui/terminal/command-line.c
+++ b/src/ui/terminal/command-line.c
@@ -1,21 +1,18 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
    Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
-   Written by Ben Pfaff <blp@gnu.org>.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 #include "command-line.h"
@@ -30,15 +27,16 @@
 #include <libpspp/assertion.h>
 #include <libpspp/copyleft.h>
 #include <libpspp/message.h>
-#include <language/line-buffer.h>
+#include <language/syntax-file.h>
 #include "progname.h"
 #include <data/settings.h>
-#include "read-line.h"
 #include <output/output.h>
 #include <data/file-name.h>
+#include <libpspp/getl.h>
 #include <libpspp/str.h>
 #include <libpspp/version.h>
 #include <libpspp/verbose-msg.h>
+#include "read-line.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -49,11 +47,12 @@ static void usage (void);
 
 char *subst_vars (char *);
 
+
 /* Parses the command line specified by ARGC and ARGV as received by
    main().  Returns true if normal execution should proceed,
    false if the command-line indicates that PSPP should exit. */
 bool
-parse_command_line (int argc, char **argv)
+parse_command_line (int argc, char **argv, struct source_stream *ss)
 {
   static struct option long_options[] =
   {
@@ -110,7 +109,7 @@ parse_command_line (int argc, char **argv)
 	    }
 	  break;
 
-	case 'x':	  
+	case 'x':
 	  if ( 0 == strcmp(optarg,"compatible") )
 	    set_syntax(COMPATIBLE);
 	  else if ( 0 == strcmp(optarg,"enhanced"))
@@ -139,9 +138,9 @@ parse_command_line (int argc, char **argv)
 	  break;
 	case 'I':
 	  if (optarg == NULL || !strcmp (optarg, "-"))
-	    getl_clear_include_path ();
+	    getl_clear_include_path (ss);
 	  else
-	    getl_add_include_dir (optarg);
+	    getl_add_include_dir (ss, optarg);
 	  break;
 	case 'l':
 	  outp_list_classes ();
@@ -191,25 +190,26 @@ parse_command_line (int argc, char **argv)
 
   if (process_statrc)
     {
-      char *pspprc_fn = fn_search_path ("rc", config_path, NULL);
-      if (pspprc_fn != NULL) 
+      char *pspprc_fn = fn_search_path ("rc", config_path);
+      if (pspprc_fn != NULL)
         {
-          getl_append_syntax_file (pspprc_fn);
-          free (pspprc_fn); 
+	  getl_append_source (ss, create_syntax_file_source (pspprc_fn));
+
+          free (pspprc_fn);
         }
     }
 
   for (i = optind; i < argc; i++)
     if (strchr (argv[i], '='))
       outp_configure_macro (argv[i]);
-    else 
+    else
       {
-        getl_append_syntax_file (argv[i]);
+	getl_append_source (ss, create_syntax_file_source (argv[i]));
         syntax_files++;
       }
 
   if (!syntax_files || interactive_mode)
-    getl_append_interactive (readln_read);
+    getl_append_source (ss, create_readln_source () );
 
   return true;
 }
@@ -229,11 +229,11 @@ N_("PSPP, a program for statistical analysis of sample data.\n"
 "\nInput and output:\n"
 "  -e, --error-file=FILE     send error messages to FILE (appended)\n"
 "  -f, --out-file=FILE       send output to FILE (overwritten)\n"
-"  -p, --pipe                read script from stdin, send output to stdout\n"
+"  -p, --pipe                read syntax from stdin, send output to stdout\n"
 "  -I-, --no-include         clear include path\n"
 "  -I, --include=DIR         append DIR to include path\n"
 "\nLanguage modifiers:\n"
-"  -i, --interactive         interpret scripts in interactive mode\n"
+"  -i, --interactive         interpret syntax in interactive mode\n"
 "  -n, --edit                just check syntax; don't actually run the code\n"
 "  -r, --no-statrc           disable execution of .pspp/rc at startup\n"
 "  -s, --safer               don't allow some unsafe operations\n"