X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fread-line.c;h=e361832680964e41d413970be213ba24071241a8;hb=d52355bcda20563736bd83aed3ab58e534672cb5;hp=97427c6c1a59754a1f5ce20cfa31596566b8cb5c;hpb=2d4dd90964061defa92972156ae2a12323708519;p=pspp-builds.git

diff --git a/src/ui/terminal/read-line.c b/src/ui/terminal/read-line.c
index 97427c6c..e3618326 100644
--- a/src/ui/terminal/read-line.c
+++ b/src/ui/terminal/read-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>
 
@@ -52,7 +49,7 @@ static char **dont_complete (const char *, int, int);
 #endif /* HAVE_READLINE */
 
 
-struct readln_source 
+struct readln_source
 {
   struct getl_interface parent ;
 
@@ -71,16 +68,18 @@ readln_initialize (void)
 
 #if HAVE_READLINE
   rl_basic_word_break_characters = "\n";
-#ifdef unix
+  using_history ();
+  stifle_history (500);
   if (history_file == NULL)
     {
-      history_file = tilde_expand ("~/.pspp_history");
-      using_history ();
-      read_history (history_file);
-      stifle_history (500);
+      const char *home_dir = getenv ("HOME");
+      if (home_dir != NULL)
+        {
+          history_file = xasprintf ("%s/.pspp_history", home_dir);
+          read_history (history_file);
+        }
     }
 #endif
-#endif
 }
 
 /* Close getl. */
@@ -89,7 +88,7 @@ readln_uninitialize (void)
 {
   initialised = false;
 
-#if HAVE_READLINE && unix
+#if HAVE_READLINE
   if (history_file != NULL && false == get_testing_mode() )
     write_history (history_file);
   clear_history ();
@@ -99,11 +98,13 @@ readln_uninitialize (void)
 
 
 static bool
-read_interactive (struct getl_interface *s, struct string *line)
+read_interactive (struct getl_interface *s,
+                  struct string *line, enum getl_syntax *syntax)
 {
   struct readln_source *is  =
     (struct readln_source *) s ;
 
+  *syntax = GETL_INTERACTIVE;
   return is->interactive_func (line, prompt_get_style ());
 }
 
@@ -126,23 +127,9 @@ welcome (void)
 	 "conditions.\nThere is ABSOLUTELY NO WARRANTY for PSPP; type \"show "
 	 "warranty.\" for details.\n", stdout);
   puts (stat_version);
-
-#if HAVE_READLINE && unix
-  if (history_file == NULL)
-    {
-      history_file = tilde_expand ("~/.pspp_history");
-      using_history ();
-      read_history (history_file);
-      stifle_history (500);
-    }
-#endif
+  readln_initialize ();
 }
 
-
-
-
-
-
 /* Gets a line from the user and stores it into LINE.
    Prompts the user with PROMPT.
    Returns true if successful, false at end of file.
@@ -154,7 +141,7 @@ readln_read (struct string *line, enum prompt_style style)
 #if HAVE_READLINE
   char *string;
 #endif
-  
+
   assert (initialised);
 
   reset_msg_count ();
@@ -168,18 +155,18 @@ readln_read (struct string *line, enum prompt_style style)
   string = readline (prompt);
   if (string == NULL)
     return false;
-  else 
+  else
     {
       if (string[0])
         add_history (string);
       ds_assign_cstr (line, string);
       free (string);
-      return true; 
+      return true;
     }
 #else
   fputs (prompt, stdout);
   fflush (stdout);
-  if (ds_read_line (line, stdin)) 
+  if (ds_read_line (line, stdin))
     {
       ds_chomp (line, '\n');
       return true;
@@ -221,16 +208,16 @@ static char *command_generator (const char *text, int state);
 static char **
 complete_command_name (const char *text, int start, int end UNUSED)
 {
-  if (start == 0) 
+  if (start == 0)
     {
       /* Complete command name at start of line. */
-      return rl_completion_matches (text, command_generator); 
+      return rl_completion_matches (text, command_generator);
     }
-  else 
+  else
     {
       /* Otherwise don't do any completion. */
       rl_attempted_completion_over = 1;
-      return NULL; 
+      return NULL;
     }
 }
 
@@ -239,15 +226,15 @@ static char **
 dont_complete (const char *text UNUSED, int start UNUSED, int end UNUSED)
 {
   rl_attempted_completion_over = 1;
-  return NULL; 
+  return NULL;
 }
 
 /* If STATE is 0, returns the first command name matching TEXT.
    Otherwise, returns the next command name matching TEXT.
    Returns a null pointer when no matches are left. */
 static char *
-command_generator (const char *text, int state) 
-{ 
+command_generator (const char *text, int state)
+{
   static const struct command *cmd;
   const char *name;