Changeset 2675Tweet

Timestamp:

Aug 6, 2008, 10:58:31 PM (15 years ago)

Author:

Pascal Terjan

Message:

• Don't crash when an option with mandatory argument is passed last

Location:

neercs/trunk/src

Files:

• main.c (modified) (1 diff)
• mygetopt.c (modified) (1 diff)

neercs/trunk/src/main.c

@@ -499 +499 @@
             return -1;
             break;
+        case -2:
+            return -1;
         default:
             fprintf(stderr, "Unknown argument #%d\n", myoptind);

neercs/trunk/src/mygetopt.c

@@ -64 +64 @@
                 myoptarg = flag + 2;
             else
-                myoptarg = argv[myoptind++];
+                if(myoptind >= argc)
+                {
+                    fprintf(stderr, "%s: `%s' needs an argument\n", argv[0], flag);
+                    return -2;
+                }
+                else
+                    myoptarg = argv[myoptind++];
             return ret;
         }