Alphabetize options.

diff --git a/morse.c b/morse.c
index b5ad3761a24f453cde8a5aa1b603f0437e1abd80..32f7044656bc098a1517ae92673385a3ad483648 100644 (file)
--- a/morse.c
+++ b/morse.c
@@ -571,32 +571,10 @@ extern time_t   time ();
     words_per_minute = WORDS_PER_MINUTE;
     fwords_per_minute = -1.;
 
-    while ((ch = getopt (argc, argv, "F:w:lbamf:g:v:tTdesp:riIcM:E:n:R:N:C:q")) != EOF)
+    /* ABDGHJKLMOPQSUVWXYZhjkouxyz are still available */
+    while ((ch = getopt (argc, argv, "ABC:E:F:IM:N:R:Tabcdef:g:ilmn:p:qrstv:w:")) != EOF)
        switch ((char) ch)
        {
-       case 'i':
-           typeaway = 1;
-           break;
-       case 'I':
-           typeaway = LETMESEE;
-           break;
-       case 'r':
-           randomletters = 1;
-           break;
-       case 'n':
-           sscanf (optarg, "%d", &wordlen);
-           if (wordlen < 1) wordlen = 1;
-           if (wordlen > MAXWORDLEN) wordlen = MAXWORDLEN;
-           break;
-       case 'R':
-           sscanf (optarg, "%d", &timeout);
-           timeout *= 60;
-           if (timeout < 1) timeout = -1;
-           break;
-       case 'N':
-           sscanf (optarg, "%d", &wordcount);
-           if (wordcount < 1) wordcount = -1;
-           break;
        case 'C':
            for (ii = 0; ii < strlen(optarg); ii++)
              {
@@ -616,30 +594,17 @@ extern time_t   time ();
                  }
              }
            break;
-       case 'c':
-           noticebad = 1;
-           break;
-       case 'e':
-           fancyending = 0;
-           break;
-       case 'T':
-           testing = 1;
-           showtesting = 1;
-           break;
-       case 't':
-           testing = 1;
-           break;
-       case 's':
-           charbychar = 1;
+       case 'E':
            testing = 1;
+           sscanf (optarg, "%d", &error_threshold);
+           if (error_threshold < error_floor)
+               error_floor = error_threshold;
            break;
-       case 'q':
-           keepquiet = 1;
+       case 'F':
+           sscanf (optarg, "%f", &fwords_per_minute);
            break;
-       case 'p':
-           charbychar = 1;
-           testing = 1;
-           sscanf (optarg, "%d", &tryagaincount);
+       case 'I':
+           typeaway = LETMESEE;
            break;
        case 'M':
            testing = 1;
@@ -647,32 +612,33 @@ extern time_t   time ();
            if (max_behindness < 1)
                max_behindness = 0;
            break;
-       case 'E':
-           testing = 1;
-           sscanf (optarg, "%d", &error_threshold);
-           if (error_threshold < error_floor)
-               error_floor = error_threshold;
-           break;
-       case 'd':
-           dynamicspeed = 1;
+       case 'N':
+           sscanf (optarg, "%d", &wordcount);
+           if (wordcount < 1) wordcount = -1;
            break;
-       case 'w':
-           sscanf (optarg, "%f", &words_per_minute);
+       case 'R':
+           sscanf (optarg, "%d", &timeout);
+           timeout *= 60;
+           if (timeout < 1) timeout = -1;
            break;
-       case 'F':
-           sscanf (optarg, "%f", &fwords_per_minute);
+       case 'T':
+           testing = 1;
+           showtesting = 1;
            break;
-       case 'l':
-           showletters = 1;
+       case 'a':
+           wordsafter = 1;
            break;
        case 'b':
            wordsbefore = 1;
            break;
-       case 'a':
-           wordsafter = 1;
+       case 'c':
+           noticebad = 1;
            break;
-       case 'm':
-           showmorse = 1;
+       case 'd':
+           dynamicspeed = 1;
+           break;
+       case 'e':
+           fancyending = 0;
            break;
        case 'f':
            sscanf (optarg, "%f", &frequency1);
@@ -680,6 +646,38 @@ extern time_t   time ();
        case 'g':
            sscanf (optarg, "%f", &frequency2);
            break;
+       case 'i':
+           typeaway = 1;
+           break;
+       case 'l':
+           showletters = 1;
+           break;
+       case 'm':
+           showmorse = 1;
+           break;
+       case 'n':
+           sscanf (optarg, "%d", &wordlen);
+           if (wordlen < 1) wordlen = 1;
+           if (wordlen > MAXWORDLEN) wordlen = MAXWORDLEN;
+           break;
+       case 'p':
+           charbychar = 1;
+           testing = 1;
+           sscanf (optarg, "%d", &tryagaincount);
+           break;
+       case 'q':
+           keepquiet = 1;
+           break;
+       case 'r':
+           randomletters = 1;
+           break;
+       case 's':
+           charbychar = 1;
+           testing = 1;
+           break;
+       case 't':
+           testing = 1;
+           break;
        case 'v':
            sscanf (optarg, "%f", &volume);
            if (volume < 0.)
@@ -687,6 +685,9 @@ extern time_t   time ();
            if (volume > 1.)
                volume = 1.;
            break;
+       case 'w':
+           sscanf (optarg, "%f", &words_per_minute);
+           break;
        default:
            fprintf (stderr, "Type \"morse\" without arguments to get self-doc!\n");
            exit (1);