mattsu2020:rm_fix_full_path - Branch - uutils/coreutils

rm:fix safe traversal/access

#9577

Comparing

mattsu2020:rm_fix_full_path

(

225dea4

) with

main

(

5b261bc

)

+3%

Improvements: 1

Untouched: 74

Skipped: 58

Benchmarks

Skipped (58)

Improved

rm_recursive_tree

src/uu/rm/benches/rm_bench.rs

+3%

13.6 ms13.2 ms

Passed

rm_multiple_files

src/uu/rm/benches/rm_bench.rs

2.3 ms2.3 ms

rm_single_file

src/uu/rm/benches/rm_bench.rs

119.7 ms119.3 ms

du_all_wide_tree[(5000, 500)]

src/uu/du/benches/du_bench.rs

18.2 ms18.2 ms

rm_force_files

src/uu/rm/benches/rm_bench.rs

2 ms2 ms

cp_preserve_metadata[(5, 4, 10)]

src/uu/cp/benches/cp_bench.rs

75 ms75 ms

cp_recursive_balanced_tree[(5, 4, 10)]

src/uu/cp/benches/cp_bench.rs

72.3 ms72.2 ms

factor_multiple_u64s[2]

src/uu/factor/benches/factor_bench.rs

213.2 ms213.1 ms

ls_recursive_long_all_balanced_tree[(6, 4, 15)]

src/uu/ls/benches/ls_bench.rs

134.6 ms134.5 ms

du_wide_tree[(5000, 500)]

src/uu/du/benches/du_bench.rs

11.3 ms11.3 ms

ls_recursive_long_all_wide_tree[(15000, 1500)]

src/uu/ls/benches/ls_bench.rs

143.5 ms143.4 ms

mv_single_file

src/uu/mv/benches/mv_bench.rs

136 ms135.9 ms

mv_force_overwrite

src/uu/mv/benches/mv_bench.rs

138.4 ms138.3 ms

hashsum_md5

src/uu/hashsum/benches/hashsum_bench.rs

32 ms32 ms

ls_recursive_long_all_deep_tree[(100, 4)]

src/uu/ls/benches/ls_bench.rs

3.3 ms3.3 ms

ls_recursive_mixed_tree

src/uu/ls/benches/ls_bench.rs

1.4 ms1.4 ms

mv_multiple_to_dir

src/uu/mv/benches/mv_bench.rs

13.1 ms13.1 ms

tsort_linear_chain[1000000]

src/uu/tsort/benches/tsort_bench.rs

1.5 s1.5 s

ls_recursive_long_all_mixed_tree

src/uu/ls/benches/ls_bench.rs

2.9 ms2.9 ms

ls_recursive_deep_tree[(200, 2)]

src/uu/ls/benches/ls_bench.rs

2.2 ms2.2 ms

hashsum_sha512

src/uu/hashsum/benches/hashsum_bench.rs

110.8 ms110.8 ms

tsort_complex_dag[50000]

src/uu/tsort/benches/tsort_bench.rs

84.3 ms84.3 ms

shuf_lines[100000]

src/uu/shuf/benches/shuf_bench.rs

26.9 ms26.9 ms

split_number_chunks

src/uu/split/benches/split_bench.rs

288.1 µs288.1 µs

uniq_heavy_duplicates[10000]

src/uu/uniq/benches/uniq_bench.rs

2 ms2 ms

cut_bytes

src/uu/cut/benches/cut_bench.rs

8.5 ms8.5 ms

mv_directory

src/uu/mv/benches/mv_bench.rs

3.5 ms3.5 ms

numfmt_to_si_precision[10000]

src/uu/numfmt/benches/numfmt_bench.rs

35.4 ms35.4 ms

cut_fields_tab

src/uu/cut/benches/cut_bench.rs

34.1 ms34.1 ms

numfmt_from_si[10000]

src/uu/numfmt/benches/numfmt_bench.rs

32.7 ms32.7 ms

numfmt_to_si[10000]

src/uu/numfmt/benches/numfmt_bench.rs

33.7 ms33.7 ms

numfmt_round_modes[("up", 10000)]

src/uu/numfmt/benches/numfmt_bench.rs

34.2 ms34.2 ms

fold_many_lines[100000]

src/uu/fold/benches/fold_bench.rs

80.1 ms80.1 ms

numfmt_round_modes[("towards-zero", 10000)]

src/uu/numfmt/benches/numfmt_bench.rs

34.2 ms34.2 ms

