AU: Mix stdout and stderr together in the logs.

subprocess.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "update_engine/subprocess.h"
 #include <stdlib.h>
 #include <string.h>
 #include <string>
+#include <unistd.h>
 #include <vector>
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 
 using std::string;
 using std::vector;
 
 namespace chromeos_update_engine {
 
 void Subprocess::GChildExitedCallback(GPid pid, gint status, gpointer data) {
   COMPILE_ASSERT(sizeof(guint) == sizeof(uint32_t),
                  guint_uint32_size_mismatch);
   guint* tag = reinterpret_cast<guint*>(data);
   const SubprocessCallbackRecord& record = Get().callback_records_[*tag];
   if (record.callback)
     record.callback(status, record.callback_data);
   g_spawn_close_pid(pid);
   Get().callback_records_.erase(*tag);
   delete tag;
 }
 
+void Subprocess::GRedirectStderrToStdout(gpointer user_data) {
+  dup2(1, 2);
+}
+
 namespace {
 void FreeArgv(char** argv) {
   for (int i = 0; argv[i]; i++) {
     free(argv[i]);
     argv[i] = NULL;
   }
 }
 
 // Note: Caller responsible for free()ing the returned value!
 char** ArgPointer() {
@@ skipping 76 matching lines @@
   scoped_array<char*> argv(new char*[cmd.size() + 1]);
   for (unsigned int i = 0; i < cmd.size(); i++) {
     argv[i] = strdup(cmd[i].c_str());
   }
   argv[cmd.size()] = NULL;
 
   char** argp = ArgPointer();
   ScopedFreeArgPointer argp_free(argp);
 
   char* child_stdout;
-  char* child_stderr;
 
   bool success = g_spawn_sync(NULL,  // working directory
                               argv.get(),
                               argp,
-                              static_cast<GSpawnFlags>(NULL),  // flags
-                              NULL,  // child setup function
+                              G_SPAWN_STDERR_TO_DEV_NULL,  // flags
+                              GRedirectStderrToStdout,  // child setup function
                               NULL,  // data for child setup function
                               &child_stdout,
-                              &child_stderr,
+                              NULL,
                               return_code,
                               &err);
   FreeArgv(argv.get());
   if (err)
     LOG(INFO) << "err is: " << err->code << ", " << err->message;
   if (child_stdout && strlen(child_stdout))
-    LOG(INFO) << "Subprocess stdout:" << child_stdout;
-  if (child_stderr && strlen(child_stderr))
-    LOG(INFO) << "Subprocess stderr:" << child_stderr;
+    LOG(INFO) << "Subprocess output:\n" << child_stdout;

[Kenneth Waters, 2010/09/17 20:08:28]

Do we need to call "g_free(child_stdout)" here ?

[adlr, 2010/09/17 20:16:27]

ask valgrind?

   return success;
 }
 
 Subprocess* Subprocess::subprocess_singleton_ = NULL;
 
 }  // namespace chromeos_update_engine