summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS4
-rw-r--r--src/stat.c11
2 files changed, 5 insertions, 10 deletions
diff --git a/NEWS b/NEWS
index 46067b8db..3e170c501 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,10 @@ GNU coreutils NEWS -*- outline -*-
sort -g now uses long doubles for greater range and precision.
+ stat no longer accepts the --context (-Z) option. Initially it was
+ merely accepted and ignored, for compatibility. Starting two years
+ ago, with coreutils-7.0, its use evoked a warning.
+
touch's --file option is no longer recognized. Use --reference=F (-r)
instead. --file has not been documented for 15 years, and its use has
elicited a warning since coreutils-7.1.
diff --git a/src/stat.c b/src/stat.c
index 39d30777e..f1b5ef110 100644
--- a/src/stat.c
+++ b/src/stat.c
@@ -1071,7 +1071,7 @@ main (int argc, char *argv[])
atexit (close_stdout);
- while ((c = getopt_long (argc, argv, "c:fLtZ", long_options, NULL)) != -1)
+ while ((c = getopt_long (argc, argv, "c:fLt", long_options, NULL)) != -1)
{
switch (c)
{
@@ -1099,15 +1099,6 @@ main (int argc, char *argv[])
terse = true;
break;
- case 'Z': /* FIXME: remove in 2010 */
- /* Ignore, for compatibility with distributions
- that implemented this before upstream.
- But warn of impending removal. */
- error (0, 0,
- _("the --context (-Z) option is obsolete and will be removed\n"
- "in a future release"));
- break;
-
case_GETOPT_HELP_CHAR;
case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);