Changeset 3701

Timestamp:

Mar 16, 2011, 5:55:12 PM (14 years ago)

Author:

bird

Message:

emxomfar: Fixed and relaxed the command/option parsing so that they can be given with a dash (was broken) and in more than one argument. Should probably insist on the command comming first, but who cares. References #184.

File:

• trunk/emx/src/emxomf/emxomfar.c (modified) (1 diff)

trunk/emx/src/emxomf/emxomfar.c

@@ -257 +257 @@
   page_size = 0;
 
-  /* Parse the command line.  First, check for an -p# option. */
+  /* Set initial values. */
+
+  verbose = FALSE; 
+  silent  = FALSE; 
+  cmd     = 0;
+
+  /* Skip a leading dash, it's optional. */
 
   i = 1;
-  if (i < argc && argv[i][0] == '-')
-    {
-      s = argv[i]+1;
-      switch (*s)
-        {
-        case 'p':
-          ++s;
-          page_size = strtol (s, &s, 10);
-          if (page_size < 1 || *s != 0)
-            usage ();
-          ++i;
-          break;
-        default:
-          usage ();
-        }
-    }
-
-  /* At least 2 arguments must be given: the command and the library
-     name. */
-
-  if (argc - i < 2)
-    usage ();
-
-  /* Set initial values. */
-
-  verbose = FALSE; silent = FALSE; cmd = 0;
-
-  /* Skip a leading - character, it's optional. */
-
   s = argv[i++];
   if (*s == '-')
     ++s;
 
-  /* Parse the command. */
-
-  while (*s != 0)
-    {
-      new_cmd = 0;
-      switch (*s)
-        {
-        case 'v':
-          verbose = TRUE;
-          break;
-        case 'c':
-          silent = TRUE;
-          break;
-        case 's':
-          if (cmd == 0)
-            new_cmd = 's';
-          break;
-        case 'd':
-        case 'r':
-        case 't':
-        case 'x':
-          new_cmd = *s;
-          break;
-        case 'q':
-          new_cmd = 'r';
-          break;
-        case 'u':
-          if (cmd == 0)
-            new_cmd = 'r';
-          break;
-        case 'l':
-        case 'o':
-          break;
-        default:
-          usage ();
-        }
-      ++s;
-      if (new_cmd != 0)
-        {
-          if (cmd != 0)
-            usage ();
-          cmd = new_cmd;
-        }
-    }
-
-  /* Complain if no command letter was given. */
-
-  if (cmd == 0)
+  /* Parse the command and options. */
+
+  for (;;)
+    {
+      while (*s != 0)
+        {
+          new_cmd = 0;
+          switch (*s)
+            {
+            case 'v':
+              verbose = TRUE;
+              break;
+            case 'c':
+              silent = TRUE;
+              break;
+            case 's':
+              if (cmd == 0)
+                new_cmd = 's';
+              break;
+            case 'd':
+            case 'r':
+            case 't':
+            case 'x':
+              new_cmd = *s;
+              break;
+            case 'q':
+              new_cmd = 'r';
+              break;
+            case 'u':
+              if (cmd == 0)
+                new_cmd = 'r';
+              break;
+            case 'l':
+            case 'o':
+              break;
+            case 'p':
+              ++s;
+              page_size = strtol (s, &s, 10);
+              if (page_size < 1 || *s != 0)
+                usage ();
+              --s;
+              break;
+            default:
+              usage ();
+            }
+          ++s;
+          if (new_cmd != 0)
+            {
+              if (cmd != 0)
+                usage ();
+              cmd = new_cmd;
+            }
+        }
+
+      /* more options? */
+
+      if (i >= argc)
+        usage ();
+      s = argv[i];
+      if (*s != '-')
+        break; /* not an option */
+      
+      s++;
+      i++;
+      if (*s == '-' && !s[1])
+        break; /* end of options: '--' */
+    }
+
+  /* Complain if no command letter or library was given. */
+
+  if (cmd == 0 || i >= argc)
     usage ();