X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fread-line.c;h=7b23f38d2f359b58ecec1635970904d732edad5c;hb=b5b474193e450bba97610065df0518c08074a7fb;hp=c6279ce9c4bd6514ee797ed034d498bcdfdd671b;hpb=458d169f64134f4e0a9d9b72398666a01761fcf8;p=pspp-builds.git

diff --git a/src/ui/terminal/read-line.c b/src/ui/terminal/read-line.c
index c6279ce9..7b23f38d 100644
--- a/src/ui/terminal/read-line.c
+++ b/src/ui/terminal/read-line.c
@@ -22,6 +22,9 @@
 #include <stdbool.h>
 #include <assert.h>
 #include <errno.h>
+#if ! HAVE_READLINE
+#include <stdint.h>
+#endif
 
 #include "msg-ui.h"
 
@@ -32,7 +35,9 @@
 #include <libpspp/str.h>
 #include <libpspp/version.h>
 #include <language/prompt.h>
+#include <output/journal.h>
 #include <output/manager.h>
+#include <ui/terminal/terminal.h>
 
 #include "xalloc.h"
 
@@ -90,7 +95,7 @@ readln_uninitialize (void)
   initialised = false;
 
 #if HAVE_READLINE
-  if (history_file != NULL && false == get_testing_mode() )
+  if (history_file != NULL && false == settings_get_testing_mode () )
     write_history (history_file);
   clear_history ();
   free (history_file);
@@ -100,12 +105,11 @@ readln_uninitialize (void)
 
 static bool
 read_interactive (struct getl_interface *s,
-                  struct string *line, enum getl_syntax *syntax)
+                  struct string *line)
 {
   struct readln_source *is  =
     (struct readln_source *) s ;
 
-  *syntax = GETL_INTERACTIVE;
   return is->interactive_func (line, prompt_get_style ());
 }
 
@@ -129,6 +133,7 @@ welcome (void)
 	 "warranty.\" for details.\n", stdout);
   puts (stat_version);
   readln_initialize ();
+  journal_enable ();
 }
 
 /* Gets a line from the user and stores it into LINE.
@@ -142,6 +147,7 @@ readln_read (struct string *line, enum prompt_style style)
 #if HAVE_READLINE
   char *string;
 #endif
+  bool eof;
 
   assert (initialised);
 
@@ -158,28 +164,38 @@ readln_read (struct string *line, enum prompt_style style)
                                       : dont_complete);
   string = readline (prompt);
   if (string == NULL)
-    return false;
+    eof = true;
   else
     {
       if (string[0])
         add_history (string);
       ds_assign_cstr (line, string);
       free (string);
-      return true;
+      eof = false;
     }
 #else
   fputs (prompt, stdout);
   fflush (stdout);
-  if (ds_read_line (line, stdin))
+  if (ds_read_line (line, stdin, SIZE_MAX))
     {
       ds_chomp (line, '\n');
-      return true;
+      eof = false;
     }
   else
-    return false;
+    eof = true;
 #endif
-}
 
+  /* Check whether the size of the window has changed, so that
+     the output drivers can adjust their settings as needed.  We
+     only do this for the first line of a command, as it's
+     possible that the output drivers are actually in use
+     afterward, and we don't want to confuse them in the middle
+     of output. */
+  if (style == PROMPT_FIRST)
+    terminal_check_size ();
+
+  return !eof;
+}
 
 static void
 readln_close (struct getl_interface *i)