Skip to content

chown(ref): parse_uid flattened syntax #11351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cakebaker merged 2 commits into from
Mar 18, 2026
Merged

chown(ref): parse_uid flattened syntax #11351

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f97c38
chown(ref): parse_uid flattened syntax
hlsxx Mar 16, 2026
2aae617
chown(ref): parse_uid early returns
hlsxx Mar 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 16 additions & 22 deletions src/uu/chown/src/chown.rs
View file
Open in desktop
Copy link
Contributor

@cakebaker cakebaker Mar 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While it's an improvement, I'm not a fan of the Err(_)s. Why not flatten it even more by getting rid of the matches and doing the steps sequentially with early returns?

Copy link
Contributor Author

@hlsxx hlsxx Mar 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea, good point. I refactored it using early returns :)

Original file line number Diff line number Diff line change
Expand Up @@ -155,29 +155,23 @@ fn parse_uid(user: &str, spec: &str, sep: char) -> UResult<Option<u32>> {
if user.is_empty() {
return Ok(None);
}
match Passwd::locate(user) {
Ok(u) => Ok(Some(u.uid)), // We have been able to get the uid
Err(_) => {
// we have NOT been able to find the uid
// but we could be in the case where we have user.group
if spec.contains('.') && !spec.contains(':') && sep == ':' {
// but the input contains a '.' but not a ':'
// we might have something like username.groupname
// So, try to parse it this way
parse_spec(spec, '.').map(|(uid, _)| uid)
} else {
// It's possible that the `user` string contains a
// numeric user ID, in which case, we respect that.
match user.parse() {
Ok(uid) => Ok(Some(uid)),
Err(_) => Err(USimpleError::new(
1,
translate!("chown-error-invalid-user", "user" => spec.quote()),
)),
}
}
}

if let Ok(u) = Passwd::locate(user) {
return Ok(Some(u.uid));
}

// Handle `username.groupname` syntax (e.g. when sep is ':' but spec contains '.')
if spec.contains('.') && !spec.contains(':') && sep == ':' {
return parse_spec(spec, '.').map(|(uid, _)| uid);
}

// Fallback: `user` string contains a numeric user ID
user.parse().map(Some).map_err(|_| {
USimpleError::new(
1,
translate!("chown-error-invalid-user", "user" => spec.quote()),
)
})
}

/// Parses the group string to extract the GID.
Expand Down
Loading