Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
20 changes: 11 additions & 9 deletions src/uu/sort/src/sort.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1846,11 +1846,13 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
uucore::clap_localization::handle_clap_result_with_exit_code(uu_app(), processed_args, 2)?;

// Prevent -o/--output to be specified multiple times
if matches
.get_occurrences::<OsString>(options::OUTPUT)
.is_some_and(|out| out.len() > 1)
{
return Err(SortError::MultipleOutputFiles.into());
if let Some(outputs) = matches.get_many::<OsString>(options::OUTPUT) {
let mut iter = outputs.into_iter();
if let Some(first) = iter.next() {
if iter.any(|out| out != first) {
return Err(SortError::MultipleOutputFiles.into());
}
}
Comment thread
mattsu2020 marked this conversation as resolved.
Outdated
}

settings.debug = matches.get_flag(options::DEBUG);
Expand Down Expand Up @@ -2620,13 +2622,13 @@ fn compare_by<'a>(
/// untouched and we avoid locale-sensitive routines such as `strcasecmp`.
fn ascii_case_insensitive_cmp(a: &[u8], b: &[u8]) -> Ordering {
#[inline]
fn lower(byte: u8) -> u8 {
byte.to_ascii_lowercase()
fn fold(byte: u8) -> u8 {
byte.to_ascii_uppercase()
}

for (lhs, rhs) in a.iter().copied().zip(b.iter().copied()) {
let l = lower(lhs);
let r = lower(rhs);
let l = fold(lhs);
let r = fold(rhs);
if l != r {
return l.cmp(&r);
}
Expand Down
28 changes: 28 additions & 0 deletions tests/by-util/test_sort.rs
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,24 @@ fn test_version_sort_stable() {
.stdout_is("0.1\n0.02\n0.2\n0.002\n0.3\n");
}

#[test]
fn test_ignore_case_orders_punctuation_after_letters() {
new_ucmd!()
.arg("-f")
.pipe_in("A\na\n_\n")
.succeeds()
.stdout_is("A\na\n_\n");
}

#[test]
fn test_ignore_case_unique_orders_punctuation_after_letters() {
new_ucmd!()
.arg("-fu")
.pipe_in("a\n_\n")
.succeeds()
.stdout_is("a\n_\n");
}

#[test]
fn test_human_numeric_whitespace() {
test_helper(
Expand Down Expand Up @@ -1450,6 +1468,16 @@ fn test_multiple_output_files() {
.stderr_is("sort: multiple output files specified\n");
}

#[test]
// Test for GNU tests/sort/sort.pl "o3"
fn test_duplicate_output_files_allowed() {
new_ucmd!()
.args(&["-o", "foo", "-o", "foo"])
.pipe_in("")
.succeeds()
.no_stderr();
}

#[test]
fn test_output_file_with_leading_dash() {
let test_cases = [
Expand Down
Loading