X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fcmdline.c;h=6d45bd68c0aeeae04bae42d47352f4a4ad070e56;hb=1195caf0c998e80d3e7195a0452a14e7b4194077;hp=b72f545ba211107888c953ac05e3e92b64c97616;hpb=205ac3afa4c2b19c85819d8695abf3975bb11807;p=pspp-builds.git

diff --git a/src/cmdline.c b/src/cmdline.c
index b72f545b..6d45bd68 100644
--- a/src/cmdline.c
+++ b/src/cmdline.c
@@ -14,8 +14,8 @@
 
    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., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
 
 #include <config.h>
 #include "cmdline.h"
@@ -35,21 +35,23 @@
 #include "str.h"
 #include "var.h"
 #include "version.h"
+#include "copyleft.h"
+#include "glob.h"
 
 void welcome (void);
 static void usage (void);
 
 char *subst_vars (char *);
 
-static int testing_mode=0;
-
 /* Parses the command line specified by ARGC and ARGV as received by
    main(). */
 void
 parse_command_line (int argc, char **argv)
 {
+  static int testing_mode = 0;
   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'},
@@ -66,6 +68,7 @@ parse_command_line (int argc, char **argv)
     {"pipe", no_argument, NULL, 'p'},
     {"recon", no_argument, NULL, 'n'},
     {"safer", no_argument, NULL, 's'},
+    {"syntax", required_argument, NULL, 'x'},
     {"testing-mode", no_argument, &testing_mode, 1},
     {"verbose", no_argument, NULL, 'v'},
     {"version", no_argument, NULL, 'V'},
@@ -75,17 +78,41 @@ parse_command_line (int argc, char **argv)
   int c, i;
 
   int cleared_device_defaults = 0;
-
   int no_statrc = 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;
@@ -156,13 +183,7 @@ parse_command_line (int argc, char **argv)
 	  break;
 	case 'V':
 	  puts (version);
-	  puts (_("\nCopyright (C) 1997-9, 2000 Free Software Foundation, "
-		  "Inc.\n"
-		  "This is free software; see the source for copying "
-		  "conditions.  There is NO\n"
-		  "WARRANTY; not even for MERCHANTABILITY or FITNESS "
-		  "FOR A PARTICULAR PURPOSE.\n\n"
-		  "Written by Ben Pfaff <blp@gnu.org>."));
+	  puts (legal);
 	  err_hcf (1);
 	case '?':
 	  usage ();
@@ -179,6 +200,7 @@ parse_command_line (int argc, char **argv)
     {
       /* FIXME: Later this option should do some other things, too. */
       force_long_view();
+      test_mode = 1;
     }
     
 
@@ -223,6 +245,9 @@ N_("PSPP, a program for statistical analysis of sample data.\n"
 "\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"
@@ -238,6 +263,9 @@ N_("PSPP, a program for statistical analysis of sample data.\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"