From 6c48f939fc47abdf0984865bc39879904c6eae34 Mon Sep 17 00:00:00 2001
From: Lutz Justen <ljusten@google.com>
Date: Mon, 5 Dec 2022 10:46:18 +0100
Subject: [PATCH] Do not quote ssh/scp commands (#35)

This prevents adding args to the commands, e.g.
set CDC_SCP_COMMAND=C:\path\to\scp.exe -i id_rsa.
---
 common/remote_util.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/remote_util.cc b/common/remote_util.cc
index 715a895..d3530ea 100644
--- a/common/remote_util.cc
+++ b/common/remote_util.cc
@@ -81,8 +81,8 @@ absl::Status RemoteUtil::Scp(std::vector<std::string> source_filepaths,
       "%s %s -p -T "
       "-P %i %s "
       "%s:%s",
-      QuoteForWindows(scp_command_), quiet_ || verbosity_ < 2 ? "-q" : "",
-      compress ? "-C" : "", ssh_port_, source_args, QuoteForWindows(user_host_),
+      scp_command_, quiet_ || verbosity_ < 2 ? "-q" : "", compress ? "-C" : "",
+      ssh_port_, source_args, QuoteForWindows(user_host_),
       QuoteForWindows(dest));
   start_info.name = "scp";
   start_info.forward_output_to_log = forward_output_to_log_;
@@ -145,8 +145,8 @@ ProcessStartInfo RemoteUtil::BuildProcessStartInfoForSshInternal(
       "-oServerAliveCountMax=6 "  // Number of lost msgs before ssh terminates
       "-oServerAliveInterval=5 "  // Time interval between alive msgs
       "%s %s -p %i %s",
-      QuoteForWindows(ssh_command_), quiet_ || verbosity_ < 2 ? "-q" : "",
-      forward_arg, QuoteForWindows(user_host_), ssh_port_, remote_command_arg);
+      ssh_command_, quiet_ || verbosity_ < 2 ? "-q" : "", forward_arg,
+      QuoteForWindows(user_host_), ssh_port_, remote_command_arg);
   start_info.forward_output_to_log = forward_output_to_log_;
   start_info.flags = ProcessFlags::kNoWindow;
   return start_info;