X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fsettings.c;h=ddcc588a1fcaeb59fbe4343572adbe806403f0b5;hb=f5c108becd49d78f4898cab11352291f5689d24e;hp=844fdde33d3c2bbc5271f705e6d030048c960868;hpb=3a61659a8fc11c51ad5af02b20f5613dcde50382;p=pspp-builds.git

diff --git a/src/data/settings.c b/src/data/settings.c
index 844fdde3..ddcc588a 100644
--- a/src/data/settings.c
+++ b/src/data/settings.c
@@ -1,6 +1,5 @@
 /* PSPP - computes sample statistics.
    Copyright (C) 1997-9, 2000, 2006 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
@@ -40,6 +39,9 @@ static int epoch = -1;
 
 static bool errorbreak = false;
 
+static bool route_errors_to_terminal = true;
+static bool route_errors_to_listing = true;
+
 static bool scompress = true;
 
 static bool undefined = true;
@@ -93,7 +95,7 @@ get_viewlength (void)
 
 /* Sets the view length. */
 void
-set_viewlength (int viewlength_) 
+set_viewlength (int viewlength_)
 {
   viewlength = viewlength_;
 }
@@ -116,7 +118,7 @@ get_viewwidth(void)
 
 /* Sets the screen width. */
 void
-set_viewwidth (int viewwidth_) 
+set_viewwidth (int viewwidth_)
 {
   viewwidth = viewwidth_;
 }
@@ -142,12 +144,12 @@ get_termcap_viewport (void)
 }
 #endif /* HAVE_LIBTERMCAP */
 
