commit 7af1c6f04dd4987eca4404b502c476da5e2e5aa5
author Alexandros Frantzis <alexandros.frantzis@linaro.org> Thu Jun 09 17:49:13 2011 +0300
committer Alexandros Frantzis <alexandros.frantzis@linaro.org> Thu Jun 09 17:49:13 2011 +0300
tree 1732a55ea2d620de29538cffca4b42de349034fb
parent 5bd5d7683162084dd8207d16fcd493f78c869ef7

Ensure short and long options can coexist without issues.

src/options.cpp

diff --git a/src/options.cpp b/src/options.cpp
index 2e44219..8a06851 100644
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -63,9 +63,9 @@
 Options::parse_args(int argc, char **argv)
 {
     while (1) {
-        int option_index = 0;
+        int option_index = -1;
         int c;
-        const char *optname;
+        const char *optname = "";
 
         c = getopt_long(argc, argv, "b:",
                         long_options, &option_index);
@@ -74,7 +74,8 @@
         if (c == ':' || c == '?')
             return false;
 
-        optname = long_options[option_index].name;
+        if (option_index != -1)
+            optname = long_options[option_index].name;
 
         if (c == 'b' || !strcmp(optname, "benchmark"))
             Options::benchmarks.push_back(optarg);