Delete trailing whitespace at end of lines.

[pspp-builds.git] / src / ui / terminal / read-line.c

diff --git a/src/ui/terminal/read-line.c b/src/ui/terminal/read-line.c
index 08f9362355d7ddb8df9d81d807949d592ebfe975..72171ae785d964b7a2cf9146886a844e4e4a06f4 100644 (file)
--- a/src/ui/terminal/read-line.c
+++ b/src/ui/terminal/read-line.c
@@ -1,6 +1,5 @@
 /* PSPP - computes sample statistics.
    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
@@ -28,14 +27,13 @@
 
 #include "msg-ui.h"
 
-#include <data/file-name.h>
 #include <data/file-name.h>
 #include <data/settings.h>
 #include <language/command.h>
 #include <libpspp/message.h>
 #include <libpspp/str.h>
 #include <libpspp/version.h>
-#include <output/table.h>
+#include <language/prompt.h>
 
 #include "xalloc.h"
 
@@ -52,6 +50,16 @@ static char **complete_command_name (const char *, int, int);
 static char **dont_complete (const char *, int, int);
 #endif /* HAVE_READLINE */
 
+
+struct readln_source
+{
+  struct getl_interface parent ;
+
+  bool (*interactive_func) (struct string *line,
+                           enum prompt_style) ;
+};
+
+
 static bool initialised = false;
 
 /* Initialize getl. */
@@ -62,16 +70,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. */
@@ -80,12 +90,32 @@ readln_uninitialize (void)
 {
   initialised = false;
 
-#if HAVE_READLINE && unix
-  if (history_file != NULL)
+#if HAVE_READLINE
+  if (history_file != NULL && false == get_testing_mode() )
     write_history (history_file);
+  clear_history ();
+  free (history_file);
 #endif
 }
 
+
+static bool
+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 ());
+}
+
+static bool
+always_true (const struct getl_interface *s UNUSED)
+{
+  return true;
+}
+
 /* Display a welcoming message. */
 static void
 welcome (void)
@@ -99,30 +129,21 @@ 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.
-   Suitable for passing to getl_append_interactive(). */
-bool
-readln_read (struct string *line, enum getl_prompt_style style)
+   */
+static bool
+readln_read (struct string *line, enum prompt_style style)
 {
-  const char *prompt = getl_get_prompt (style);
+  const char *prompt = prompt_get (style);
 #if HAVE_READLINE
   char *string;
 #endif
-  
+
   assert (initialised);
 
   reset_msg_count ();
@@ -130,24 +151,24 @@ readln_read (struct string *line, enum getl_prompt_style style)
   welcome ();
 
 #if HAVE_READLINE
-  rl_attempted_completion_function = (style == GETL_PROMPT_FIRST
+  rl_attempted_completion_function = (style == PROMPT_FIRST
                                       ? complete_command_name
                                       : dont_complete);
   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;
@@ -157,7 +178,30 @@ readln_read (struct string *line, enum getl_prompt_style style)
 #endif
 }
 
-#ifdef HAVE_READLINE
+
+static void
+readln_close (struct getl_interface *i)
+{
+  free (i);
+}
+
+/* Creates a source which uses readln to get its line */
+struct getl_interface *
+create_readln_source (void)
+{
+  struct readln_source *rlns  = xzalloc (sizeof (*rlns));
+
+  rlns->interactive_func = readln_read;
+
+  rlns->parent.interactive = always_true;
+  rlns->parent.read = read_interactive;
+  rlns->parent.close = readln_close;
+
+  return (struct getl_interface *) rlns;
+}
+
+
+#if HAVE_READLINE
 static char *command_generator (const char *text, int state);
 
 /* Returns a set of command name completions for TEXT.
@@ -166,16 +210,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;
     }
 }
 
@@ -184,15 +228,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;