X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fcmdline.c;h=b9205a14ed5a6358c5bff387e11d7a8afa4c8d6c;hb=65e4b2dda3939a9c35913a79b7e79c3120713a6c;hp=81ec7d801e3afbfe3d46b0e0b829adef0b98b2ba;hpb=829c9392ee103e34cd81e7c9aee5cdf24d6029dc;p=pspp

diff --git a/src/cmdline.c b/src/cmdline.c
index 81ec7d801e..b9205a14ed 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"
@@ -26,25 +26,28 @@
 #include <getopt.h>
 #include <stdlib.h>
 #include "alloc.h"
+#include "copyleft.h"
 #include "error.h"
 #include "filename.h"
-#include "getline.h"
+#include "getl.h"
+#include "glob.h"
 #include "main.h"
 #include "output.h"
+#include "progname.h"
 #include "settings.h"
 #include "str.h"
 #include "var.h"
 #include "version.h"
-#include "copyleft.h"
-#include "glob.h"
+
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
 
 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
@@ -70,7 +73,7 @@ parse_command_line (int argc, char **argv)
     {"recon", no_argument, NULL, 'n'},
     {"safer", no_argument, NULL, 's'},
     {"syntax", required_argument, NULL, 'x'},
-    {"testing-mode", no_argument, &testing_mode, 1},
+    {"testing-mode", no_argument, NULL, 'T'},
     {"verbose", no_argument, NULL, 'v'},
     {"version", no_argument, NULL, 'V'},
     {0, 0, 0, 0},
@@ -78,9 +81,8 @@ parse_command_line (int argc, char **argv)
 
   int c, i;
 
-  int cleared_device_defaults = 0;
-
-  int no_statrc = 0;
+  bool cleared_device_defaults = false;
+  bool no_statrc = false;
 
   for (;;)
     {
@@ -140,7 +142,7 @@ parse_command_line (int argc, char **argv)
 	  config_path = optarg;
 	  break;
 	case 'f':
-	  printf(_("%s is not yet implemented."), "-f");
+	  printf (_("%s is not yet implemented."), "-f");
           putchar('\n');
 	  break;
 	case 'h':
@@ -157,7 +159,7 @@ parse_command_line (int argc, char **argv)
 	  break;
 	case 'l':
 	  outp_list_classes ();
-	  err_hcf (1);
+	  terminate (true);
 	case 'n':
 	  printf (_("%s is not yet implemented."),"-n");
           putchar('\n');
@@ -166,7 +168,7 @@ parse_command_line (int argc, char **argv)
 	  if (!cleared_device_defaults)
 	    {
 	      outp_configure_clear ();
-	      cleared_device_defaults = 1;
+	      cleared_device_defaults = true;
 	    }
 	  outp_configure_add (optarg);
 	  break;
@@ -175,10 +177,10 @@ parse_command_line (int argc, char **argv)
           putchar('\n');
 	  break;
 	case 'r':
-	  no_statrc = 1;
+	  no_statrc = true;
 	  break;
 	case 's':
-	  make_safe();
+	  set_safer_mode ();
 	  break;
 	case 'v':
 	  err_verbosity++;
@@ -186,7 +188,11 @@ parse_command_line (int argc, char **argv)
 	case 'V':
 	  puts (version);
 	  puts (legal);
-	  err_hcf (1);
+	  terminate (true);
+        case 'T':
+          force_long_view ();
+          set_testing_mode (true);
+          break;
 	case '?':
 	  usage ();
 	  assert (0);
@@ -197,15 +203,6 @@ parse_command_line (int argc, char **argv)
 	}
     }
 
-
-  if (testing_mode)
-    {
-      /* FIXME: Later this option should do some other things, too. */
-      force_long_view();
-      test_mode = 1;
-    }
-    
-
   for (i = optind; i < argc; i++)
     {
       int separate = 1;
@@ -286,9 +283,9 @@ static const char post_syntax_message[] = N_("\nReport bugs to <%s>.\n");
 static void
 usage (void)
 {
-  printf (gettext (pre_syntax_message), pgmname);
+  printf (gettext (pre_syntax_message), program_name);
   outp_list_classes ();
-  printf (gettext (post_syntax_message),PACKAGE_BUGREPORT);
+  printf (gettext (post_syntax_message), PACKAGE_BUGREPORT);
 
-  err_hcf (1);
+  terminate (true);
 }