summaryrefslogtreecommitdiff
path: root/indra/llcommon/llprocesslauncher.h
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2012-01-17 18:55:42 -0500
committerNat Goodspeed <nat@lindenlab.com>2012-01-17 18:55:42 -0500
commitc0731c1c05cafe508c91c5f583301234ba3b8403 (patch)
tree90710d025b74ff4873f681bfb4a06dea8c28d67b /indra/llcommon/llprocesslauncher.h
parenta01dd3549cca620de47fae824198473c51a12f49 (diff)
Add log message if LLProcessLauncher child fails to execv().
On a Posix platform (vfork()/execv() implementation), if for any reason the execv() failed (e.g. executable not on PATH), the viewer would never know, nor the user: the vfork() child produced no output, and terminated with rc 0! Add logging, make child terminate with nonzero rc. Remove pointless addArgument(const char*) overload: this does nothing for you that the compiler won't do implicitly. In llupdateinstaller.cpp, remove pointless c_str() call in addArgument() arg: we were starting with a std::string, then extracting its c_str(), only to construct a whole new std::string from it!
Diffstat (limited to 'indra/llcommon/llprocesslauncher.h')
-rw-r--r--indra/llcommon/llprocesslauncher.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llcommon/llprocesslauncher.h b/indra/llcommon/llprocesslauncher.h
index 954c249147..1daa980c58 100644
--- a/indra/llcommon/llprocesslauncher.h
+++ b/indra/llcommon/llprocesslauncher.h
@@ -28,6 +28,7 @@
#define LL_LLPROCESSLAUNCHER_H
#if LL_WINDOWS
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#endif
@@ -51,7 +52,6 @@ public:
void clearArguments();
void addArgument(const std::string &arg);
- void addArgument(const char *arg);
int launch(void);
bool isRunning(void);
@@ -66,10 +66,12 @@ public:
void orphan(void);
// This needs to be called periodically on Mac/Linux to clean up zombie processes.
+ // (However, as of 2012-01-12 there are no such calls in the viewer code base. :-P )
static void reap(void);
// Accessors for platform-specific process ID
#if LL_WINDOWS
+ // (Windows flavor unused as of 2012-01-12)
HANDLE getProcessHandle() { return mProcessHandle; };
#else
pid_t getProcessID() { return mProcessID; };