From 3a76b3435abb1b51387140bd45bdfe03b2ea81f9 Mon Sep 17 00:00:00 2001
From: Jan Kaluza <hanzz.k@gmail.com>
Date: Tue, 2 Aug 2011 12:38:40 +0200
Subject: [PATCH] Better spawning

---
 src/CMakeLists.txt          |  2 +-
 src/networkpluginserver.cpp | 56 ++++++-------------------------------
 2 files changed, 10 insertions(+), 48 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0a25d225..afddee24 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -12,7 +12,7 @@ endif()
 ADD_LIBRARY(transport SHARED ${HEADERS} ${SRC} ${SWIFTEN_SRC} ${PROTOBUF_SRC} ${PROTOBUF_HDRS})
 ADD_DEFINITIONS(-fPIC)
 
-TARGET_LINK_LIBRARIES(transport ${Boost_LIBRARIES} ${SQLITE3_LIBRARIES} ${SWIFTEN_LIBRARY} ${PROTOBUF_LIBRARIES} ${LOG4CXX_LIBRARIES})
+TARGET_LINK_LIBRARIES(transport ${Boost_LIBRARIES} ${SQLITE3_LIBRARIES} ${SWIFTEN_LIBRARY} ${PROTOBUF_LIBRARIES} ${LOG4CXX_LIBRARIES} -lpopt)
 
 SET_TARGET_PROPERTIES(transport PROPERTIES
       VERSION ${TRANSPORT_VERSION} SOVERSION ${TRANSPORT_VERSION}
diff --git a/src/networkpluginserver.cpp b/src/networkpluginserver.cpp
index 988667f5..dbed1b3e 100644
--- a/src/networkpluginserver.cpp
+++ b/src/networkpluginserver.cpp
@@ -41,6 +41,7 @@
 #include "sys/wait.h"
 #include "sys/signal.h"
 #include "log4cxx/logger.h"
+#include "popt.h"
 
 using namespace log4cxx;
 
@@ -91,64 +92,25 @@ class NetworkFactory : public Factory {
 	wrap.set_type(TYPE); \
 	wrap.set_payload(MESSAGE); \
 	wrap.SerializeToString(&MESSAGE);
-	
-static std::vector<std::string> &split(const std::string &s, char delim, std::vector<std::string> &elems) {
-    std::stringstream ss(s);
-    std::string item;
-    while(std::getline(ss, item, delim)) {
-        elems.push_back(item);
-    }
-    return elems;
-}
 
-
-static std::vector<std::string> split(const std::string &s, char delim) {
-    std::vector<std::string> elems;
-    return split(s, delim, elems);
-}
-	
 static pid_t exec_(std::string path, const char *host, const char *port, const char *config) {
+	path += std::string(" --host ") + host + " --port " + port + " " + config;
 	LOG4CXX_INFO(logger, "Starting new backend " << path);
-	std::vector<std::string> cmd = split(path, ' ');
-	char **argv = (char **) malloc(sizeof(char *) * (cmd.size() + 6));
-	int i = 0;
-	BOOST_FOREACH(std::string c, cmd) {
-		argv[i] = (char *) malloc(c.size() + 1);
-		strcpy(argv[i++], c.c_str());
-// 		std::cout << i << "\n";
-	}
-
-	argv[i] = (char *) malloc(100);
-	strcpy(argv[i++], "--host");
-
-	argv[i] = (char *) malloc(100);
-	strcpy(argv[i++], host);
-
-	argv[i] = (char *) malloc(100);
-	strcpy(argv[i++], "--port");
-
-	argv[i] = (char *) malloc(100);
-	strcpy(argv[i++], port);
-
-	argv[i] = (char *) malloc(100);
-	strcpy(argv[i++], config);
-
-	argv[i] = 0;
+	char *p = (char *) malloc(path.size() + 1);
+	strcpy(p, path.c_str());
+	int argc;
+	char **argv;
+	poptParseArgvString(p, &argc, (const char ***) &argv);
 
 // 	char *argv[] = {(char*)script_name, '\0'}; 
 	pid_t pid = fork();
 	if ( pid == 0 ) {
 		// child process
-		exit(execv(cmd[0].c_str(), argv));
+		exit(execv(argv[0], argv));
 	} else if ( pid < 0 ) {
 		// fork failed
 	}
-
-	i = 0;
-	while (argv[i] != 0) {
-		free(argv[i++]);
-	}
-	free(argv);
+	free(p);
 
 	return pid;
 }