loggedcmd: Align with version in rsrepo

jwodder · Jan 2, 2025 · 4062eea · 4062eea
1 parent 2037b71
commit 4062eea
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/crates/loggedcmd/src/lib.rs b/crates/loggedcmd/src/lib.rs
@@ -13,16 +13,15 @@ impl LoggedCommand {
     pub fn new<S: AsRef<OsStr>>(arg0: S) -> Self {
         let arg0 = arg0.as_ref();
         LoggedCommand {
-            cmdline: shell_words::quote(&arg0.to_string_lossy()).to_string(),
+            cmdline: quote_osstr(arg0),
             cmd: Command::new(arg0),
         }
     }
 
     pub fn arg<S: AsRef<OsStr>>(&mut self, arg: S) -> &mut Self {
         let arg = arg.as_ref();
         self.cmdline.push(' ');
-        self.cmdline
-            .push_str(&shell_words::quote(&arg.to_string_lossy()));
+        self.cmdline.push_str(&quote_osstr(arg));
         self.cmd.arg(arg);
         self
     }
@@ -107,3 +106,7 @@ pub enum CommandOutputError {
         source: std::str::Utf8Error,
     },
 }
+
+fn quote_osstr(s: &OsStr) -> String {
+    shell_words::quote(&s.to_string_lossy()).to_string()
+}