Escape shell arguments nicer

1 files changed, 11 insertions, 14 deletions

diff --git a/talpid-core/src/process/openvpn.rs b/talpid-core/src/process/openvpn.rs
index 0c534f63b9..0eb5ec953e 100644
--- a/talpid-core/src/process/openvpn.rs
+++ b/talpid-core/src/process/openvpn.rs
@@ -189,25 +189,22 @@ impl fmt::Display for OpenVpnCommand {
     /// Format the program and arguments of an `OpenVpnCommand` for display. Any non-utf8 data
     /// is lossily converted using the utf8 replacement character.
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        fmt.write_str(&self.openvpn_bin.to_string_lossy())?;
-        for arg in self.get_arguments().iter().map(|arg| arg.to_string_lossy()) {
-            write_argument(fmt, &arg)?;
+        shell_escape(fmt, &self.openvpn_bin.to_string_lossy())?;
+        for arg in &self.get_arguments() {
+            fmt.write_str(" ")?;
+            shell_escape(fmt, &arg.to_string_lossy())?;
         }
         Ok(())
     }
 }
 
-fn write_argument(fmt: &mut fmt::Formatter, arg: &str) -> fmt::Result {
-    fmt.write_str(" ")?;
-    let quote = arg.contains(char::is_whitespace);
-    if quote {
-        fmt.write_str("\"")?;
-    }
-    fmt.write_str(arg)?;
-    if quote {
-        fmt.write_str("\"")?;
-    }
-    Ok(())
+fn shell_escape(fmt: &mut fmt::Formatter, arg: &str) -> fmt::Result {
+    let quote = if arg.contains(char::is_whitespace) {
+        "\""
+    } else {
+        ""
+    };
+    write!(fmt, "{}{}{}", quote, arg, quote)
 }