From 8e74398ed7fa4f04f7bbb954ee8aca06b0f430c4 Mon Sep 17 00:00:00 2001
From: John Grosen <jmgrosen@gmail.com>
Date: Thu, 12 Jun 2014 17:06:59 -0700
Subject: [PATCH] Fixed command line args parsing bug

---
 libraries/shared/src/HifiConfigVariantMap.cpp | 47 +++++++++----------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/libraries/shared/src/HifiConfigVariantMap.cpp b/libraries/shared/src/HifiConfigVariantMap.cpp
index e8ab59ce2d..7975059736 100644
--- a/libraries/shared/src/HifiConfigVariantMap.cpp
+++ b/libraries/shared/src/HifiConfigVariantMap.cpp
@@ -19,71 +19,70 @@
 #include "HifiConfigVariantMap.h"
 
 QVariantMap HifiConfigVariantMap::mergeCLParametersWithJSONConfig(const QStringList& argumentList) {
-    
+
     QVariantMap mergedMap;
-    
+
     // Add anything in the CL parameter list to the variant map.
     // Take anything with a dash in it as a key, and the values after it as the value.
-    
+
     const QString DASHED_KEY_REGEX_STRING = "(^-{1,2})([\\w-]+)";
     QRegExp dashedKeyRegex(DASHED_KEY_REGEX_STRING);
-    
+
     int keyIndex = argumentList.indexOf(dashedKeyRegex);
     int nextKeyIndex = 0;
-    
+
     // check if there is a config file to read where we can pull config info not passed on command line
     const QString CONFIG_FILE_OPTION = "--config";
-    
+
     while (keyIndex != -1) {
         if (argumentList[keyIndex] != CONFIG_FILE_OPTION) {
             // we have a key - look forward to see how many values associate to it
             QString key = dashedKeyRegex.cap(2);
-            
+
             nextKeyIndex = argumentList.indexOf(dashedKeyRegex, keyIndex + 1);
-            
+
             if (nextKeyIndex == keyIndex + 1 || keyIndex == argumentList.size() - 1) {
-                // there's no value associated with this option, it's a boolean
-                // so add it to the variant map with NULL as value
-                mergedMap.insertMulti(key, QVariant());
+                // this option is simply a switch, so add it to the map with a value of `true`
+                mergedMap.insertMulti(key, QVariant(true));
             } else {
-                int maxIndex = (nextKeyIndex == -1) ? argumentList.size() - 1: nextKeyIndex;
-                
+                int maxIndex = (nextKeyIndex == -1) ? argumentList.size(): nextKeyIndex;
+
                 // there's at least one value associated with the option
                 // pull the first value to start
                 QString value = argumentList[keyIndex + 1];
-                
+
                 // for any extra values, append them, with a space, to the value string
-                for (int i = keyIndex + 2; i <= maxIndex; i++) {
+                for (int i = keyIndex + 2; i < maxIndex; i++) {
                     value +=  " " + argumentList[i];
                 }
-                
+
                 // add the finalized value to the merged map
                 mergedMap.insert(key, value);
             }
-            
+
             keyIndex = nextKeyIndex;
         } else {
             keyIndex = argumentList.indexOf(dashedKeyRegex, keyIndex + 1);
         }
     }
-    
+
     int configIndex = argumentList.indexOf(CONFIG_FILE_OPTION);
-    
+
     if (configIndex != -1) {
         // we have a config file - try and read it
         QString configFilePath = argumentList[configIndex + 1];
         QFile configFile(configFilePath);
-        
+
         if (configFile.exists()) {
             qDebug() << "Reading JSON config file at" << configFilePath;
             configFile.open(QIODevice::ReadOnly);
-            
+
             QJsonDocument configDocument = QJsonDocument::fromJson(configFile.readAll());
             QJsonObject rootObject = configDocument.object();
-            
+
             // enumerate the keys of the configDocument object
             foreach(const QString& key, rootObject.keys()) {
-                
+
                 if (!mergedMap.contains(key)) {
                     // no match in existing list, add it
                     mergedMap.insert(key, QVariant(rootObject[key]));
@@ -93,6 +92,6 @@ QVariantMap HifiConfigVariantMap::mergeCLParametersWithJSONConfig(const QStringL
             qDebug() << "Could not find JSON config file at" << configFilePath;
         }
     }
-    
+
     return mergedMap;
 }