[ETC] process nonexistent optional switch arg @ EOL. signed off by stan.smith@intel.com

git-svn-id: svn://openib.tc.cornell.edu/gen1@2303 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/branches/WOF2-1/etc/user/getopt.c b/branches/WOF2-1/etc/user/getopt.c
index 9e05699bddaef1333c3a1e4ba69a263e71fb3252..af9230cb18b2ee185e3e3180533ceb22d93d6360 100644 (file)
--- a/branches/WOF2-1/etc/user/getopt.c
+++ b/branches/WOF2-1/etc/user/getopt.c
@@ -69,14 +69,22 @@ int getopt(int argc, char * const argv[], char const *opts)
                goto out;\r
        }\r
 \r
+       /* process switch argument */\r
        if (argv[optind][2] != '\0') {\r
                optarg = &argv[optind][2];\r
                goto out;\r
        }\r
 \r
        /* switch argument is optional (::) - be careful */\r
-       if (loc[2] == ':' && (argv[optind+1] && argv[optind+1][0] == '-'))\r
-               goto out;\r
+       if (loc[2] == ':' ) {\r
+               if ((argv[optind+1] == NULL)) {\r
+                       /* handle EOL without optional arg */\r
+                       optarg = NULL;\r
+                       goto out;\r
+               }\r
+               if (argv[optind+1] && argv[optind+1][0] == '-')\r
+                       goto out;\r
+       }\r
  \r
        optarg = argv[++optind];\r
        if (!optarg || !(*optarg)) {\r

diff --git a/trunk/etc/user/getopt.c b/trunk/etc/user/getopt.c
index 9e05699bddaef1333c3a1e4ba69a263e71fb3252..af9230cb18b2ee185e3e3180533ceb22d93d6360 100644 (file)
--- a/trunk/etc/user/getopt.c
+++ b/trunk/etc/user/getopt.c
@@ -69,14 +69,22 @@ int getopt(int argc, char * const argv[], char const *opts)
                goto out;\r
        }\r
 \r
+       /* process switch argument */\r
        if (argv[optind][2] != '\0') {\r
                optarg = &argv[optind][2];\r
                goto out;\r
        }\r
 \r
        /* switch argument is optional (::) - be careful */\r
-       if (loc[2] == ':' && (argv[optind+1] && argv[optind+1][0] == '-'))\r
-               goto out;\r
+       if (loc[2] == ':' ) {\r
+               if ((argv[optind+1] == NULL)) {\r
+                       /* handle EOL without optional arg */\r
+                       optarg = NULL;\r
+                       goto out;\r
+               }\r
+               if (argv[optind+1] && argv[optind+1][0] == '-')\r
+                       goto out;\r
+       }\r
  \r
        optarg = argv[++optind];\r
        if (!optarg || !(*optarg)) {\r