Use val field of getopt option struct

src/main.c

@@ -164,13 +164,13 @@ int main(int argc, char **argv)
 {
     static struct option longOptions[] =
     {
-        { "help", no_argument, 0, 0 },
-        { "version", no_argument, 0, 0 },
-        { "libs", no_argument, 0, 0 },
-        { "skip-machine-check", no_argument, 0, 0 },
-        { "input", required_argument, 0, 0 },
-        { "output", required_argument, 0, 0 },
-        { "type", required_argument, 0, 0 },
+        { "help", no_argument, 0, 'h' },
+        { "version", no_argument, 0, 'v' },
+        { "libs", no_argument, 0, 'l' },
+        { "skip-machine-check", no_argument, 0, 's' },
+        { "input", required_argument, 0, 'i' },
+        { "output", required_argument, 0, 'o' },
+        { "type", required_argument, 0, 't' },
         { 0, 0, 0, 0 }
     };
 
@@ -202,34 +202,26 @@ int main(int argc, char **argv)
 
     while((option = getopt_long(argc, argv, "hvlsi:o:t:", longOptions, &optIndex)) != -1)
     {
-        if(option == 'h' || option == '?' || (option == 0 && strcmp(longOptions[optIndex].name, "help") == 0))
-        {
-            dispHelp(argv);
-            freeAllMainStructs(&offsets, &xexHeader, &secInfoHeader, &peData,
-                               &optHeaderEntries, &optHeaders);
-            return SUCCESS;
-        }
-        else if(option == 'v' || (option == 0 && strcmp(longOptions[optIndex].name, "version") == 0))
+        switch(option)
         {
+            case 'v':
                 dispVer();
                 freeAllMainStructs(&offsets, &xexHeader, &secInfoHeader, &peData,
                                    &optHeaderEntries, &optHeaders);
                 return SUCCESS;
-        }
-        else if(option == 'l' || (option == 0 && strcmp(longOptions[optIndex].name, "libs") == 0))
-        {
+
+            case 'l':
                 dispLibs();
                 freeAllMainStructs(&offsets, &xexHeader, &secInfoHeader, &peData,
                                    &optHeaderEntries, &optHeaders);
                 return SUCCESS;
-        }
-        else if(option == 's' || (option == 0 && strcmp(longOptions[optIndex].name, "skip-machine-check") == 0))
-        {
+
+            case 's':
                 printf("%s WARNING: Skipping machine ID check.\n", SYNTHXEX_PRINT_STEM);
                 skipMachineCheck = true;
-        }
-        else if(option == 'i' || (option == 0 && strcmp(longOptions[optIndex].name, "input") == 0))
-        {
+                break;
+
+            case 'i':
                 gotInput = true;
                 pePath = malloc(strlen(optarg) + 1);
 
@@ -243,9 +235,9 @@ int main(int argc, char **argv)
                 }
 
                 strcpy(pePath, optarg);
-        }
-        else if(option == 'o' || (option == 0 && strcmp(longOptions[optIndex].name, "output") == 0))
-        {
+                break;
+
+            case 'o':
                 gotOutput = true;
                 xexfilePath = malloc(strlen(optarg) + 1);
 
@@ -259,9 +251,9 @@ int main(int argc, char **argv)
                 }
 
                 strcpy(xexfilePath, optarg);
-        }
-        else if(option == 't' || (option == 0 && strcmp(longOptions[optIndex].name, "type") == 0))
-        {
+                break;
+
+            case 't':
                 if(strcmp(optarg, "title") == 0)
                 { xexHeader->moduleFlags = XEX_MOD_FLAG_TITLE; }
                 else if(strcmp(optarg, "titledll") == 0)
@@ -281,6 +273,15 @@ int main(int argc, char **argv)
                                        &optHeaderEntries, &optHeaders);
                     return -1;
                 }
+
+                break;
+
+            case 'h':
+            default:
+                dispHelp(argv);
+                freeAllMainStructs(&offsets, &xexHeader, &secInfoHeader, &peData,
+                                   &optHeaderEntries, &optHeaders);
+                return SUCCESS;
         }
     }