sort: fix panic on non-UTF-8 filenames with --files0-from

src/uu/sort/src/sort.rs

@@ -2045,27 +2045,36 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
                 path: files0_from.clone(),
                 error,
             })?;
-            let f = std::str::from_utf8(&line)
-                .expect("Could not parse string from zero terminated input.");
-            match f {
-                STDIN_FILE => {
-                    return Err(SortError::MinusInStdIn.into());
+
+            if line.is_empty() {
+                return Err(SortError::ZeroLengthFileName {
+                    file: files0_from,
+                    line_num: line_num + 1,
                 }
-                "" => {
-                    return Err(SortError::ZeroLengthFileName {
-                        file: files0_from,
-                        line_num: line_num + 1,
-                    }
-                    .into());
+                .into());
+            }
+
+            let f: OsString = {
+                #[cfg(unix)]
+                {
+                    OsStr::from_bytes(&line).to_os_string()
+                }
+                #[cfg(not(unix))]
+                {
+                    OsString::from(String::from_utf8_lossy(&line).into_owned())
+                }
+            };
+
+            match f.to_str() {
+                Some(s) if s == STDIN_FILE => {
+                    return Err(SortError::MinusInStdIn.into());
                 }
                 _ => {}
             }
 
-            files.push(OsString::from(
-                std::str::from_utf8(&line)
-                    .expect("Could not parse string from zero terminated input."),
-            ));
+            files.push(f);
         }
+
         if files.is_empty() {
             return Err(SortError::EmptyInputFile { file: files0_from }.into());
         }

src/uucore/src/lib/lib.rs

@@ -591,23 +591,10 @@ pub enum CharByte {
     Byte(u8),
 }
 
-impl From<char> for CharByte {
-    fn from(value: char) -> Self {
-        Self::Char(value)
-    }
-}
-
-impl From<u8> for CharByte {
-    fn from(value: u8) -> Self {
-        Self::Byte(value)
-    }
-}
-
-impl From<&u8> for CharByte {
-    fn from(value: &u8) -> Self {
-        Self::Byte(*value)
-    }
-}
+impl_from_for_enum!(CharByte:
+    char => Char;
+    u8 => Byte, ref
+);
 
 struct Utf8ChunkIterator<'a> {
     iter: Box<dyn Iterator<Item = CharByte> + 'a>,