]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
agetty: getopt case segment reordering
authorSami Kerola <kerolasa@iki.fi>
Sun, 10 Apr 2011 10:16:15 +0000 (12:16 +0200)
committerKarel Zak <kzak@redhat.com>
Thu, 14 Apr 2011 11:20:26 +0000 (13:20 +0200)
The case clause after getopts is in alphabetical order, just like
option string definition and manual page. The patch also convers
spaces to tabs in this code block.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
term-utils/agetty.c

index f2522614f1d71e1fae06934cb971dfe1a4022662..9b14276be6e342ed7dd3581a726e15cccc172b41 100644 (file)
@@ -386,11 +386,24 @@ parse_args(argc, argv, op)
 
     while ((c = getopt_long(argc, argv, "8cf:hH:iI:l:Lmnst:Uw", longopts, NULL)) != -1) {
        switch (c) {
+       case '8':
+           op->eightbits = 1;
+           break;
        case 'c':
            op->flags |= F_KEEPCFLAGS;
            break;
-       case '8':
-           op->eightbits = 1;
+       case 'f':                               /* custom issue file */
+           op->flags |= F_CUSTISSUE;
+           op->issue = optarg;
+           break;
+       case 'h':                               /* enable h/w flow control */
+           op->flags |= F_RTSCTS;
+           break;
+       case 'H':                               /* fake login host */
+           fakehost = optarg;
+           break;
+       case 'i':                               /* do not show /etc/issue */
+           op->flags &= ~F_ISSUE;
            break;
        case 'I':
            op->initstring = xmalloc(strlen(optarg) + 1);
@@ -428,26 +441,12 @@ parse_args(argc, argv, op)
            }
            op->flags |= F_INITSTRING;
            break;
-
-       case 'L':                               /* force local */
-           op->flags |= F_LOCAL;
-           break;
-       case 'H':                               /* fake login host */
-           fakehost = optarg;
-           break;
-       case 'f':                               /* custom issue file */
-           op->flags |= F_CUSTISSUE;
-           op->issue = optarg;
-           break;
-       case 'h':                               /* enable h/w flow control */
-           op->flags |= F_RTSCTS;
-           break;
-       case 'i':                               /* do not show /etc/issue */
-           op->flags &= ~F_ISSUE;
-           break;
        case 'l':
            op->login = optarg;                 /* non-default login program */
            break;
+       case 'L':                               /* force local */
+           op->flags |= F_LOCAL;
+           break;
        case 'm':                               /* parse modem status message */
            op->flags |= F_PARSE;
            break;
@@ -461,18 +460,18 @@ parse_args(argc, argv, op)
            if ((op->timeout = atoi(optarg)) <= 0)
                error(_("bad timeout value: %s"), optarg);
            break;
-       case 'w':
-           op->flags |= F_WAITCRLF;
-           break;
        case 'U':
            op->flags |= F_LCUC;
            break;
-        case VERSION_OPTION:
-            printf(_("%s from %s\n"), program_invocation_short_name,
-                                      PACKAGE_STRING);
-            exit(EXIT_SUCCESS);
-        case HELP_OPTION:
-            usage(stdout);
+       case 'w':
+           op->flags |= F_WAITCRLF;
+           break;
+       case VERSION_OPTION:
+           printf(_("%s from %s\n"), program_invocation_short_name,
+                                     PACKAGE_STRING);
+           exit(EXIT_SUCCESS);
+       case HELP_OPTION:
+           usage(stdout);
        default:
            usage(stderr);
        }