mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2026-11-17 18:02:09 +03:00
sort: modify 'leading spaces' debug warning scenarios
Print warning regardless of locale, avoid warning if key is zero width. Problem reported by Karl Berry in http://bugs.gnu.org/23665 . * src/sort.c: (key_warnings): change conditions for 'leading spaces' warning. * tests/misc/sort-debug-warn.sh: adjust tests accordingly.
This commit is contained in:
1 parent
d548f87595
commit
6223bf94bf
2 files changed
+6
-6
No files matched your search
+4
-5
@@ -2424,16 +2424,15 @@ key_warnings (struct keyfield const *gkey, bool gkey_only)
|
||||
}
|
||||
|
||||
/* Warn about field specs that will never match. */
|
||||
if (key->sword != SIZE_MAX && key->eword < key->sword)
|
||||
bool zero_width = key->sword != SIZE_MAX && key->eword < key->sword;
|
||||
if (zero_width)
|
||||
error (0, 0, _("key %lu has zero width and will be ignored"), keynum);
|
||||
|
||||
/* Warn about significant leading blanks. */
|
||||
bool implicit_skip = key_numeric (key) || key->month;
|
||||
bool maybe_space_aligned = !hard_LC_COLLATE && default_key_compare (key)
|
||||
&& !(key->schar || key->echar);
|
||||
bool line_offset = key->eword == 0 && key->echar != 0; /* -k1.x,1.y */
|
||||
if (!gkey_only && tab == TAB_DEFAULT && !line_offset
|
||||
&& ((!key->skipsblanks && !(implicit_skip || maybe_space_aligned))
|
||||
if (!zero_width && !gkey_only && tab == TAB_DEFAULT && !line_offset
|
||||
&& ((!key->skipsblanks && !implicit_skip)
|
||||
|| (!key->skipsblanks && key->schar)
|
||||
|| (!key->skipeblanks && key->echar)))
|
||||
error (0, 0, _("leading blanks are significant in key %lu; "
|
||||
|
||||
@@ -41,6 +41,7 @@ sort: using simple byte comparison
|
||||
sort: option '-r' only applies to last-resort comparison
|
||||
7
|
||||
sort: using simple byte comparison
|
||||
sort: leading blanks are significant in key 2; consider also specifying 'b'
|
||||
sort: options '-bg' are ignored
|
||||
8
|
||||
sort: using simple byte comparison
|
||||
@@ -51,6 +52,7 @@ sort: option '-b' is ignored
|
||||
sort: using simple byte comparison
|
||||
11
|
||||
sort: using simple byte comparison
|
||||
sort: leading blanks are significant in key 1; consider also specifying 'b'
|
||||
12
|
||||
sort: using simple byte comparison
|
||||
sort: leading blanks are significant in key 1; consider also specifying 'b'
|
||||
@@ -116,7 +118,6 @@ sort: using simple byte comparison
|
||||
sort: key 1 is numeric and spans multiple fields
|
||||
sort: obsolescent key '+2 -1' used; consider '-k 3,1' instead
|
||||
sort: key 2 has zero width and will be ignored
|
||||
sort: leading blanks are significant in key 2; consider also specifying 'b'
|
||||
sort: option '-b' is ignored
|
||||
sort: option '-r' only applies to last-resort comparison
|
||||
EOF
|
||||
|
||||
Reference in new issue
Block a user