#include <config.h>
#include "cmdline.h"
-#include <assert.h>
+#include "error.h"
#include <ctype.h>
#include <stdio.h>
#include <errno.h>
char *subst_vars (char *);
+static int testing_mode=0;
+
/* Parses the command line specified by ARGC and ARGV as received by
main(). */
void
{
static struct option long_options[] =
{
+ {"algorithm", required_argument, NULL, 'a'},
{"command", required_argument, NULL, 'c'},
{"config-directory", required_argument, NULL, 'B'},
{"device", required_argument, NULL, 'o'},
{"pipe", no_argument, NULL, 'p'},
{"recon", no_argument, NULL, 'n'},
{"safer", no_argument, NULL, 's'},
- {"testing-mode", no_argument, &set_testing_mode, 1},
+ {"syntax", required_argument, NULL, 'x'},
+ {"testing-mode", no_argument, &testing_mode, 1},
{"verbose", no_argument, NULL, 'v'},
{"version", no_argument, NULL, 'V'},
{0, 0, 0, 0},
for (;;)
{
- c = getopt_long (argc, argv, "B:c:f:hiI:lno:prsvV", long_options, NULL);
+ c = getopt_long (argc, argv, "a:x:B:c:f:hiI:lno:prsvV", long_options, NULL);
if (c == -1)
break;
switch (c)
{
+ /* Compatibility options */
+ case 'a':
+ if ( 0 == strcmp(optarg,"compatible") )
+ set_algorithm(COMPATIBLE);
+ else if ( 0 == strcmp(optarg,"enhanced"))
+ set_algorithm(ENHANCED);
+ else
+ {
+ usage();
+ assert(0);
+ }
+ break;
+
+ case 'x':
+ if ( 0 == strcmp(optarg,"compatible") )
+ set_syntax(COMPATIBLE);
+ else if ( 0 == strcmp(optarg,"enhanced"))
+ set_syntax(ENHANCED);
+ else
+ {
+ usage();
+ assert(0);
+ }
+ break;
+
case 'c':
{
static int n_cmds;
no_statrc = 1;
break;
case 's':
- set_safer = 1;
+ make_safe();
break;
case 'v':
err_verbosity++;
}
}
- if (set_testing_mode)
+
+ if (testing_mode)
{
/* FIXME: Later this option should do some other things, too. */
- set_viewwidth = 9999;
+ force_long_view();
}
+
for (i = optind; i < argc; i++)
{
"\nIf a long option shows an argument as mandatory, then it is mandatory\n"
"for the equivalent short option also. Similarly for optional arguments.\n"
"\nConfiguration:\n"
+" -a, --algorithm={compatible|enhanced}\n"
+" set to `compatible' if you want output\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"
" -n, --edit just check syntax; don't actually run the code\n"
" -r, --no-statrc disable execution of .pspp/rc at startup\n"
" -s, --safer don't allow some unsafe operations\n"
+" -x, --syntax={compatible|enhanced}\n"
+" set to `compatible' if you want only to accept\n"
+" spss compatible syntax\n"
"\nInformative output:\n"
" -h, --help print this help, then exit\n"
" -l, --list print a list of known driver classes, then exit\n"