windows compatibility

uutils · Jan 10, 2024 · d76ee6b · d76ee6b
1 parent c2b93bf
commit d76ee6b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/uu/env/src/env.rs b/src/uu/env/src/env.rs
@@ -20,6 +20,8 @@ use std::io::{self, Write};
 use std::iter::Iterator;
 use std::ops::Deref;
 #[cfg(unix)]
+use std::os::unix::ffi::OsStrExt;
+#[cfg(unix)]
 use std::os::unix::process::ExitStatusExt;
 use std::process::{self};
 use uucore::display::Quotable;
@@ -252,7 +254,11 @@ impl EnvAppData {
     ) -> UResult<Vec<std::ffi::OsString>> {
         let mut all_args: Vec<std::ffi::OsString> = Vec::new();
         for arg in original_args {
-            match arg.as_encoded_bytes() {
+            #[cfg(not(windows))]
+            let arg_bytes = arg.as_bytes();
+            #[cfg(windows)]
+            let arg_bytes = arg.as_encoded_bytes();
+            match arg_bytes {
                 b if check_and_handle_string_args(b, "--split-string", &mut all_args, None)? => {
                     self.had_string_argument = true;
                 }

diff --git a/tests/common/util.rs b/tests/common/util.rs
@@ -12,7 +12,6 @@ use pretty_assertions::assert_eq;
 use rlimit::prlimit;
 #[cfg(feature = "sleep")]
 use rstest::rstest;
-#[cfg(unix)]
 use std::borrow::Cow;
 use std::collections::VecDeque;
 #[cfg(not(windows))]