X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fsettings.c;h=b14fb618f3a235addab2a140270dae0a7149f0aa;hb=29956ba4326b9d6a2bc4d22a9f323902c7a08d43;hp=5f769a5222083cb21a4a9e5731d23740e2680145;hpb=6d8462bae6c13a723c63da24ed7db2549efd4cc1;p=pspp-builds.git

diff --git a/src/data/settings.c b/src/data/settings.c
index 5f769a52..b14fb618 100644
--- a/src/data/settings.c
+++ b/src/data/settings.c
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
-   Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+   Copyright (C) 1997-9, 2000, 2006, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 #include "settings.h"
@@ -26,13 +24,23 @@
 #include "xalloc.h"
 #include <libpspp/i18n.h>
 
+#include "error.h"
+
+#ifdef HAVE_LIBNCURSES
+#include <curses.h>
+#include <term.h>
+#endif
+
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
 static int viewlength = 24;
 static int viewwidth = 79;
 static bool long_view = false;
 
 static bool safer_mode = false;
 
-static bool echo = false;
+static bool do_echo = false;
 static bool include = true;
 
 static int epoch = -1;
@@ -95,7 +103,7 @@ get_viewlength (void)
 
 /* Sets the view length. */
 void
-set_viewlength (int viewlength_) 
+set_viewlength (int viewlength_)
 {
   viewlength = viewlength_;
 }
@@ -118,12 +126,12 @@ get_viewwidth(void)
 
 /* Sets the screen width. */
 void
-set_viewwidth (int viewwidth_) 
+set_viewwidth (int viewwidth_)
 {
   viewwidth = viewwidth_;
 }
 
-#if HAVE_LIBTERMCAP
+#if HAVE_LIBNCURSES
 static void
 get_termcap_viewport (void)
 {
@@ -132,7 +140,8 @@ get_termcap_viewport (void)
     return;
   else if (tgetent (term_buffer, getenv ("TERM")) <= 0)
     {
-      msg (IE, _("Could not access definition for terminal `%s'."), termtype);
+      error (0,0, _("could not access definition for terminal `%s'"),
+             getenv ("TERM"));
       return;
     }
 
@@ -142,19 +151,19 @@ get_termcap_viewport (void)
   if (tgetnum ("co") > 1)
     viewwidth = tgetnum ("co") - 1;
 }
-#endif /* HAVE_LIBTERMCAP */
+#endif /* HAVE_LIBNCURSES */
 
-static void 
+static void
 init_viewport (void)
 {
   if (long_view)
     return;
-  
+
   viewwidth = viewlength = -1;
 
-#if HAVE_LIBTERMCAP
+#if HAVE_LIBNCURSES
   get_termcap_viewport ();
-#endif /* HAVE_LIBTERMCAP */
+#endif /* HAVE_LIBNCURSES */
 
   if (viewwidth < 0 && getenv ("COLUMNS") != NULL)
     viewwidth = atoi (getenv ("COLUMNS"));
@@ -185,14 +194,14 @@ set_safer_mode (void)
 bool
 get_echo (void)
 {
-  return echo;
+  return do_echo;
 }
 
 /* Set echo. */
 void
-set_echo (bool echo_) 
+set_echo (bool echo_)
 {
-  echo = echo_;
+  do_echo = echo_;
 }
 
 /* If echo is on, whether commands from include files are echoed. */
@@ -204,16 +213,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);
@@ -225,7 +234,7 @@ get_epoch (void)
 
 /* Sets the year that starts the epoch. */
 void
-set_epoch (int epoch_) 
+set_epoch (int epoch_)
 {
   epoch = epoch_;
 }
@@ -239,14 +248,14 @@ 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) 
+get_error_routing_to_terminal (void)
 {
   return route_errors_to_terminal;
 }
@@ -254,14 +263,14 @@ get_error_routing_to_terminal (void)
 /* Sets whether error messages should be routed to the
    terminal. */
 void
-set_error_routing_to_terminal (bool route_to_terminal) 
+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) 
+get_error_routing_to_listing (void)
 {
   return route_errors_to_listing;
 }
@@ -269,13 +278,13 @@ get_error_routing_to_listing (void)
 /* Sets whether error messages should be routed to the
    listing file. */
 void
-set_error_routing_to_listing (bool route_to_listing) 
+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;
@@ -283,7 +292,7 @@ get_scompression (void)
 
 /* Set system file default compression. */
 void
-set_scompression (bool scompress_) 
+set_scompression (bool scompress_)
 {
   scompress = scompress_;
 }
@@ -297,7 +306,7 @@ get_undefined (void)
 
 /* Set whether to warn on undefined values. */
 void
-set_undefined (bool undefined_) 
+set_undefined (bool undefined_)
 {
   undefined = undefined_;
 }
@@ -312,7 +321,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_;
 }
@@ -320,13 +329,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_;
 }
@@ -340,7 +349,7 @@ get_mxerrs (void)
 
 /* Sets maximum number of errors. */
 void
-set_mxerrs (int mxerrs_) 
+set_mxerrs (int mxerrs_)
 {
   mxerrs = mxerrs_;
 }
@@ -354,7 +363,7 @@ get_printback (void)
 
 /* Sets whether commands are written to the display. */
 void
-set_printback (bool printback_) 
+set_printback (bool printback_)
 {
   printback = printback_;
 }
@@ -370,7 +379,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_;
 }
@@ -384,7 +393,7 @@ get_mxloops (void)
 
 /* Set implied limit of unbounded loop. */
 void
-set_mxloops (int mxloops_) 
+set_mxloops (int mxloops_)
 {
   mxloops = mxloops_;
 }
@@ -412,7 +421,7 @@ get_endcmd (void)
 
 /* Set the character used to terminate commands. */
 void
-set_endcmd (char endcmd_) 
+set_endcmd (char endcmd_)
 {
   endcmd = endcmd_;
 }
@@ -428,7 +437,7 @@ get_workspace (void)
 /* 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) 
+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);
@@ -439,7 +448,7 @@ get_workspace_cases (size_t value_cnt)
    bytes. */
 
 void
-set_workspace (size_t workspace_) 
+set_workspace (size_t workspace_)
 {
   workspace = workspace_;
 }
@@ -448,14 +457,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_;
 }
@@ -463,14 +472,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_;
 }
@@ -483,17 +492,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;
 }
 
@@ -512,7 +521,7 @@ get_syntax (void)
 }
 
 /* Set the syntax option */
-void 
+void
 set_syntax (enum behavior_mode mode)
 {
   syntax = mode;