alphabetize command line switch

(cherry picked from commit ca83a66618e389f7b9e621d7d8806e554aefad79)

diff --git a/bin/dnssec/dnssec-settime.c b/bin/dnssec/dnssec-settime.c
index a2bb476b49fe790208dd3f7109e7e69ca7c82823..6d12b29984daac8b9d2242a1b5ed8ca2e2ed509f 100644 (file)
--- a/bin/dnssec/dnssec-settime.c
+++ b/bin/dnssec/dnssec-settime.c
@@ -188,66 +188,63 @@ main(int argc, char **argv) {
 #define CMDLINE_FLAGS "A:D:E:fhI:i:K:L:P:p:R:S:uv:V"
        while ((ch = isc_commandline_parse(argc, argv, CMDLINE_FLAGS)) != -1) {
                switch (ch) {
+               case 'A':
+                       if (setact || unsetact)
+                               fatal("-A specified more than once");
+
+                       changed = true;
+                       act = strtotime(isc_commandline_argument,
+                                       now, now, &setact);
+                       unsetact = !setact;
+                       break;
+               case 'D':
+                       /* -Dsync ? */
+                       if (isoptarg("sync", argv, usage)) {
+                               if (unsetsyncdel || setsyncdel)
+                                       fatal("-D sync specified more than "
+                                             "once");
+
+                               changed = true;
+                               syncdel = strtotime(isc_commandline_argument,
+                                                  now, now, &setsyncdel);
+                               unsetsyncdel = !setsyncdel;
+                               break;
+                       }
+                       /* -Ddnskey ? */
+                       (void)isoptarg("dnskey", argv, usage);
+                       if (setdel || unsetdel)
+                               fatal("-D specified more than once");
+
+                       changed = true;
+                       del = strtotime(isc_commandline_argument,
+                                       now, now, &setdel);
+                       unsetdel = !setdel;
+                       break;
                case 'E':
                        engine = isc_commandline_argument;
                        break;
                case 'f':
                        force = true;
                        break;
-               case 'p':
-                       p = isc_commandline_argument;
-                       if (!strcasecmp(p, "all")) {
-                               printcreate = true;
-                               printpub = true;
-                               printact = true;
-                               printrev = true;
-                               printinact = true;
-                               printdel = true;
-                               printsyncadd = true;
-                               printsyncdel = true;
-                               break;
-                       }
+               case '?':
+                       if (isc_commandline_option != '?')
+                               fprintf(stderr, "%s: invalid argument -%c\n",
+                                       program, isc_commandline_option);
+                       /* FALLTHROUGH */
+               case 'h':
+                       /* Does not return. */
+                       usage();
+               case 'I':
+                       if (setinact || unsetinact)
+                               fatal("-I specified more than once");
 
-                       do {
-                               switch (*p++) {
-                               case 'C':
-                                       printcreate = true;
-                                       break;
-                               case 'P':
-                                       if (!strncmp(p, "sync", 4)) {
-                                               p += 4;
-                                               printsyncadd = true;
-                                               break;
-                                       }
-                                       printpub = true;
-                                       break;
-                               case 'A':
-                                       printact = true;
-                                       break;
-                               case 'R':
-                                       printrev = true;
-                                       break;
-                               case 'I':
-                                       printinact = true;
-                                       break;
-                               case 'D':
-                                       if (!strncmp(p, "sync", 4)) {
-                                               p += 4;
-                                               printsyncdel = true;
-                                               break;
-                                       }
-                                       printdel = true;
-                                       break;
-                               case ' ':
-                                       break;
-                               default:
-                                       usage();
-                                       break;
-                               }
-                       } while (*p != '\0');
+                       changed = true;
+                       inact = strtotime(isc_commandline_argument,
+                                       now, now, &setinact);
+                       unsetinact = !setinact;
                        break;
-               case 'u':
-                       epoch = true;
+               case 'i':
+                       prepub = strtottl(isc_commandline_argument);
                        break;
                case 'K':
                        /*
@@ -265,11 +262,6 @@ main(int argc, char **argv) {
                        ttl = strtottl(isc_commandline_argument);
                        setttl = true;
                        break;
-               case 'v':
-                       verbose = strtol(isc_commandline_argument, &endp, 0);
-                       if (*endp != '\0')
-                               fatal("-v must be followed by a number");
-                       break;
                case 'P':
                        /* -Psync ? */
                        if (isoptarg("sync", argv, usage)) {
@@ -292,14 +284,57 @@ main(int argc, char **argv) {
                                        now, now, &setpub);
                        unsetpub = !setpub;
                        break;
-               case 'A':
-                       if (setact || unsetact)
-                               fatal("-A specified more than once");
+               case 'p':
+                       p = isc_commandline_argument;
+                       if (!strcasecmp(p, "all")) {
+                               printcreate = true;
+                               printpub = true;
+                               printact = true;
+                               printrev = true;
+                               printinact = true;
+                               printdel = true;
+                               printsyncadd = true;
+                               printsyncdel = true;
+                               break;
+                       }
 
-                       changed = true;
-                       act = strtotime(isc_commandline_argument,
-                                       now, now, &setact);
-                       unsetact = !setact;
+                       do {
+                               switch (*p++) {
+                               case 'A':
+                                       printact = true;
+                                       break;
+                               case 'C':
+                                       printcreate = true;
+                                       break;
+                               case 'D':
+                                       if (!strncmp(p, "sync", 4)) {
+                                               p += 4;
+                                               printsyncdel = true;
+                                               break;
+                                       }
+                                       printdel = true;
+                                       break;
+                               case 'I':
+                                       printinact = true;
+                                       break;
+                               case 'P':
+                                       if (!strncmp(p, "sync", 4)) {
+                                               p += 4;
+                                               printsyncadd = true;
+                                               break;
+                                       }
+                                       printpub = true;
+                                       break;
+                               case 'R':
+                                       printrev = true;
+                                       break;
+                               case ' ':
+                                       break;
+                               default:
+                                       usage();
+                                       break;
+                               }
+                       } while (*p != '\0');
                        break;
                case 'R':
                        if (setrev || unsetrev)
@@ -310,57 +345,20 @@ main(int argc, char **argv) {
                                        now, now, &setrev);
                        unsetrev = !setrev;
                        break;
-               case 'I':
-                       if (setinact || unsetinact)
-                               fatal("-I specified more than once");
-
-                       changed = true;
-                       inact = strtotime(isc_commandline_argument,
-                                       now, now, &setinact);
-                       unsetinact = !setinact;
-                       break;
-               case 'D':
-                       /* -Dsync ? */
-                       if (isoptarg("sync", argv, usage)) {
-                               if (unsetsyncdel || setsyncdel)
-                                       fatal("-D sync specified more than "
-                                             "once");
-
-                               changed = true;
-                               syncdel = strtotime(isc_commandline_argument,
-                                                  now, now, &setsyncdel);
-                               unsetsyncdel = !setsyncdel;
-                               break;
-                       }
-                       /* -Ddnskey ? */
-                       (void)isoptarg("dnskey", argv, usage);
-                       if (setdel || unsetdel)
-                               fatal("-D specified more than once");
-
-                       changed = true;
-                       del = strtotime(isc_commandline_argument,
-                                       now, now, &setdel);
-                       unsetdel = !setdel;
-                       break;
                case 'S':
                        predecessor = isc_commandline_argument;
                        break;
-               case 'i':
-                       prepub = strtottl(isc_commandline_argument);
+               case 'u':
+                       epoch = true;
                        break;
-               case '?':
-                       if (isc_commandline_option != '?')
-                               fprintf(stderr, "%s: invalid argument -%c\n",
-                                       program, isc_commandline_option);
-                       /* FALLTHROUGH */
-               case 'h':
-                       /* Does not return. */
-                       usage();
-
                case 'V':
                        /* Does not return. */
                        version(program);
-
+               case 'v':
+                       verbose = strtol(isc_commandline_argument, &endp, 0);
+                       if (*endp != '\0')
+                               fatal("-v must be followed by a number");
+                       break;
                default:
                        fprintf(stderr, "%s: unhandled option -%c\n",
                                program, isc_commandline_option);