From 5479c435fde32e720af5e177e95d6364a422885a Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 29 Jul 2022 16:40:00 +0200 Subject: sort: fix sort -s -u, closes 14871 function old new delta sort_main 851 856 +5 Signed-off-by: Denys Vlasenko --- coreutils/sort.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'coreutils') diff --git a/coreutils/sort.c b/coreutils/sort.c index 80b578fc2..01b7c44e5 100644 --- a/coreutils/sort.c +++ b/coreutils/sort.c @@ -652,11 +652,12 @@ int sort_main(int argc UNUSED_PARAM, char **argv) /* Handle -u */ if (option_mask32 & FLAG_u) { int j = 0; - /* coreutils 6.3 drop lines for which only key is the same - * -- disabling last-resort compare, or else compare_keys() - * will be the same only for completely identical lines. + /* coreutils 6.3 drop lines for which only key is the same: + * - disabling last-resort compare, or else compare_keys() + * will be the same only for completely identical lines + * - disabling -s (same reasons) */ - option_mask32 |= FLAG_no_tie_break; + option_mask32 = (option_mask32 | FLAG_no_tie_break) & (~FLAG_s); for (i = 1; i < linecount; i++) { if (compare_keys(&lines[j], &lines[i]) == 0) free(lines[i]); -- cgit v1.2.1