stat: fix mount point handling for non-UTF8 paths #8538

dekuu5 · 2025-08-31T17:23:58Z

Summary

This PR addresses a TODO in find_mount_point() by properly handling mount point paths that contain non-UTF8 bytes. Previously, to_string_lossy() was used, which could corrupt mount point names with invalid UTF-8 sequences. The fix ensures raw bytes are preserved on Unix-like systems and safely handled on Windows.

Changes Made

find_mount_point() return type updated
Changed from Option<String> → Option<OsString> to preserve original bytes.
Added OsStr variant to OutputType enum
Allows proper handling of non-UTF8 data through the output pipeline.
Implemented print_os_str()
- Unix/macOS: prints raw bytes directly, preserving non-UTF8 sequences.
- Windows: falls back to .to_string_lossy(), safely handling UTF-16 strings.
Added pad_and_print_bytes() helper
Handles alignment, width, and padding for raw byte output.
Updated 'm' format specifier
Returns OutputType::OsStr instead of a lossy string, preserving original data.

Platform Behavior

Unix/macOS: preserves non-UTF8 bytes when printing.
Windows: uses .to_string_lossy() safely, since Windows internally uses UTF-16.

Related Issues

Fixes the TODO in stat.rs:

it is mentioned in this issue

github-actions · 2025-08-31T17:45:59Z

GNU testsuite comparison:

Skipping an intermittent issue tests/timeout/timeout (passes in this run but fails in the 'main' branch)

sylvestre · 2025-08-31T17:49:07Z

please ask your AI to cleanup a bit the patch, too much duplicated code

tests are missing, thanks :)

dekuu5 · 2025-08-31T18:30:50Z

Hello @sylvestre
I made a change in the print_os_str if that's what you meant by a duplicate code I will upload it
About the tests can you explain how I can write tests for that code I think it is an io operation I tested it locally the same why I mentioned in the issue and it fixes the bug

sylvestre · 2025-08-31T19:26:56Z

src/uu/stat/src/stat.rs

+            for _ in 0..padding_needed {
+                print!(" ");
+            }
+        } else {
+            for _ in 0..padding_needed {
+                print!(" ");
+            }


this is duplicated code here

sylvestre · 2025-08-31T19:27:07Z

src/uu/stat/src/stat.rs

+            io::stdout().write_all(display_bytes)?;
+        }
+    } else {
+        io::stdout().write_all(display_bytes)?;


okay thanks i will edit it

sylvestre · 2025-08-31T19:27:56Z

can you explain how I can write tests

please look at the other tests for this :)

github-actions · 2025-08-31T19:46:28Z

GNU testsuite comparison:

Skip an intermittent issue tests/misc/stdbuf (fails in this run but passes in the 'main' branch)

github-actions · 2025-09-02T11:55:44Z

GNU testsuite comparison:

Skipping an intermittent issue tests/misc/stdbuf (passes in this run but fails in the 'main' branch)

github-actions · 2025-09-02T12:22:39Z

GNU testsuite comparison:

Skipping an intermittent issue tests/misc/stdbuf (passes in this run but fails in the 'main' branch)

sylvestre · 2025-09-03T08:30:20Z

src/uu/stat/src/stat.rs

