projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move var_set and variable parsing declarations into new header.
[pspp-builds.git]
/
src
/
ui
/
terminal
/
command-line.c
diff --git
a/src/ui/terminal/command-line.c
b/src/ui/terminal/command-line.c
index 39e17e325d8e6ec3b4f89b1f04fe6ef960928bc3..94c5eea10e3acfc3996a3fede7ddaacd57a29b10 100644
(file)
--- a/
src/ui/terminal/command-line.c
+++ b/
src/ui/terminal/command-line.c
@@
-19,23
+19,24
@@
#include <config.h>
#include "command-line.h"
#include <config.h>
#include "command-line.h"
-#include
"message.h"
+#include
<libpspp/message.h>
#include <ctype.h>
#include <stdio.h>
#include <errno.h>
#include <getopt.h>
#include <stdlib.h>
#include <ctype.h>
#include <stdio.h>
#include <errno.h>
#include <getopt.h>
#include <stdlib.h>
-#include
"alloc.h"
-#include
"copyleft.h"
-#include
"message.h"
-#include
"line-buffer.h"
+#include
<libpspp/alloc.h>
+#include
<libpspp/copyleft.h>
+#include
<libpspp/message.h>
+#include
<language/line-buffer.h>
#include "progname.h"
#include "progname.h"
-#include
"settings.h"
+#include
<data/settings.h>
#include "read-line.h"
#include "read-line.h"
-#include "output.h"
-#include "filename.h"
-#include "str.h"
-#include "version.h"
+#include <output/output.h>
+#include <data/file-name.h>
+#include <libpspp/str.h>
+#include <libpspp/version.h>
+#include <libpspp/verbose-msg.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-163,7
+164,7
@@
parse_command_line (int argc, char **argv)
set_safer_mode ();
break;
case 'v':
set_safer_mode ();
break;
case 'v':
-
err_verbosity++
;
+
verbose_increment_level ()
;
break;
case 'V':
puts (version);
break;
case 'V':
puts (version);
@@
-220,8
+221,6
@@
N_("PSPP, a program for statistical analysis of sample data.\n"
" calculated from broken algorithms\n"
" -B, --config-dir=DIR set configuration directory to DIR\n"
" -o, --device=DEVICE select output driver DEVICE and disable defaults\n"
" calculated from broken algorithms\n"
" -B, --config-dir=DIR set configuration directory to DIR\n"
" -o, --device=DEVICE select output driver DEVICE and disable defaults\n"
-" -d, --define=VAR[=VALUE] set environment variable VAR to VALUE, or empty\n"
-" -u, --undef=VAR undefine environment variable VAR\n"
"\nInput and output:\n"
" -f, --out-file=FILE send output to FILE (overwritten)\n"
" -p, --pipe read script from stdin, send output to stdout\n"
"\nInput and output:\n"
" -f, --out-file=FILE send output to FILE (overwritten)\n"
" -p, --pipe read script from stdin, send output to stdout\n"