fix: import and match

Author: ppmpreetham

src/uu/sort/src/sort.rs

@@ -39,7 +39,7 @@ use std::io::{BufRead, BufReader, BufWriter, Read, Write, stdin, stdout};
 use std::num::{IntErrorKind, NonZero};
 use std::ops::Range;
 #[cfg(unix)]
-use std::os::unix::ffi::{OsStrExt};
+use std::os::unix::ffi::OsStrExt;
 use std::path::Path;
 use std::path::PathBuf;
 use std::str::Utf8Error;
@@ -2042,26 +2042,35 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
                 path: files0_from.clone(),
                 error,
             })?;
-            #[cfg(unix)]
-            let f = OsStr::from_bytes(&line);
-            #[cfg(not(unix))]
-            let f_str = String::from_utf8_lossy(&line);
-            #[cfg(not(unix))]
-            let f = OsStr::new(f_str.as_ref());
-
-            if f == STDIN_FILE {
-                return Err(SortError::MinusInStdIn.into());
-            }
-            if f.is_empty() {
-                return Err(SortError::ZeroLengthFileName {
-                    file: files0_from,
-                    line_num: line_num + 1,
+
+            let f: OsString = {
+                #[cfg(unix)]
+                {
+                    OsStr::from_bytes(&line).to_os_string()
+                }
+                #[cfg(not(unix))]
+                {
+                    String::from_utf8_lossy(&line).into_owned().into()
+                }
+            };
+
+            match f.to_str() {
+                Some(s) if s == STDIN_FILE => {
+                    return Err(SortError::MinusInStdIn.into());
+                }
+                Some("") => {
+                    return Err(SortError::ZeroLengthFileName {
+                        file: files0_from,
+                        line_num: line_num + 1,
+                    }
+                    .into());
                 }
-                .into());
+                _ => {}
             }
 
-            files.push(f.to_os_string());
+            files.push(f);
         }
+
         if files.is_empty() {
             return Err(SortError::EmptyInputFile { file: files0_from }.into());
         }

tests/by-util/test_sort.rs

@@ -1859,7 +1859,7 @@ fn test_files0_from_non_utf8() {
     let (at, mut ucmd) = at_and_ucmd!();
 
     // non-UTF-8 bytes (0xFF)
-    let filename = std::ffi::OsString::from_vec(vec![b'a', 0xFF, b'b']);
+    let filename = std::ffi::OsString::from_vec(b"a\xffb".into());
     std::fs::write(at.plus(&filename), b"20\n10\n").unwrap();
 
     let list_contents = vec![b'a', 0xFF, b'b', 0];