From: Ken Hornstein <kenh@pobox.com>
Date: Thu, 21 Feb 2013 20:52:36 +0000 (-0500)
Subject: Rearrange options a bit and support the -nodump flag.  Also clean up how
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/6c5d1bc36f816a0ea5a100db491ec4308e804dc5?hp=1a169de52c3a6fed10b7370438b3f99081c0a909

Rearrange options a bit and support the -nodump flag.  Also clean up how
-raw mode works.
---

diff --git a/uip/fmttest.c b/uip/fmttest.c
index f48d1cbe..b63c53c8 100644
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -17,19 +17,17 @@
 #define FMTTEST_SWITCHES \
     X("form formatfile", 0, FORMSW) \
     X("format string", 5, FMTSW) \
-    X("dump", 0, DUMPSW) \
     X("address", 0, ADDRSW) \
     X("raw", 0, RAWSW) \
     X("date", 0, DATESW) \
     X("message", 0, MESSAGESW) \
+    X("-component-name component-text", 0, OTHERSW) \
     X("dupaddrs", 0, DUPADDRSW) \
     X("nodupaddrs", 0, NDUPADDRSW) \
     X("ccme", 0, CCMESW) \
     X("noccme", 0, NCCMESW) \
     X("normalize", 0, NORMSW) \
     X("nonormalize", 0, NNORMSW) \
-    X("trace", 0, TRACESW) \
-    X("notrace", 0, NTRACESW) \
     X("outsize size-in-characters", 0, OUTSIZESW) \
     X("bufsize size-in-bytes", 0, BUFSZSW) \
     X("width column-width", 0, WIDTHSW) \
@@ -37,8 +35,11 @@
     X("msgcur flag", 0, MSGCURSW) \
     X("msgsize size", 0, MSGSIZESW) \
     X("unseen flag", 0, UNSEENSW) \
+    X("dump", 0, DUMPSW) \
+    X("nodump", 0, NDUMPSW) \
+    X("trace", 0, TRACESW) \
+    X("notrace", 0, NTRACESW) \
     X("version", 0, VERSIONSW) \
-    X("-component-name component-text", 0, OTHERSW) \
     X("help", 0, HELPSW) \
 
 #define X(sw, minchars, id) id,
@@ -264,6 +265,9 @@ main (int argc, char **argv)
 		case DUMPSW:
 		    dump++;
 		    continue;
+		case NDUMPSW:
+		    dump = 0;
+		    continue;
 
 	    }
 	}
@@ -296,6 +300,16 @@ main (int argc, char **argv)
 	       invo_name);
    }
 
+   /*
+    * If you're picking "raw" as a mode, then you have to select
+    * a format.
+    */
+
+   if (mode == RAW && form == NULL && format == NULL) {
+   	adios (NULL, "You must specify a format with -form or -format when "
+	       "using -raw");
+   }
+
     /*
      * Get new format string.  Must be before chdir().
      */