+    io::stdout().write_all(display_bytes)?;
+
+    if left && padding_needed > 0 {
+        for _ in 0..padding_needed {


still duplicated code

sylvestre · 2025-09-03T09:40:31Z

src/uu/stat/src/stat.rs

+        let bytes = s.as_bytes();
+
+        if pad_and_print_bytes(bytes, flags.left, width, precision).is_err() {
+            let lossy_string = s.to_string_lossy();


rename the variable to explain what it is, not the style

github-actions · 2025-09-03T09:46:10Z

GNU testsuite comparison:

Skip an intermittent issue tests/misc/tee (fails in this run but passes in the 'main' branch)

github-actions · 2025-09-03T10:11:37Z

GNU testsuite comparison:

Skipping an intermittent issue tests/misc/stdbuf (passes in this run but fails in the 'main' branch)
Skipping an intermittent issue tests/misc/tee (passes in this run but fails in the 'main' branch)

sylvestre · 2025-09-03T11:25:50Z

src/uu/stat/src/stat.rs

            if path.starts_with(root) {
-                // TODO: This is probably wrong, we should pass the OsString
-                return Some(root.to_string_lossy().into_owned());
+                return Some(root.clone());


can we avoid the clone here ?

yes we can by annotating the function and the enum OutputType by a lifetime to be like this
fn find_mount_point<'a, P: AsRef<Path>>(&'a self, p: P) -> Option<&'a OsString>
and the outputtype be generic over 'a but in line
1064: OutputType::OsStr(self.find_mount_point(file).unwrap())
i can't use unwrap or default i don't know how

if it errors we can fall back to normal outputType::str with a default value of "" is that acceptable ?

please investigate :)

github-actions · 2025-09-03T11:44:24Z

GNU testsuite comparison:

Skip an intermittent issue tests/misc/tee (fails in this run but passes in the 'main' branch)
Skipping an intermittent issue tests/timeout/timeout (passes in this run but fails in the 'main' branch)

github-actions · 2025-09-03T17:44:48Z

GNU testsuite comparison:

Skipping an intermittent issue tests/misc/stdbuf (passes in this run but fails in the 'main' branch)

sylvestre · 2025-09-03T19:11:40Z

src/uu/stat/src/stat.rs

+///
+/// On Unix systems, this preserves non-UTF8 data by printing raw bytes
+/// On other platforms, falls back to lossy string conversion
+fn pad_and_print_bytes(


we have unit tests in this file, maybe test also this function ? thanks

github-actions · 2025-09-03T19:29:55Z

GNU testsuite comparison:

Skip an intermittent issue tests/timeout/timeout (fails in this run but passes in the 'main' branch)
Skipping an intermittent issue tests/misc/tee (passes in this run but fails in the 'main' branch)

github-actions · 2025-09-04T11:52:09Z

GNU testsuite comparison:

Skip an intermittent issue tests/misc/tee (fails in this run but passes in the 'main' branch)
Skip an intermittent issue tests/timeout/timeout (fails in this run but passes in the 'main' branch)

dekuu5 · 2025-09-06T08:55:12Z

Hello @sylvestre, is there any updates on this pr

github-actions · 2025-09-07T17:24:15Z

GNU testsuite comparison:

Skipping an intermittent issue tests/timeout/timeout (passes in this run but fails in the 'main' branch)

… of a clone

github-actions · 2025-09-09T09:22:41Z

GNU testsuite comparison:

Skipping an intermittent issue tests/timeout/timeout (passes in this run but fails in the 'main' branch)

sylvestre · 2025-09-09T12:37:38Z

src/uu/stat/src/stat.rs

+        (padding_needed, 0)
+    };
+
+    writer.write_all(&vec![b' '; left_pad])?;


try you try using using repeat() iterator or a pre-allocated buffer ?

something like
std::io::repeat(b' ').take(n)

okay will take a look at it

github-actions · 2025-09-09T19:20:04Z

GNU testsuite comparison:

Skip an intermittent issue tests/timeout/timeout (fails in this run but passes in the 'main' branch)

github-actions · 2025-09-09T20:51:13Z

GNU testsuite comparison:

Skip an intermittent issue tests/timeout/timeout (fails in this run but passes in the 'main' branch)

dekuu5 · 2025-09-16T15:59:08Z

Hello @sylvestre , is there any updates on this pr

sylvestre reviewed Aug 31, 2025

View reviewed changes

dekuu5 requested a review from sylvestre September 2, 2025 13:47

RoyalOughtness mentioned this pull request Sep 2, 2025

[FEAT] Look into replacing GNU coreutils with rust written uutils secureblue/secureblue#933

Closed

1 task

cakebaker linked an issue Sep 3, 2025 that may be closed by this pull request

stat: mount point output should preserve non-UTF8 bytes #8534

Closed

sylvestre reviewed Sep 3, 2025

View reviewed changes

dekuu5 requested a review from sylvestre September 4, 2025 15:15

dekuu5 added 5 commits September 9, 2025 10:59

stat: added a OsStr to the OutputType

ffe698f

stat: add OsString support with print_os_str and pad_and_print_bytes

a257e20

stat: cleaning up a bit in the print_os_str

93796c9

stat: refactor pad_and_print_bytes and added tests

b52bb57

stat: refactor bad and print bytes to avoid duplicate code

c355ec9

dekuu5 added 4 commits September 9, 2025 10:59

stat: refactor variable name in print_os_str

bdb370e

stat: refactor outputType to use 'a on OsStr and return a ref instead…

0e3f9fc

… of a clone

stat: refactor pad_and_print_bytes to be testable

4902b94

stat: added unit tests for pad_and_print_bytes

300fbdb

sylvestre force-pushed the fix/stat-string-to-osstr branch from a0fd51e to 300fbdb Compare September 9, 2025 08:59

sylvestre reviewed Sep 9, 2025

View reviewed changes

stat: refactor print padding logic to avoid extra allocation

d5c0cd8

dekuu5 requested a review from sylvestre September 9, 2025 18:56

Merge branch 'uutils:main' into fix/stat-string-to-osstr

04ac5af

sylvestre merged commit 12e875c into uutils:main Sep 24, 2025
95 checks passed

dekuu5 deleted the fix/stat-string-to-osstr branch September 29, 2025 09:43

BrewTestBot mentioned this pull request Oct 24, 2025

uutils-coreutils 0.3.0 Homebrew/homebrew-core#251041

Merged

cakebaker mentioned this pull request Oct 25, 2025

New failing tests in 0.3.0 #9017

Open

moonfruit mentioned this pull request Oct 27, 2025

uutils-selected 0.3.0 moonfruit/homebrew-tap#345

Closed

Uh oh!

stat: fix mount point handling for non-UTF8 paths #8538

stat: fix mount point handling for non-UTF8 paths #8538

Uh oh!

Conversation

dekuu5 commented Aug 31, 2025

Summary

Changes Made

Platform Behavior

Related Issues

Uh oh!

github-actions bot commented Aug 31, 2025

Uh oh!

sylvestre commented Aug 31, 2025

Uh oh!

dekuu5 commented Aug 31, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sylvestre commented Aug 31, 2025

Uh oh!

github-actions bot commented Aug 31, 2025

Uh oh!

github-actions bot commented Sep 2, 2025

Uh oh!

github-actions bot commented Sep 2, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Sep 3, 2025

Uh oh!

github-actions bot commented Sep 3, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Sep 3, 2025

Uh oh!

github-actions bot commented Sep 3, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Sep 3, 2025

Uh oh!

github-actions bot commented Sep 4, 2025

Uh oh!

dekuu5 commented Sep 6, 2025

Uh oh!

github-actions bot commented Sep 7, 2025

Uh oh!

github-actions bot commented Sep 9, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Sep 9, 2025

Uh oh!

github-actions bot commented Sep 9, 2025

Uh oh!

dekuu5 commented Sep 16, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects