Skip to content

Commit f042a9a

Browse files
committed
chmod: remove the option from configure_symlink_and_recursion
1 parent 6457836 commit f042a9a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/uu/chmod/src/chmod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
149149
fmode,
150150
cmode,
151151
traverse_symlinks,
152-
dereference: dereference.unwrap_or(true),
152+
dereference,
153153
};
154154

155155
chmoder.chmod(&files)

src/uucore/src/lib/features/perms.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ type GidUidFilterOwnerParser = fn(&ArgMatches) -> UResult<GidUidOwnerFilter>;
526526
/// Returns the updated `dereference` and `traverse_symlinks` values.
527527
pub fn configure_symlink_and_recursion(
528528
matches: &ArgMatches,
529-
) -> Result<(bool, Option<bool>, TraverseSymlinks), Box<dyn crate::error::UError>> {
529+
) -> Result<(bool, bool, TraverseSymlinks), Box<dyn crate::error::UError>> {
530530
let mut dereference = if matches.get_flag(options::dereference::DEREFERENCE) {
531531
Some(true) // Follow symlinks
532532
} else if matches.get_flag(options::dereference::NO_DEREFERENCE) {
@@ -558,7 +558,7 @@ pub fn configure_symlink_and_recursion(
558558
traverse_symlinks = TraverseSymlinks::None;
559559
}
560560

561-
Ok((recursive, dereference, traverse_symlinks))
561+
Ok((recursive, dereference.unwrap_or(true), traverse_symlinks))
562562
}
563563

564564
/// Base implementation for `chgrp` and `chown`.
@@ -646,7 +646,7 @@ pub fn chown_base(
646646
level: verbosity_level,
647647
},
648648
recursive,
649-
dereference: dereference.unwrap_or(true),
649+
dereference,
650650
preserve_root,
651651
files,
652652
filter,

0 commit comments

Comments
 (0)