X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fcommand-line.c;h=8511f290efab920d06d8a4bd33360f1e18723c72;hb=03660262a395494be666ae271d7d08408d34007d;hp=39e17e325d8e6ec3b4f89b1f04fe6ef960928bc3;hpb=dcf9b154cbcaa35c3d8459a201b77eec8bcb30bd;p=pspp-builds.git

diff --git a/src/ui/terminal/command-line.c b/src/ui/terminal/command-line.c
index 39e17e32..8511f290 100644
--- a/src/ui/terminal/command-line.c
+++ b/src/ui/terminal/command-line.c
@@ -19,23 +19,25 @@
 
 #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 "alloc.h"
-#include "copyleft.h"
-#include "message.h"
-#include "line-buffer.h"
+#include <libpspp/alloc.h>
+#include <libpspp/assertion.h>
+#include <libpspp/copyleft.h>
+#include <libpspp/message.h>
+#include <language/line-buffer.h>
 #include "progname.h"
-#include "settings.h"
+#include <data/settings.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)
@@ -163,7 +165,7 @@ parse_command_line (int argc, char **argv)
 	  set_safer_mode ();
 	  break;
 	case 'v':
-	  err_verbosity++;
+	  verbose_increment_level ();
 	  break;
 	case 'V':
 	  puts (version);
@@ -179,7 +181,7 @@ parse_command_line (int argc, char **argv)
 	case 0:
 	  break;
 	default:
-	  assert (0);
+	  NOT_REACHED ();
 	}
     }
 
@@ -220,8 +222,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"
-"  -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"