numfmt_padding[(10000, 50)]

src/uu/numfmt/benches/numfmt_bench.rs

48.2 ms48.2 ms

numfmt_round_modes[("down", 10000)]

src/uu/numfmt/benches/numfmt_bench.rs

34.2 ms34.2 ms

hashsum_md5_check

src/uu/hashsum/benches/hashsum_bench.rs

32 ms32 ms

hashsum_sha256_check

src/uu/hashsum/benches/hashsum_bench.rs

173.6 ms173.6 ms

nl_many_lines[100000]

src/uu/nl/benches/nl_bench.rs

79.8 ms79.8 ms

hashsum_sha256

src/uu/hashsum/benches/hashsum_bench.rs

173.6 ms173.6 ms

nl_large_file[10]

src/uu/nl/benches/nl_bench.rs

100.9 ms100.9 ms

unexpand_many_lines[100000]

src/uu/unexpand/benches/unexpand_bench.rs

262 ms262 ms

hashsum_sha1

src/uu/hashsum/benches/hashsum_bench.rs

72.5 ms72.5 ms

unexpand_large_file[10]

src/uu/unexpand/benches/unexpand_bench.rs

549.3 ms549.3 ms

numfmt_to_iec[10000]

src/uu/numfmt/benches/numfmt_bench.rs

33.7 ms33.7 ms

fold_custom_width[50000]

src/uu/fold/benches/fold_bench.rs

32.9 ms32.9 ms

cut_fields_custom_delim

src/uu/cut/benches/cut_bench.rs

40.8 ms40.8 ms

expand_many_lines[100000]

src/uu/expand/benches/expand_bench.rs

149.9 ms149.9 ms

seq_formatted

src/uu/seq/benches/seq_bench.rs

97.2 ms97.2 ms

numfmt_large_numbers_si[10000]

src/uu/numfmt/benches/numfmt_bench.rs

32.4 ms32.4 ms

expand_custom_tabstops[50000]

src/uu/expand/benches/expand_bench.rs

37 ms37 ms

seq_custom_separator

src/uu/seq/benches/seq_bench.rs

28.7 ms28.7 ms

seq_integers

src/uu/seq/benches/seq_bench.rs

26.1 ms26.1 ms

ls_recursive_wide_tree[(10000, 1000)]

src/uu/ls/benches/ls_bench.rs

52.6 ms52.6 ms

seq_with_step

src/uu/seq/benches/seq_bench.rs

13.3 ms13.3 ms

cut_characters

src/uu/cut/benches/cut_bench.rs

7.5 ms7.5 ms

uniq_with_count[10000]

src/uu/uniq/benches/uniq_bench.rs

1.9 ms1.9 ms

split_lines

src/uu/split/benches/split_bench.rs

5.7 ms5.7 ms

uniq_case_insensitive[10000]

src/uu/uniq/benches/uniq_bench.rs

1.8 ms1.8 ms

shuf_repeat_sampling[50000]

src/uu/shuf/benches/shuf_bench.rs

4.7 ms4.7 ms

seq_large_integers

src/uu/seq/benches/seq_bench.rs

2.2 ms2.2 ms

split_bytes

src/uu/split/benches/split_bench.rs

510.5 µs510.5 µs

tsort_wide_dag[100000]

src/uu/tsort/benches/tsort_bench.rs

134.1 ms134.1 ms

tsort_tree_dag[(10, 3)]

src/uu/tsort/benches/tsort_bench.rs

34.2 ms34.2 ms

ls_recursive_balanced_tree[(6, 4, 15)]

src/uu/ls/benches/ls_bench.rs

55.4 ms55.4 ms

split_numeric_suffix

src/uu/split/benches/split_bench.rs

5.9 ms5.9 ms

shuf_input_range[1000000]

src/uu/shuf/benches/shuf_bench.rs

229.1 ms229.1 ms

cp_archive_balanced_tree[(5, 4, 10)]

src/uu/cp/benches/cp_bench.rs

77.7 ms77.8 ms

tsort_input_parsing_heavy[5000]

src/uu/tsort/benches/tsort_bench.rs

83.1 ms83.2 ms

cp_recursive_deep_tree[(120, 4)]

src/uu/cp/benches/cp_bench.rs

13.6 ms13.7 ms

cp_recursive_wide_tree[(6000, 800)]

src/uu/cp/benches/cp_bench.rs

189.4 ms189.7 ms

cp_large_file[16]

