src/main.c

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