From 2ce4bb9f127e3e57494b29310e08dbb226de70cd Mon Sep 17 00:00:00 2001
From: Robert Milasan <rmilasan@suse.com>
Date: Thu, 1 Jan 2015 18:11:22 +0100
Subject: udev: improve help/usage for some more programs

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
---
 src/ata_id/ata_id.c     |  4 ++--
 src/cdrom_id/cdrom_id.c | 10 +++++-----
 src/collect/collect.c   | 10 ++++++----
 src/scsi_id/scsi_id.c   |  2 +-
 src/v4l_id/v4l_id.c     |  2 +-
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/ata_id/ata_id.c b/src/ata_id/ata_id.c
index 1e12519c6c..175e619a70 100644
--- a/src/ata_id/ata_id.c
+++ b/src/ata_id/ata_id.c
@@ -453,8 +453,8 @@ int main(int argc, char *argv[])
                         break;
                 case 'h':
                         printf("Usage: ata_id [--export] [--help] <device>\n"
-                               "  --export    print values as environment keys\n"
-                               "  --help      print this help text\n\n");
+                               "  -x,--export    print values as environment keys\n"
+                               "  -h,--help      print this help text\n\n");
                         return 0;
                 }
         }
diff --git a/src/cdrom_id/cdrom_id.c b/src/cdrom_id/cdrom_id.c
index a857e85ca6..7bafd62809 100644
--- a/src/cdrom_id/cdrom_id.c
+++ b/src/cdrom_id/cdrom_id.c
@@ -894,11 +894,11 @@ int main(int argc, char *argv[])
                         break;
                 case 'h':
                         printf("Usage: cdrom_id [options] <device>\n"
-                               "  --lock-media    lock the media (to enable eject request events)\n"
-                               "  --unlock-media  unlock the media\n"
-                               "  --eject-media   eject the media\n"
-                               "  --debug         debug to stderr\n"
-                               "  --help          print this help text\n\n");
+                               "  -l,--lock-media    lock the media (to enable eject request events)\n"
+                               "  -u,--unlock-media  unlock the media\n"
+                               "  -e,--eject-media   eject the media\n"
+                               "  -d,--debug         debug to stderr\n"
+                               "  -h,--help          print this help text\n\n");
                         goto exit;
                 default:
                         rc = 1;
diff --git a/src/collect/collect.c b/src/collect/collect.c
index 538aa29db9..438d3a6eb7 100644
--- a/src/collect/collect.c
+++ b/src/collect/collect.c
@@ -72,15 +72,17 @@ noreturn static void sig_alrm(int signo)
 
 static void usage(void)
 {
-        printf("usage: collect [--add|--remove] [--debug] <checkpoint> <id> <idlist>\n"
-               "\n"
+        printf("Usage: collect [options] <checkpoint> <id> <idlist>\n"
+               "  -a,--add         add ID <id> to the list <idlist>\n"
+               "  -r,--remove      remove ID <id> from the list <idlist>\n"
+               "  -d,--debug       debug to stderr\n"
+               "  -h,--help        print this help text\n\n"
                "  Adds ID <id> to the list governed by <checkpoint>.\n"
                "  <id> must be part of the list <idlist>.\n"
                "  If all IDs given by <idlist> are listed (ie collect has been\n"
                "  invoked for each ID in <idlist>) collect returns 0, the\n"
                "  number of missing IDs otherwise.\n"
-               "  On error a negative number is returned.\n"
-               "\n");
+               "  On error a negative number is returned.\n\n");
 }
 
 /*
diff --git a/src/scsi_id/scsi_id.c b/src/scsi_id/scsi_id.c
index 762e70bc56..efd56d2801 100644
--- a/src/scsi_id/scsi_id.c
+++ b/src/scsi_id/scsi_id.c
@@ -317,7 +317,7 @@ static void help(void) {
                "  -g,--whitelisted                 treat device as whitelisted\n"
                "  -u,--replace-whitespace          replace all whitespace by underscores\n"
                "  -v,--verbose                     verbose logging\n"
-               "     --version                     print version\n"
+               "  -V,--version                     print version\n"
                "  -x,--export                      print values as environment keys\n"
                "  -h,--help                        print this help text\n\n");
 
diff --git a/src/v4l_id/v4l_id.c b/src/v4l_id/v4l_id.c
index d5463b27e5..08d3efa857 100644
--- a/src/v4l_id/v4l_id.c
+++ b/src/v4l_id/v4l_id.c
@@ -45,7 +45,7 @@ int main (int argc, char *argv[])
 
                 switch (option) {
                 case 'h':
-                        printf("Usage: v4l_id [--help] <device file>\n\n");
+                        printf("Usage: v4l_id [-h,--help] <device file>\n\n");
                         return 0;
                 default:
                         return 1;
-- 
cgit v1.2.3-54-g00ecf