src/uu/cp/benches/cp_bench.rs

359 µs359.8 µs

du_summarize_balanced_tree[(5, 4, 10)]

src/uu/du/benches/du_bench.rs

8.4 ms8.5 ms

du_deep_tree[(100, 3)]

src/uu/du/benches/du_bench.rs

1.2 ms1.2 ms

du_max_depth_balanced_tree[(6, 4, 10)]

src/uu/du/benches/du_bench.rs

32.8 ms33 ms

Commits

Click on a commit to change the comparison range

Base

main

5b261bc

+14.61%

style(rm): wrap long line in prompt_file_with_stat macro for readability Reformatted the prompt_yes! macro call across multiple lines to improve code readability and adhere to line length conventions. No functional changes.

38d339d

4 hours ago

by mattsu2020

-14.61%

refactor(linux/rm): refactor safe_remove_dir_recursive for better FD management and error handling Restructure directory opening and traversal logic to collect entries upfront and drop DirFd early, preventing deep descriptor stacks. Improve permission denied error handling to match GNU rm behavior while maintaining secure operations. This enhances resource efficiency and compatibility without altering functional behavior.

bf28c9a

2 hours ago

by mattsu2020

+2.8%

feat(rm): add progress bar support to recursive dir removal on Linux Refactor `safe_remove_dir_recursive_impl` to accept an optional `ProgressBar` parameter instead of `dir_fd`, opening the directory internally. Add progress increments for each removed item to improve user feedback during long recursive operations.

6a9f123

2 hours ago

by mattsu2020

refactor(rm): simplify control flow in safe_remove_dir_recursive_impl Replaced nested if-else logic with direct else-if in the file removal path to reduce code nesting and improve readability for handling interactive prompts during recursive directory removal.

2957789

2 hours ago

by mattsu2020

refactor: remove handle_permission_denied function from rm linux platform Remove the obsolete `handle_permission_denied` helper function in `src/uu/rm/src/platform/linux.rs`. This function was handling permission denied errors when attempting to remove subdirectories during recursive removal. Its removal simplifies the code and aligns with updated error handling logic, potentially avoiding redundant or buggy behavior in edge cases. The change maintains compatibility for standard rm operations while reducing complexity.

1f78fc6

2 hours ago

by mattsu2020

-2.8%

perf(linux/rm): optimize descriptor usage by keeping dir_fd open in safe_remove_dir_recursive_impl Reuse the existing directory file descriptor instead of opening/closing new ones for each subdirectory or file during recursive removal. This simplifies the code, reduces overhead from descriptor management, and prevents potential deep descriptor stacks on systems with many nested directories. Removed unnecessary `drop(dir_fd)` call and adjusted progress bar increments accordingly.

188d9cf

2 hours ago

by mattsu2020

-2.41%

style(rm): reformat error assignment in safe_remove_dir_recursive_impl Break the long error assignment line for better readability, ensuring consistent code formatting in the rm utility's Linux platform implementation.

fbb0fd9

2 hours ago

by mattsu2020

+5.15%

fix: prevent file descriptor buildup in recursive rm on Linux Drop the main directory file descriptor early in `safe_remove_dir_recursive_impl` and open fresh parent FDs per entry unlink to avoid accumulating open file descriptors during recursive directory removal. This resolves potential FD exhaustion issues when removing large directory trees.

971a8bd

1 hour ago

by mattsu2020

-2.75%

refactor(linux/rm): avoid redundant DirFd opening in safe_remove_dir_recursive Move DirFd opening out of safe_remove_dir_recursive_impl to safe_remove_dir_recursive to open the directory file descriptor once per level instead of twice, improving efficiency and reducing potential for errors in recursive directory removal on Linux.

1619870

37 minutes ago

by mattsu2020

+3.15%

refactor(rm/linux): remove mut from dir_fd parameter in safe_remove_dir_recursive_impl The `dir_fd` parameter was marked as mutable but is not modified within the function, so removing `mut` enforces Rust's immutability-by-default principle and improves code clarity.

43cccdf

26 minutes ago

by mattsu2020

+0.06%

fix(linux/rm): refactor error handling in safe_remove_dir_recursive_impl Refactor indentation and nesting in the directory removal logic to improve code readability. Specifically, restructure the error handling branches after checking for PermissionDenied, reducing nested conditions and making the flow more straightforward. This enhances maintainability without changing functionality.

225dea4

20 minutes ago

by mattsu2020

Home Terms Privacy Docs