X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fmain.c;h=94b21a55742855a05974afae7d0c41d0cf30c392;hb=8f40c87f9db239685a174ffc526cb91f0c76ee97;hp=10b3b7e9abc9e92027ccfb8504b4acd6dbac5ed7;hpb=f51ecb48027e6b1eb46840ae25888a25b429f012;p=pspp

diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c
index 10b3b7e9ab..94b21a5574 100644
--- a/src/ui/terminal/main.c
+++ b/src/ui/terminal/main.c
@@ -79,7 +79,6 @@ static struct source_stream *the_source_stream ;
 int
 main (int argc, char **argv)
 {
-  int *view_width_p, *view_length_p;
   struct terminal_opts *terminal_opts;
   struct argv_parser *parser;
 
@@ -98,8 +97,8 @@ main (int argc, char **argv)
   the_source_stream = create_source_stream ();
   prompt_init ();
   readln_initialize ();
-  terminal_init (&view_width_p, &view_length_p);
-  settings_init (view_width_p, view_length_p);
+  settings_init ();
+  terminal_check_size ();
   random_init ();
 
   the_dataset = create_dataset ();
@@ -129,13 +128,13 @@ main (int argc, char **argv)
 		     "a cascade of dependent command failures."));
 	  getl_abort_noninteractive (the_source_stream);
 	}
-      else
-	check_msg_count (the_source_stream);
+      else if (msg_ui_too_many_errors ())
+        getl_abort_noninteractive (the_source_stream);
     }
 
 
   clean_up ();
-  return any_errors ();
+  return msg_ui_any_errors ();
 }