From 1dbd70442d7e177ffd6d13a46d0568778ba49ce5 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 14 Dec 2005 22:46:17 +0000 Subject: sort now reports incompatible options. --- ChangeLog | 5 +++++ NEWS | 3 +++ 2 files changed, 8 insertions(+) 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 -- cgit v1.2.3-70-g09d2