From f02f0b3c6b8801584884fb2e4da0707417374185 Mon Sep 17 00:00:00 2001
From: Zdenek Prikryl <zdeny@dhcp-lab-218.englab.brq.redhat.com>
Date: Thu, 2 Apr 2009 14:55:46 +0200
Subject: fixed parsing settings of action plugins

---
 lib/Plugins/RunApp.cpp | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

(limited to 'lib/Plugins/RunApp.cpp')

diff --git a/lib/Plugins/RunApp.cpp b/lib/Plugins/RunApp.cpp
index dc0059d..9f08e05 100644
--- a/lib/Plugins/RunApp.cpp
+++ b/lib/Plugins/RunApp.cpp
@@ -24,20 +24,34 @@
 #include <stdio.h>
 #include "DebugDump.h"
 
-#define COMMAND 0
-#define FILENAME 1
+#define COMMAND     0
+#define FILENAME    1
 
 void CActionRunApp::ParseArgs(const std::string& psArgs, vector_args_t& pArgs)
 {
-    std::string::size_type ii_old = 0, ii_new = 0;
-    ii_new = psArgs.find(",");
-    while (ii_new != std::string::npos)
+    unsigned int ii;
+    bool is_quote = false;
+    std::string item = "";
+    for (ii = 0; ii < psArgs.length(); ii++)
     {
-        pArgs.push_back(psArgs.substr(ii_old, ii_new - ii_old));
-        ii_old = ii_new + 1;
-        ii_new = psArgs.find(",",ii_old);
+        if (psArgs[ii] == '\"')
+        {
+            is_quote = is_quote == true ? false : true;
+        }
+        else if (psArgs[ii] == ',' && !is_quote)
+        {
+            pArgs.push_back(item);
+            item = "";
+        }
+        else
+        {
+            item += psArgs[ii];
+        }
+    }
+    if (item != "")
+    {
+        pArgs.push_back(item);
     }
-    pArgs.push_back(psArgs.substr(ii_old));
 }
 
 void CActionRunApp::Run(const std::string& pDebugDumpDir,
@@ -48,6 +62,8 @@ void CActionRunApp::Run(const std::string& pDebugDumpDir,
 
     vector_args_t args;
 
+    ParseArgs(pArgs, args);
+
     FILE *fp = popen(args[COMMAND].c_str(), "r");
     if (fp == NULL)
     {
-- 
cgit