Fix the incorrect parser to the input parameter.

git-svn-id: https://buildtools.tianocore.org/svn/buildtools/trunk/BaseTools@1600 7335b38e-4728-0410-8992-fb3ffe349368

diff --git a/Source/C/GenBootSector/GenBootSector.c b/Source/C/GenBootSector/GenBootSector.c
index 58e10d4..47b5c5c 100644 (file)
--- a/Source/C/GenBootSector/GenBootSector.c
+++ b/Source/C/GenBootSector/GenBootSector.c
@@ -669,9 +669,14 @@ main (
     if ((stricmp (argv[Index], "-l") == 0) || (stricmp (argv[Index], "--list") == 0)) {\r
       ListDrive ();\r
       return 0;\r
-    } else if ((stricmp (argv[Index], "-m") == 0) || (stricmp (argv[Index], "--mbr") == 0)) {\r
+    } \r
+    \r
+    if ((stricmp (argv[Index], "-m") == 0) || (stricmp (argv[Index], "--mbr") == 0)) {\r
       ProcessMbr = TRUE;\r
-    } else if ((stricmp (argv[Index], "-i") == 0) || (stricmp (argv[Index], "--input") == 0)) {\r
+      continue;\r
+    } \r
+    \r
+    if ((stricmp (argv[Index], "-i") == 0) || (stricmp (argv[Index], "--input") == 0)) {\r
       InputPathInfo.Path  = argv[Index + 1];\r
       InputPathInfo.Input = TRUE;\r
       if (InputPathInfo.Path == NULL) {\r
@@ -683,7 +688,10 @@ main (
         return 1;       \r
       }\r
       ++Index;\r
-    } else if ((stricmp (argv[Index], "-o") == 0) || (stricmp (argv[Index], "--output") == 0)) {\r
+      continue;\r
+    }\r
+\r
+    if ((stricmp (argv[Index], "-o") == 0) || (stricmp (argv[Index], "--output") == 0)) {\r
       OutputPathInfo.Path  = argv[Index + 1];\r
       OutputPathInfo.Input = FALSE;\r
       if (OutputPathInfo.Path == NULL) {\r
@@ -695,17 +703,28 @@ main (
         return 1;       \r
       }\r
       ++Index;\r
-    } else if ((stricmp (argv[Index], "-h") == 0) || (stricmp (argv[Index], "--help") == 0)) {\r
+      continue;\r
+    }\r
+    \r
+    if ((stricmp (argv[Index], "-h") == 0) || (stricmp (argv[Index], "--help") == 0)) {\r
       PrintUsage ();\r
       return 0;\r
-    } else if (stricmp (argv[Index], "--version") == 0) {\r
+    } \r
+    \r
+    if (stricmp (argv[Index], "--version") == 0) {\r
       Version ();\r
       return 0;\r
-    } if ((stricmp (argv[Index], "-v") == 0) || (stricmp (argv[Index], "--verbose") == 0)) {\r
+    } \r
+    \r
+    if ((stricmp (argv[Index], "-v") == 0) || (stricmp (argv[Index], "--verbose") == 0)) {\r
       continue;\r
-    } if ((stricmp (argv[Index], "-q") == 0) || (stricmp (argv[Index], "--quiet") == 0)) {\r
+    } \r
+    \r
+    if ((stricmp (argv[Index], "-q") == 0) || (stricmp (argv[Index], "--quiet") == 0)) {\r
       continue;\r
-    } else if ((stricmp (argv[Index], "-d") == 0) || (stricmp (argv[Index], "--debug") == 0)) {\r
+    } \r
+    \r
+    if ((stricmp (argv[Index], "-d") == 0) || (stricmp (argv[Index], "--debug") == 0)) {\r
       EfiStatus = AsciiStringToUint64 (argv[Index + 1], FALSE, &LogLevel);\r
       if (EFI_ERROR (EfiStatus)) {\r
         Error (NULL, 0, 1003, "Invalid option value", "%s = %s", argv[Index], argv[Index + 1]);\r
@@ -718,13 +737,14 @@ main (
       SetPrintLevel (LogLevel);\r
       DebugMsg (NULL, 0, 9, "Debug Mode Set", "Debug Output Mode Level %s is set!", argv[Index + 1]);\r
       ++Index;\r
-    } else {\r
-      //\r
-      // Don't recognize the parameter.\r
-      //\r
-      Error (NULL, 0, 1000, "Unknown option", "%s", argv[Index]);\r
-      return 1;\r
+      continue;\r
     }\r
+\r
+    //\r
+    // Don't recognize the parameter.\r
+    //\r
+    Error (NULL, 0, 1000, "Unknown option", "%s", argv[Index]);\r
+    return 1;\r
   }\r
   \r
   if (InputPathInfo.Path == NULL) {\r

diff --git a/Source/C/GnuGenBootSector/GnuGenBootSector.c b/Source/C/GnuGenBootSector/GnuGenBootSector.c
index 55bc5a5..178bec2 100644 (file)
--- a/Source/C/GnuGenBootSector/GnuGenBootSector.c
+++ b/Source/C/GnuGenBootSector/GnuGenBootSector.c
@@ -331,9 +331,14 @@ main (
     if ((stricmp (argv[Index], "-l") == 0) || (stricmp (argv[Index], "--list") == 0)) {\r
       ListDrive ();\r
       return 0;\r
-    } else if ((stricmp (argv[Index], "-m") == 0) || (stricmp (argv[Index], "--mbr") == 0)) {\r
+    } \r
+    \r
+    if ((stricmp (argv[Index], "-m") == 0) || (stricmp (argv[Index], "--mbr") == 0)) {\r
       ProcessMbr = TRUE;\r
-    } else if ((stricmp (argv[Index], "-i") == 0) || (stricmp (argv[Index], "--input") == 0)) {\r
+      continue;\r
+    }\r
+    \r
+    if ((stricmp (argv[Index], "-i") == 0) || (stricmp (argv[Index], "--input") == 0)) {\r
       InputPathInfo.Path  = argv[Index + 1];\r
       InputPathInfo.Input = TRUE;\r
       if (InputPathInfo.Path == NULL) {\r
@@ -345,7 +350,10 @@ main (
         return 1;       \r
       }\r
       ++Index;\r
-    } else if ((stricmp (argv[Index], "-o") == 0) || (stricmp (argv[Index], "--output") == 0)) {\r
+      continue;\r
+    }\r
+    \r
+    if ((stricmp (argv[Index], "-o") == 0) || (stricmp (argv[Index], "--output") == 0)) {\r
       OutputPathInfo.Path  = argv[Index + 1];\r
       OutputPathInfo.Input = FALSE;\r
       if (OutputPathInfo.Path == NULL) {\r
@@ -357,17 +365,28 @@ main (
         return 1;       \r
       }\r
       ++Index;\r
-    } else if ((stricmp (argv[Index], "-h") == 0) || (stricmp (argv[Index], "--help") == 0)) {\r
+      continue;\r
+    }\r
+    \r
+    if ((stricmp (argv[Index], "-h") == 0) || (stricmp (argv[Index], "--help") == 0)) {\r
       PrintUsage ();\r
       return 0;\r
-    } else if (stricmp (argv[Index], "--version") == 0) {\r
+    }\r
+    \r
+    if (stricmp (argv[Index], "--version") == 0) {\r
       Version ();\r
       return 0;\r
-    } if ((stricmp (argv[Index], "-v") == 0) || (stricmp (argv[Index], "--verbose") == 0)) {\r
+    } \r
+    \r
+    if ((stricmp (argv[Index], "-v") == 0) || (stricmp (argv[Index], "--verbose") == 0)) {\r
       continue;\r
-    } if ((stricmp (argv[Index], "-q") == 0) || (stricmp (argv[Index], "--quiet") == 0)) {\r
+    } \r
+    \r
+    if ((stricmp (argv[Index], "-q") == 0) || (stricmp (argv[Index], "--quiet") == 0)) {\r
       continue;\r
-    } else if ((stricmp (argv[Index], "-d") == 0) || (stricmp (argv[Index], "--debug") == 0)) {\r
+    } \r
+    \r
+    if ((stricmp (argv[Index], "-d") == 0) || (stricmp (argv[Index], "--debug") == 0)) {\r
       EfiStatus = AsciiStringToUint64 (argv[Index + 1], FALSE, &LogLevel);\r
       if (EFI_ERROR (EfiStatus)) {\r
         Error (NULL, 0, 1003, "Invalid option value", "%s = %s", argv[Index], argv[Index + 1]);\r
@@ -380,13 +399,14 @@ main (
       SetPrintLevel (LogLevel);\r
       DebugMsg (NULL, 0, 9, "Debug Mode Set", "Debug Output Mode Level %s is set!", argv[Index + 1]);\r
       ++Index;\r
-    } else {\r
-      //\r
-      // Don't recognize the parameter.\r
-      //\r
-      Error (NULL, 0, 1000, "Unknown option", "%s", argv[Index]);\r
-      return 1;\r
+      continue;\r
     }\r
+\r
+    //\r
+    // Don't recognize the parameter.\r
+    //\r
+    Error (NULL, 0, 1000, "Unknown option", "%s", argv[Index]);\r
+    return 1;\r
   }\r
   \r
   if (InputPathInfo.Path == NULL) {\r