chcon, runcon: --help output did not include bug reporting address

[Jim Meyering]

I noticed that chcon and runcon were exempted from some of the tests
in misc/help-version.  That exemption (probably back from when I added
preliminary versions) was hiding this small defect:

>From bbc0cb0f37641b1779170b3e15bd3479fb250fed Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 26 Apr 2008 09:14:55 +0200
Subject: [PATCH] chcon, runcon: make --help print the bug-reporting address

* src/chcon.c (usage): Use emit_bug_reporting_address.
* src/runcon.c (usage): Likewise.
* tests/misc/help-version: Don't exempt chcon and runcon.
* NEWS: Mention this.

Signed-off-by: Jim Meyering <address@hidden>
---
 NEWS                    |    2 ++
 src/chcon.c             |    1 +
 src/runcon.c            |    1 +
 tests/misc/help-version |    2 --
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 18d9851..faf2b1d 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@ GNU coreutils NEWS                                    -*- 
outline -*-

 ** Bug fixes

+  chcon, runcon: --help output now includes the bug-reporting address
+
   id with no options now prints the SELinux context only when invoked
   with no USERNAME argument.

diff --git a/src/chcon.c b/src/chcon.c
index 4f091a3..01bb4ad 100644
--- a/src/chcon.c
+++ b/src/chcon.c
@@ -400,6 +400,7 @@ one takes effect.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }
diff --git a/src/runcon.c b/src/runcon.c
index 85e5f59..4188601 100644
--- a/src/runcon.c
+++ b/src/runcon.c
@@ -85,6 +85,7 @@ With neither CONTEXT nor COMMAND, print the current security 
context.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }
diff --git a/tests/misc/help-version b/tests/misc/help-version
index 25364df..f383fa6 100755
--- a/tests/misc/help-version
+++ b/tests/misc/help-version
@@ -47,8 +47,6 @@ for lang in C fr da; do

     # Skip `test'; it doesn't accept --help or --version.
     test $i = test && continue;
-    test $i = chcon && continue;
-    test $i = runcon && continue;

     # false fails even when invoked with --help or --version.
     if test $i = false; then
--
1.5.5.1.68.gbdcd8