diff options
| author |   millert <millert@openbsd.org> | 2019-12-30 16:07:13 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2019-12-30 16:07:13 +0000 |
| commit | aee7016fe9cbea08a2b28e764fcfd2d79cf7579e (patch) | |
| tree | 364dd415617ba28179ba73a5f5dc1ca963b565ac | |
| parent | Convert infinite sleeps to {m,t}sleep_nsec(9). (diff) | |
| download | wireguard-openbsd-aee7016fe9cbea08a2b28e764fcfd2d79cf7579e.tar.xz wireguard-openbsd-aee7016fe9cbea08a2b28e764fcfd2d79cf7579e.zip | |
Do not perform top-level sort when -c is used with a -k field.
From Richard Ipsum
| -rw-r--r-- | usr.bin/sort/file.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/sort/file.c b/usr.bin/sort/file.c index 9d84d7cb4f6..d3b97f5b2df 100644 --- a/usr.bin/sort/file.c +++ b/usr.bin/sort/file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: file.c,v 1.22 2019/05/15 09:07:46 schwarze Exp $ */ +/* $OpenBSD: file.c,v 1.23 2019/12/30 16:07:13 millert Exp $ */ /*- * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org> @@ -387,7 +387,8 @@ check(const char *fn) printf("; cmp1=%d", cmp); if (!cmp && sort_opts_vals.complex_sort && - !(sort_opts_vals.uflag) && !(sort_opts_vals.sflag)) { + !(sort_opts_vals.uflag) && !(sort_opts_vals.sflag) && + !(sort_opts_vals.kflag)) { cmp = top_level_str_coll(s2, s1); if (debug_sort) printf("; cmp2=%d", cmp); |