Changeset 2659

Timestamp:

08/03/2010 21:30:42 (2 years ago)

Author:

chris

Message:

Merge remained of [2597] from trunk into 0.11rc7. Make
LocalProcessStream?? constructor take a std::string& for C++ style.

Location:

box/RELEASE/0.11rc7/lib/server

Files:

• LocalProcessStream.cpp (modified) (4 diffs)
• LocalProcessStream.h (modified) (1 diff)

box/RELEASE/0.11rc7/lib/server/LocalProcessStream.cpp

@@ -44 +44 @@
 //
 // --------------------------------------------------------------------------
-std::auto_ptr<IOStream> LocalProcessStream(const char *CommandLine, pid_t &rPidOut)
+std::auto_ptr<IOStream> LocalProcessStream(const std::string& rCommandLine,
+        pid_t &rPidOut)
 {
 #ifndef WIN32
@@ -50 +51 @@
         // Split up command
         std::vector<std::string> command;
-        SplitString(std::string(CommandLine), ' ', command);
+        SplitString(rCommandLine, ' ', command);
 
         // Build arguments
@@ -138 +139 @@
         startupInfo.dwFlags   |= STARTF_USESTDHANDLES;
 
-        CHAR* commandLineCopy = (CHAR*)malloc(strlen(CommandLine) + 1);
-        strcpy(commandLineCopy, CommandLine);
+        CHAR* commandLineCopy = (CHAR*)malloc(rCommandLine.size() + 1);
+        strcpy(commandLineCopy, rCommandLine.c_str());
 
         BOOL result = CreateProcess(NULL, 
@@ -156 +157 @@
         if(!result)
         {
-                BOX_ERROR("Failed to CreateProcess: '" << CommandLine <<
+                BOX_ERROR("Failed to CreateProcess: '" << rCommandLine <<
                         "': " << GetErrorMessage(GetLastError()));
                 CloseHandle(writeInChild);

box/RELEASE/0.11rc7/lib/server/LocalProcessStream.h

@@ -14 +14 @@
 #include "IOStream.h"
 
-std::auto_ptr<IOStream> LocalProcessStream(const char *CommandLine, pid_t &rPidOut);
+std::auto_ptr<IOStream> LocalProcessStream(const std::string& rCommandLine,
+        pid_t &rPidOut);
 
 #endif // LOCALPROCESSSTREAM__H