Skip to content

sort: reject incompatible modes across repeated --sort options #15718

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 1 commit into from
Oct 26, 2026
Merged

sort: reject incompatible modes across repeated --sort options #15718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
79 changes: 35 additions & 44 deletions src/uu/sort/src/sort.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,6 +566,31 @@ struct ModeFlags {
}

impl ModeFlags {
fn from_matches(matches: &ArgMatches) -> Self {
let mut flags = Self {
human_numeric: matches.get_flag(options::modes::HUMAN_NUMERIC),
month: matches.get_flag(options::modes::MONTH),
general_numeric: matches.get_flag(options::modes::GENERAL_NUMERIC),
numeric: matches.get_flag(options::modes::NUMERIC),
version: matches.get_flag(options::modes::VERSION),
random: matches.get_flag(options::modes::RANDOM),
};
if let Some(sort_args) = matches.get_many::<String>(options::modes::SORT) {
for sort_arg in sort_args {
match sort_arg.as_str() {
"human-numeric" => flags.human_numeric = true,
"month" => flags.month = true,
"general-numeric" => flags.general_numeric = true,
"numeric" => flags.numeric = true,
"version" => flags.version = true,
"random" => flags.random = true,
_ => {}
}
}
}
flags
}

fn from_mode(mode: SortMode) -> Self {
let mut flags = Self::default();
match mode {
Expand Down Expand Up @@ -1655,36 +1680,19 @@ struct GlobalOptionFlags {
ignore_case: bool,
ignore_non_printing: bool,
reverse: bool,
mode_numeric: bool,
mode_general: bool,
mode_human: bool,
mode_month: bool,
mode_random: bool,
mode_version: bool,
modes: ModeFlags,
}

impl GlobalOptionFlags {
fn from_matches(matches: &ArgMatches) -> Self {
let sort_value = matches
.get_one::<String>(options::modes::SORT)
.map(String::as_str);
Self {
keys_specified: matches.contains_id(options::KEY),
ignore_leading_blanks: matches.get_flag(options::IGNORE_LEADING_BLANKS),
dictionary_order: matches.get_flag(options::DICTIONARY_ORDER),
ignore_case: matches.get_flag(options::IGNORE_CASE),
ignore_non_printing: matches.get_flag(options::IGNORE_NONPRINTING),
reverse: matches.get_flag(options::REVERSE),
mode_human: matches.get_flag(options::modes::HUMAN_NUMERIC)
|| sort_value == Some("human-numeric"),
mode_month: matches.get_flag(options::modes::MONTH) || sort_value == Some("month"),
mode_general: matches.get_flag(options::modes::GENERAL_NUMERIC)
|| sort_value == Some("general-numeric"),
mode_numeric: matches.get_flag(options::modes::NUMERIC)
|| sort_value == Some("numeric"),
mode_version: matches.get_flag(options::modes::VERSION)
|| sort_value == Some("version"),
mode_random: matches.get_flag(options::modes::RANDOM) || sort_value == Some("random"),
modes: ModeFlags::from_matches(matches),
}
}
}
Expand Down Expand Up @@ -2083,25 +2091,25 @@ fn emit_debug_warnings(
if flags.ignore_non_printing && !uses_non_printing {
ignored_opts.push('i');
}
if flags.mode_general && !uses_mode(SortMode::GeneralNumeric) {
if flags.modes.general_numeric && !uses_mode(SortMode::GeneralNumeric) {
ignored_opts.push('g');
}
if flags.mode_human && !uses_mode(SortMode::HumanNumeric) {
if flags.modes.human_numeric && !uses_mode(SortMode::HumanNumeric) {
ignored_opts.push('h');
}
if flags.mode_month && !uses_mode(SortMode::Month) {
if flags.modes.month && !uses_mode(SortMode::Month) {
ignored_opts.push('M');
}
if flags.mode_numeric && !uses_mode(SortMode::Numeric) {
if flags.modes.numeric && !uses_mode(SortMode::Numeric) {
ignored_opts.push('n');
}
if flags.mode_random && !uses_mode(SortMode::Random) {
if flags.modes.random && !uses_mode(SortMode::Random) {
ignored_opts.push('R');
}
if reverse_ignored {
ignored_opts.push('r');
}
if flags.mode_version && !uses_mode(SortMode::Version) {
if flags.modes.version && !uses_mode(SortMode::Version) {
ignored_opts.push('V');
}

Expand Down Expand Up @@ -2236,25 +2244,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
.unwrap_or_default()
};

let mut mode_flags = ModeFlags {
human_numeric: matches.get_flag(options::modes::HUMAN_NUMERIC),
month: matches.get_flag(options::modes::MONTH),
general_numeric: matches.get_flag(options::modes::GENERAL_NUMERIC),
numeric: matches.get_flag(options::modes::NUMERIC),
version: matches.get_flag(options::modes::VERSION),
random: matches.get_flag(options::modes::RANDOM),
};
if let Some(sort_arg) = matches.get_one::<String>(options::modes::SORT) {
match sort_arg.as_str() {
"human-numeric" => mode_flags.human_numeric = true,
"month" => mode_flags.month = true,
"general-numeric" => mode_flags.general_numeric = true,
"numeric" => mode_flags.numeric = true,
"version" => mode_flags.version = true,
"random" => mode_flags.random = true,
_ => {}
}
}
let mode_flags = ModeFlags::from_matches(&matches);

let dictionary_order = matches.get_flag(options::DICTIONARY_ORDER);
let ignore_non_printing = matches.get_flag(options::IGNORE_NONPRINTING);
Expand Down Expand Up @@ -2538,6 +2528,7 @@ pub fn uu_app() -> Command {
.arg(
Arg::new(options::modes::SORT)
.long(options::modes::SORT)
.action(ArgAction::Append)
.value_parser(ShortcutValueParser::new([
"general-numeric",
"human-numeric",
Expand Down
28 changes: 28 additions & 0 deletions tests/by-util/test_sort.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1075,6 +1075,34 @@ fn test_incompatible_options() {
.fails_with_code(2)
.stderr_only("sort: options '-nR' are incompatible\n");

new_ucmd!()
.args(&["--sort=general-numeric", "--sort=human-numeric"])
.fails_with_code(2)
.stderr_only("sort: options '-gh' are incompatible\n");

new_ucmd!()
.args(&["-h", "--sort=general-numeric", "--sort=human-numeric"])
.fails_with_code(2)
.stderr_only("sort: options '-gh' are incompatible\n");

new_ucmd!()
.args(&["--sort=general-numeric", "--sort=general-numeric"])
.pipe_in("1e2\n20\n")
.succeeds()
.stdout_only("20\n1e2\n");

new_ucmd!()
.env("LC_ALL", "C")
.args(&[
"--debug",
"--sort=general-numeric",
"--sort=human-numeric",
"-k1,1n",
])
.pipe_in("")
.succeeds()
.stderr_contains("sort: options '-gh' are ignored\n");

new_ucmd!()
.args(&["-c", "-o", "out"])
.fails_with_code(2)
Expand Down
Loading