du: do not panic on a non-UTF-8 name in the --exclude check#12771
Open
leeewee wants to merge 1 commit into
Open
du: do not panic on a non-UTF-8 name in the --exclude check#12771leeewee wants to merge 1 commit into
leeewee wants to merge 1 commit into
Conversation
The regular (non-safe) traversal — used with `-L`/`--dereference`, and always on non-Linux — matched `--exclude` patterns against `entry.file_name().into_string().unwrap()`, which aborts on any non-UTF-8 entry name. Use `to_string_lossy()` instead, matching the sibling path check on the same line, so a non-UTF-8 name is handled gracefully like GNU.
Merging this PR will improve performance by 3.45%
|
| Mode | Benchmark | BASE |
HEAD |
Efficiency | |
|---|---|---|---|---|---|
| ⚡ | Simulation | single_date_now |
85.5 µs | 82.7 µs | +3.45% |
Tip
Curious why this is faster? Comment @codspeedbot explain why this is faster on this PR, or directly use the CodSpeed MCP with your agent.
Comparing leeewee:du-fix-exclude-non-utf8 (c86ab87) with main (220a8ec)
Footnotes
-
46 benchmarks were skipped, so the baseline results were used instead. If they were deleted from the codebase, click here and archive them to remove them from the performance reports. ↩
|
GNU testsuite comparison: |
db2105c to
c86ab87
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #12769
du's regular (non-safe) traversal — used whenever-L/--dereferenceis given, and always on non-Linux — matched--excludepatterns againstentry.file_name().into_string().unwrap().OsString::into_string()returnsErrfor any non-UTF-8 entry name, so the.unwrap()aborted the process:GNU lists the directory and exits 0. This uses
to_string_lossy()instead — matching the siblingthis_stat.path.to_string_lossy()already on the line above (and the identical exclude check in the safe traversal) — so a non-UTF-8 name is handled gracefully:Added a Unix-gated regression test (
test_du_exclude_non_utf8_name).