From: Ben Pfaff <blp@gnu.org>
Date: Tue, 25 Sep 2007 04:26:25 +0000 (+0000)
Subject: Patch #6210.  Reviewed by John Darrington.
X-Git-Tag: sav-api~1254
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3357ef01ec46f9612a71d1c14d53625467644cfe;p=pspp

Patch #6210.  Reviewed by John Darrington.

* command-line.c (parse_command_line): Don't call force_long_view,
as that function is no longer necessary.

* msg-ui.c (handle_msg): Only wrap message output to the message
file to the width of the terminal if the message file is a tty.

* settings.c: Drop "long view", which is not needed any longer.
(static var long_view): Removed.
(force_long_view): Removed.
(get_viewwidth): Removed.
(init_viewport): Removed long_view reference.
---

diff --git a/src/data/ChangeLog b/src/data/ChangeLog
index 51568e785c..d50a95da42 100644
--- a/src/data/ChangeLog
+++ b/src/data/ChangeLog
@@ -1,3 +1,12 @@
+2007-09-24  Ben Pfaff  <blp@gnu.org>
+
+	Patch #6210.  Reviewed by John Darrington.
+	* settings.c: Drop "long view", which is not needed any longer.
+	(static var long_view): Removed.
+	(force_long_view): Removed.
+	(get_viewwidth): Removed.
+	(init_viewport): Removed long_view reference.
+
 2007-09-19  John Darrington <john@darrington.wattle.id.au>
 	
 	* settings.c settings.h: Changed viewport's length and width to be 
diff --git a/src/data/settings.c b/src/data/settings.c
index 095a931854..4d0ef3eb03 100644
--- a/src/data/settings.c
+++ b/src/data/settings.c
@@ -31,7 +31,6 @@
 
 static int *viewlength = NULL;
 static int *viewwidth = NULL;
-static bool long_view = false;
 
 static bool safer_mode = false;
 
@@ -103,21 +102,10 @@ set_viewlength (int viewlength_)
   *viewlength = viewlength_;
 }
 
-/* Set view width to a very long value, and prevent it from ever
-   changing. */
-void
-force_long_view (void)
-{
-  long_view = true;
-}
-
 /* Screen width. */
 int
 get_viewwidth(void)
 {
-  if (long_view)
-    return 9999;
-
   return *viewwidth;
 }
 
@@ -133,10 +121,6 @@ init_viewport (int  *width, int *length)
 {
   viewwidth = width;
   viewlength = length;
-
-  if (long_view)
-    return;
-
 }
 
 /* Whether PSPP can erase and overwrite files. */
diff --git a/src/data/settings.h b/src/data/settings.h
index 63e3d1fe7e..9ef278fc50 100644
--- a/src/data/settings.h
+++ b/src/data/settings.h
@@ -23,7 +23,6 @@
 void settings_init (int *, int *);
 void settings_done (void);
 
-void force_long_view (void);
 int get_viewlength (void);
 void set_viewlength (int);
 
diff --git a/src/ui/terminal/ChangeLog b/src/ui/terminal/ChangeLog
index 59c9491853..1e96e790b9 100644
--- a/src/ui/terminal/ChangeLog
+++ b/src/ui/terminal/ChangeLog
@@ -1,8 +1,14 @@
 2007-09-24  Ben Pfaff  <blp@gnu.org>
 
+	Patch #6210.  Reviewed by John Darrington.
 	* main.c (set_fallback_viewport): Make code easier to understand.
 	(get_termcap_viewport): Ditto.
-	Reviewed by John Darrington.
+
+	* command-line.c (parse_command_line): Don't call force_long_view,
+	as that function is no longer necessary.
+
+	* msg-ui.c (handle_msg): Only wrap message output to the message
+	file to the width of the terminal if the message file is a tty.
 
 2007-09-19  John Darrington <john@darrington.wattle.id.au>
 
diff --git a/src/ui/terminal/command-line.c b/src/ui/terminal/command-line.c
index 1205d4d5a4..976af0c219 100644
--- a/src/ui/terminal/command-line.c
+++ b/src/ui/terminal/command-line.c
@@ -171,7 +171,6 @@ parse_command_line (int argc, char **argv, struct source_stream *ss)
 	  puts (legal);
 	  return false;
         case 'T':
-          force_long_view ();
           set_testing_mode (true);
           break;
 	case '?':
diff --git a/src/ui/terminal/msg-ui.c b/src/ui/terminal/msg-ui.c
index 173f60a7fa..98f99c1c71 100644
--- a/src/ui/terminal/msg-ui.c
+++ b/src/ui/terminal/msg-ui.c
@@ -32,6 +32,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -175,7 +176,8 @@ handle_msg (const struct msg *m)
   ds_put_cstr (&string, m->text);
 
   if (msg_file != stdout || get_error_routing_to_terminal ())
-    dump_message (ds_cstr (&string), get_viewwidth (), 8,
+    dump_message (ds_cstr (&string),
+                  isatty (fileno (msg_file)) ? get_viewwidth () : INT_MAX, 8,
                   write_stream, msg_file);
 
   dump_message (ds_cstr (&string), 78, 0, write_journal, NULL);