From 658622eb5e1b81d394f066df44bc9f0abe9cc807 Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Mon, 11 Jan 2010 07:18:56 +0100
Subject: RunApp: safer chdir. Overhauled "sparn a child and get its output" in
 general

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
 lib/Plugins/RunApp.cpp | 32 ++++++++------------------------
 1 file changed, 8 insertions(+), 24 deletions(-)

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

diff --git a/lib/Plugins/RunApp.cpp b/lib/Plugins/RunApp.cpp
index f7cbc01..c1f725b 100644
--- a/lib/Plugins/RunApp.cpp
+++ b/lib/Plugins/RunApp.cpp
@@ -33,7 +33,8 @@ using namespace std;
 
 void CActionRunApp::Run(const char *pActionDir, const char *pArgs)
 {
-    /* Don't update_client() - actions run at crash time */
+    /* Don't update_client() - actions run at crash time, there is no client
+     * to talk to at that point */
     log("RunApp('%s','%s')", pActionDir, pArgs);
 
     vector_string_t args;
@@ -45,38 +46,21 @@ void CActionRunApp::Run(const char *pActionDir, const char *pArgs)
         return;
     }
 
-//FIXME: need to be able to escape " in .conf
-    /* Chdir to the dump dir. Command can analyze component and such.
+    /* NB: we chdir to the dump dir. Command can analyze component and such.
      * Example:
      * test x"`cat component`" = x"xorg-x11-apps" && cp /var/log/Xorg.0.log .
      */
-//Can do it using chdir() in child if we'd open-code popen
-    string cd_and_cmd = ssprintf("cd '%s'; %s", pActionDir, cmd);
-    VERB1 log("RunApp: executing '%s'", cd_and_cmd.c_str());
-    FILE *fp = popen(cd_and_cmd.c_str(), "r");
-    if (fp == NULL)
-    {
-        /* Happens only on resource starvation (fork fails or out-of-mem) */
-        return;
-    }
-
-//FIXME: RunApp("gzip -9 </var/log/Xorg.0.log", "Xorg.0.log.gz") fails
-//since we mangle NULs.
-    string output;
-    char line[1024];
-    while (fgets(line, 1024, fp) != NULL)
-    {
-        if (args.size() > FILENAME)
-            output += line;
-    }
-    pclose(fp);
+    size_t cmd_out_size;
+    char *cmd_out = run_in_shell_and_save_output(/*flags:*/ 0, cmd, pActionDir, &cmd_out_size);
 
     if (args.size() > FILENAME)
     {
         CDebugDump dd;
         dd.Open(pActionDir);
-        dd.SaveText(args[FILENAME].c_str(), output.c_str());
+        dd.SaveBinary(args[FILENAME].c_str(), cmd_out, cmd_out_size);
     }
+
+    free(cmd_out);
 }
 
 PLUGIN_INFO(ACTION,
-- 
cgit 


From 14ef0cfe72faf6696df3ef8f42927e9458ccbeeb Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Mon, 11 Jan 2010 07:22:13 +0100
Subject: *: misc fixes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
 lib/Plugins/RunApp.cpp | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/lib/Plugins/RunApp.cpp b/lib/Plugins/RunApp.cpp
index c1f725b..e2147e2 100644
--- a/lib/Plugins/RunApp.cpp
+++ b/lib/Plugins/RunApp.cpp
@@ -40,6 +40,10 @@ void CActionRunApp::Run(const char *pActionDir, const char *pArgs)
     vector_string_t args;
     parse_args(pArgs, args, '"');
 
+    if (args.size() <= COMMAND)
+    {
+        return;
+    }
     const char *cmd = args[COMMAND].c_str();
     if (!cmd[0])
     {
-- 
cgit