From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 15 Dec 2005 00:00:02 +0000 (+0000)
Subject: Diagnose "sort -c -o FILE".
X-Git-Tag: v6.0~1117
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cd423584189a10f16d96f9b37c897e74371fdf80;p=thirdparty%2Fcoreutils.git

Diagnose "sort -c -o FILE".
---

diff --git a/ChangeLog b/ChangeLog
index c827d8efc7..dda3b137ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,9 +3,12 @@
 	* 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/sort.c (incompatible_options, check_ordering_compatibility):
+	New functions.
+	(main): Use them.  Don't bother with a usage message for
+	"sort -c a b", for consistency with other error diagnostics.
+	* tests/sort/Test.pm (incompat1, incompat2, incompat3, incompat4):
+	New tests.
 
 	* src/cat.c (main): Undo previous change.  close_stdout already
 	does the check, so the previous change wasn't necessary.