X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fsettings.c;h=b14fb618f3a235addab2a140270dae0a7149f0aa;hb=458d169f64134f4e0a9d9b72398666a01761fcf8;hp=ddcc588a1fcaeb59fbe4343572adbe806403f0b5;hpb=f5c108becd49d78f4898cab11352291f5689d24e;p=pspp-builds.git
diff --git a/src/data/settings.c b/src/data/settings.c
index ddcc588a..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 . */
#include
#include "settings.h"
@@ -26,13 +24,23 @@
#include "xalloc.h"
#include
+#include "error.h"
+
+#ifdef HAVE_LIBNCURSES
+#include
+#include
+#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;
@@ -123,7 +131,7 @@ 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,7 +151,7 @@ get_termcap_viewport (void)
if (tgetnum ("co") > 1)
viewwidth = tgetnum ("co") - 1;
}
-#endif /* HAVE_LIBTERMCAP */
+#endif /* HAVE_LIBNCURSES */
static void
init_viewport (void)
@@ -152,9 +161,9 @@ init_viewport (void)
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_)
{
- echo = echo_;
+ do_echo = echo_;
}
/* If echo is on, whether commands from include files are echoed. */