dtrace: Fix for the argument validation code.

The command line argument validation code failed to correctly identify some of
the potential failure cases, and sadly, also one specific valid use case.  This
has been corrected.

Signed-off-by: Kris Van Hees <kris.van.hees@oracle.com>
Orabug: 17313687

Signed-off-by: Jerry Snitselaar <jerry.snitselaar@oracle.com>

diff --git a/scripts/dwarf2ctf/dwarf2ctf.c b/scripts/dwarf2ctf/dwarf2ctf.c
index dda3b9aa6d3939e508826c4becd7d2b75e738141..b0ad0f75a63f571bef4138cefce22255d4ec7acb 100644 (file)
--- a/scripts/dwarf2ctf/dwarf2ctf.c
+++ b/scripts/dwarf2ctf/dwarf2ctf.c
@@ -659,13 +659,12 @@ int main(int argc, char *argv[])
 
        trace = getenv("DWARF2CTF_TRACE");
 
-       if (((argc < 2) && (strcmp(argv[1], "-e") == 0)) ||
-           (argc < 6 && (strcmp(argv[1], "-e") != 0))) {
+       if (argc < 2 || strcmp(argv[1], "-e") == 0 ||
+           (argc < 6 && (strcmp(argv[2], "-e") != 0))) {
                fprintf(stderr, "Syntax: dwarf2ctf outputdir objects.builtin modules.builtin dedup.blacklist\n");
                fprintf(stderr, "                  member.blacklist vmlinux.o module.o...,\n");
                fprintf(stderr, "        or dwarf2ctf outputdir -e module.o ... "
-                       "for (inefficient)\n");
-               fprintf(stderr, "external module use\n");
+                       "for external module use\n");
                exit(1);
        }