summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2005-12-14 22:46:17 +0000
committerPaul Eggert <eggert@cs.ucla.edu>2005-12-14 22:46:17 +0000
commit1dbd70442d7e177ffd6d13a46d0568778ba49ce5 (patch)
treea1c65b17e978e43ce2f05d251714aefeeb912ce5
parent56805cd20232d0065be1091df04969c5597d75b1 (diff)
downloadcoreutils-1dbd70442d7e177ffd6d13a46d0568778ba49ce5.tar.xz
sort now reports incompatible options.
-rw-r--r--ChangeLog5
-rw-r--r--NEWS3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 418a6b6d4..c827d8efc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
* Version 6.0-cvs.
+ * NEWS: sort now reports incompatible options.
+ * src/sort.c (check_ordering_compatibility): New function.
+ (main): Use it.
+ * tests/sort/Test.pm (incompat1, incompat2, incompat3): New tests.
+
* src/cat.c (main): Undo previous change. close_stdout already
does the check, so the previous change wasn't necessary.
diff --git a/NEWS b/NEWS
index dbf8a7d6b..182704b57 100644
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,9 @@ GNU coreutils NEWS -*- outline -*-
if your locale settings appear to be messed up. This change
attempts to have the default be the best of both worlds.
+ sort now reports incompatible options (e.g., -i and -n) rather than
+ silently ignoring one of them.
+
** Scheduled for removal
rm's --directory (-d) option is scheduled for removal in 2006. This