]> git.wh0rd.org Git - elf2flt.git/commitdiff
The current code misses checking a few args in order to determine the
authorDavid McCullough <davidm@snapgear.com>
Tue, 22 Jun 2010 06:12:47 +0000 (06:12 +0000)
committerDavid McCullough <davidm@snapgear.com>
Tue, 22 Jun 2010 06:12:47 +0000 (06:12 +0000)
default "print" mode (ktrace/l1stack/...).  Rather than update a list
that people easily forget, rework the code to generically detect that
no arguments have been specified.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
flthdr.c

index 04851071a27a80386e95e664db5fa071e1c5c629..dfc9107d654c2c4a1b1732c9408825eec54a00aa 100644 (file)
--- a/flthdr.c
+++ b/flthdr.c
@@ -326,11 +326,12 @@ usage(char *s)
 int
 main(int argc, char *argv[])
 {
-       int c;
+       int c, noargs;
        char *ofile = NULL, *ifile;
 
        elf2flt_progname = argv[0];
 
+       noargs = 1;
        while ((c = getopt(argc, argv, "pPdzZrRuUkKs:o:")) != EOF) {
                switch (c) {
                case 'p': print = 1;                break;
@@ -353,6 +354,7 @@ main(int argc, char *argv[])
                        usage("invalid option");
                        break;
                }
+               noargs = 0;
        }
 
        if (optind >= argc)
@@ -361,9 +363,9 @@ main(int argc, char *argv[])
        if (ofile && argc - optind > 1)
                usage("-o can only be used with a single file");
 
-       if (!print && !docompress && !ramload && !stacksize) /* no args == print */
+       if (!print && noargs) /* no args == print */
                print = argc - optind; /* greater than 1 is short format */
-       
+
        for (c = optind; c < argc; c++) {
                ifile = argv[c];
                if (!ofile)