Re: [PATCH]: Invalid nonimplemented option in chcon

[Jim Meyering]

Ondřej Vašík <address@hidden> wrote:
> Hello,
> as reported in RedHat bugzilla #463883, chcon option -c is described in
> help, but not implemented. After short talk with Jim via IRC decision
> was to remove this option and related things from chcon source code
> completetely.
> It is done in attached patch.

Thanks.
I expect to push this tomorrow.
I adjusted only the log message:


>From 9c0c57a1b477afde78df69210a1a15ea9610e140 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= <address@hidden>
Date: Mon, 6 Oct 2008 12:42:45 +0200
Subject: [PATCH] chcon: remove traces of unimplemented --change (-c) option

This option was never supported in upstream coreutils.
* chcon.c (usage): Remove --change (-c) from help message.
(main): Remove 'c' from getopt string.
Remove related and now-unused enums.
---
 src/chcon.c |   23 +----------------------
 1 files changed, 1 insertions(+), 22 deletions(-)

diff --git a/src/chcon.c b/src/chcon.c
index c929cdf..022858a 100644
--- a/src/chcon.c
+++ b/src/chcon.c
@@ -35,26 +35,6 @@
   proper_name ("Russell Coker"), \
   proper_name ("Jim Meyering")

-enum Change_status
-{
-  CH_NOT_APPLIED,
-  CH_SUCCEEDED,
-  CH_FAILED,
-  CH_NO_CHANGE_REQUESTED
-};
-
-enum Verbosity
-{
-  /* Print a message for each file that is processed.  */
-  V_high,
-
-  /* Print a message for each file whose attributes we change.  */
-  V_changes_only,
-
-  /* Do not be verbose.  This is the default. */
-  V_off
-};
-
 /* If nonzero, and the systems has support for it, change the context
    of symbolic links rather than any files they point to.  */
 static bool affect_symlink_referent;
@@ -369,7 +349,6 @@ Usage: %s [OPTION]... CONTEXT FILE...\n\
 Change the security context of each FILE to CONTEXT.\n\
 With --reference, change the security context of each FILE to that of RFILE.\n\
 \n\
-  -c, --changes          like verbose but report only when a change is made\n\
   -h, --no-dereference   affect symbolic links instead of any referenced 
file\n\
 "), stdout);
       fputs (_("\
@@ -430,7 +409,7 @@ main (int argc, char **argv)

   atexit (close_stdout);

-  while ((optc = getopt_long (argc, argv, "HLPRchvu:r:t:l:", long_options, 
NULL))
+  while ((optc = getopt_long (argc, argv, "HLPRhvu:r:t:l:", long_options, 
NULL))
         != -1)
     {
       switch (optc)
--
1.6.0.2.307.gc427