interceptor: factor out the command line string creation

Bug: 205577427
Signed-off-by: Matthias Maennich <maennich@google.com>
Change-Id: Idbecb16660ab055056269184091569264160bcc8

2 files changed, 12 insertions, 9 deletions

diff --git a/interceptor/interceptor.cc b/interceptor/interceptor.cc
index caadfa0..0a52870 100644
--- a/interceptor/interceptor.cc
+++ b/interceptor/interceptor.cc
@@ -120,17 +120,18 @@ static void dump_vector(std::ostream& os, const char* key, const std::vector<T>&
   os << "]";
 }
 
+std::string Command::command() const {
+  std::ostringstream cmd;
+  cmd << program();
+  if (args().size() > 1) cmd << ' ';
+  std::transform(args().cbegin() + 1, args().cend(), std::ostream_iterator<std::string>(cmd, " "),
+                 escape);
+  return cmd.str();
+}
+
 std::string Command::repr() const {
   std::ostringstream os;
-  os << R"({"cmd": )";
-  {
-    std::ostringstream cmd;
-    cmd << program();
-    if (args().size() > 1) cmd << ' ';
-    std::transform(args().cbegin() + 1, args().cend(), std::ostream_iterator<std::string>(cmd, " "),
-                   escape);
-    os << std::quoted(cmd.str());
-  }
+  os << R"({"cmd": )" << std::quoted(command());
 
   os << ", ";
   dump_vector(os, "in", inputs());
diff --git a/interceptor/interceptor.h b/interceptor/interceptor.h
index d7a38a9..f7ecae7 100644
--- a/interceptor/interceptor.h
+++ b/interceptor/interceptor.h
@@ -59,6 +59,8 @@ class Command {
   void analyze();
 
  private:
+  std::string command() const;
+
   std::string program_;
   std::string cwd_;