AU: Pass opened device fd from update engine to bspatch.

subprocess.cc

 // Copyright (c) 2009 The Chromium OS 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>
@@ skipping 117 matching lines @@
   callback_records_[*tag] = callback_record;
   return *tag;
 }
 
 void Subprocess::CancelExec(uint32_t tag) {
   if (callback_records_[tag].callback) {
     callback_records_[tag].callback = NULL;
   }
 }
 
-bool Subprocess::SynchronousExec(const std::vector<std::string>& cmd,
-                                 int* return_code) {
+bool Subprocess::SynchronousExecFlags(const std::vector<std::string>& cmd,
+                                      int* return_code,
+                                      GSpawnFlags flags) {
   GError* err = NULL;
   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());
     if (!argv[i]) {
       FreeArgvInError(argv.get());  // NULL in argv[i] terminates argv.
       return false;
     }
   }
   argv[cmd.size()] = NULL;
 
   char** argp = ArgPointer();
   if (!argp) {
     FreeArgvInError(argv.get());  // NULL in argv[i] terminates argv.
     return false;
   }
   ScopedFreeArgPointer argp_free(argp);
 
   char* child_stdout;
 
-  bool success = g_spawn_sync(NULL,  // working directory
-                              argv.get(),
-                              argp,
-                              G_SPAWN_STDERR_TO_DEV_NULL,  // flags
-                              GRedirectStderrToStdout,  // child setup function
-                              NULL,  // data for child setup function
-                              &child_stdout,
-                              NULL,
-                              return_code,
-                              &err);
+  bool success = g_spawn_sync(
+      NULL,  // working directory
+      argv.get(),
+      argp,
+      static_cast<GSpawnFlags>(G_SPAWN_STDERR_TO_DEV_NULL | flags),  // flags
+      GRedirectStderrToStdout,  // child setup function
+      NULL,  // data for child setup function
+      &child_stdout,
+      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 output:\n" << child_stdout;
   return success;
 }
 
 Subprocess* Subprocess::subprocess_singleton_ = NULL;
 
 }  // namespace chromeos_update_engine