-static void 
+static void
 init_viewport (void)
 {
   if (long_view)
     return;
-  
+
   viewwidth = viewlength = -1;
 
 #if HAVE_LIBTERMCAP
@@ -188,7 +190,7 @@ get_echo (void)
 
 /* Set echo. */
 void
-set_echo (bool echo_) 
+set_echo (bool echo_)
 {
   echo = echo_;
 }
@@ -202,16 +204,16 @@ get_include (void)
 
 /* Set include file echo. */
 void
-set_include (bool include_) 
+set_include (bool include_)
 {
   include = include_;
 }
 
 /* What year to use as the start of the epoch. */
 int
-get_epoch (void) 
+get_epoch (void)
 {
-  if (epoch < 0) 
+  if (epoch < 0)
     {
       time_t t = time (0);
       struct tm *tm = localtime (&t);
@@ -223,7 +225,7 @@ get_epoch (void)
 
 /* Sets the year that starts the epoch. */
 void
-set_epoch (int epoch_) 
+set_epoch (int epoch_)
 {
   epoch = epoch_;
 }
@@ -237,13 +239,43 @@ get_errorbreak (void)
 
 /* Sets whether an error stops execution. */
 void
-set_errorbreak (bool errorbreak_) 
+set_errorbreak (bool errorbreak_)
 {
   errorbreak = errorbreak_;
 }
 
+/* Route error messages to terminal? */
+bool
+get_error_routing_to_terminal (void)
+{
+  return route_errors_to_terminal;
+}
+
+/* Sets whether error messages should be routed to the
+   terminal. */
+void
+set_error_routing_to_terminal (bool route_to_terminal)
+{
+  route_errors_to_terminal = route_to_terminal;
+}
+
+/* Route error messages to listing file? */
+bool
+get_error_routing_to_listing (void)
+{
+  return route_errors_to_listing;
+}
+
+/* Sets whether error messages should be routed to the
+   listing file. */
+void
+set_error_routing_to_listing (bool route_to_listing)
+{
+  route_errors_to_listing = route_to_listing;
+}
+
 /* Compress system files by default? */
-bool 
+bool
 get_scompression (void)
 {
   return scompress;
@@ -251,7 +283,7 @@ get_scompression (void)
 
 /* Set system file default compression. */
 void
-set_scompression (bool scompress_) 
+set_scompression (bool scompress_)
 {
   scompress = scompress_;
 }
@@ -265,7 +297,7 @@ get_undefined (void)
 
 /* Set whether to warn on undefined values. */
 void
-set_undefined (bool undefined_) 
+set_undefined (bool undefined_)
 {
   undefined = undefined_;
 }
@@ -280,7 +312,7 @@ get_blanks (void)
 /* Set the value that blank numeric fields are set to when read
    in. */
 void
-set_blanks (double blanks_) 
+set_blanks (double blanks_)
 {
   blanks = blanks_;
 }
@@ -288,13 +320,13 @@ set_blanks (double blanks_)
 /* Maximum number of warnings + errors. */
 int
 get_mxwarns (void)
-{  
+{
   return mxwarns;
 }
 
 /* Sets maximum number of warnings + errors. */
 void
-set_mxwarns (int mxwarns_) 
+set_mxwarns (int mxwarns_)
 {
   mxwarns = mxwarns_;
 }
@@ -308,7 +340,7 @@ get_mxerrs (void)
 
 /* Sets maximum number of errors. */
 void
-set_mxerrs (int mxerrs_) 
+set_mxerrs (int mxerrs_)
 {
   mxerrs = mxerrs_;
 }
@@ -322,7 +354,7 @@ get_printback (void)
 
 /* Sets whether commands are written to the display. */
 void
-set_printback (bool printback_) 
+set_printback (bool printback_)
 {
   printback = printback_;
 }
@@ -338,7 +370,7 @@ get_mprint (void)
 /* Sets whether the commands generated by macro invocations are
    displayed. */
 void
-set_mprint (bool mprint_) 
+set_mprint (bool mprint_)
 {
   mprint = mprint_;
 }
@@ -352,7 +384,7 @@ get_mxloops (void)
 
 /* Set implied limit of unbounded loop. */
 void
-set_mxloops (int mxloops_) 
+set_mxloops (int mxloops_)
 {
   mxloops = mxloops_;
 }
@@ -380,7 +412,7 @@ get_endcmd (void)
 
 /* Set the character used to terminate commands. */
 void
-set_endcmd (char endcmd_) 
+set_endcmd (char endcmd_)
 {
   endcmd = endcmd_;
 }
@@ -393,11 +425,21 @@ get_workspace (void)
   return workspace;
 }
 
+/* Approximate maximum number of cases to allocate in-core, given
+   that each case contains VALUE_CNT values. */
+size_t
+get_workspace_cases (size_t value_cnt)
+{
+  size_t case_size = sizeof (union value) * value_cnt + 4 * sizeof (void *);
+  size_t case_cnt = MAX (get_workspace () / case_size, 4);
+  return case_cnt;
+}
+
 /* Set approximate maximum amount of memory to use for cases, in
    bytes. */
 
 void
-set_workspace (size_t workspace_) 
+set_workspace (size_t workspace_)
 {
   workspace = workspace_;
 }
@@ -406,14 +448,14 @@ set_workspace (size_t workspace_)
    DATA LIST {FREE,LIST}. */
 const struct fmt_spec *
 get_format (void)
-{ 
+{
   return &default_format;
 }
 
 /* Set default format for variables created by transformations
    and by DATA LIST {FREE,LIST}. */
 void
-set_format (const struct fmt_spec *default_format_) 
+set_format (const struct fmt_spec *default_format_)
 {
   default_format = *default_format_;
 }
@@ -421,14 +463,14 @@ set_format (const struct fmt_spec *default_format_)
 /* Are we in testing mode?  (e.g. --testing-mode command line
    option) */
 bool
-get_testing_mode (void) 
+get_testing_mode (void)
 {
   return testing_mode;
 }
 
 /* Set testing mode. */
 void
-set_testing_mode (bool testing_mode_) 
+set_testing_mode (bool testing_mode_)
 {
   testing_mode = testing_mode_;
 }
@@ -441,17 +483,17 @@ get_algorithm (void)
 }
 
 /* Set the algorithm option globally. */
-void 
+void
 set_algorithm (enum behavior_mode mode)
 {
   global_algorithm = mode;
 }
 
 /* Set the algorithm option for this command only */
-void 
+void
 set_cmd_algorithm (enum behavior_mode mode)
 {
-  cmd_algorithm = mode; 
+  cmd_algorithm = mode;
   algorithm = &cmd_algorithm;
 }
 
@@ -470,7 +512,7 @@ get_syntax (void)
 }
 
 /* Set the syntax option */
-void 
+void
 set_syntax (enum behavior_mode mode)
 {
   syntax = mode;