diff options
| author | Robert Milasan <rmilasan@suse.com> | 2015-01-01 18:11:22 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2015-01-01 14:38:21 -0500 |
| commit | 257e968d8c726e1a7be7b455d0e6ad29b5d0756c (patch) | |
| tree | 9517dbfc4366d1df78cbffdf51da6e3f6b1a17cf | |
| parent | ba52f15a5827b7ae8c55c53cdcc5bb9a6abbf0db (diff) | |
udev: improve help/usage for some more programs
| -rw-r--r-- | src/udev/ata_id/ata_id.c | 4 | ||||
| -rw-r--r-- | src/udev/cdrom_id/cdrom_id.c | 10 | ||||
| -rw-r--r-- | src/udev/collect/collect.c | 10 | ||||
| -rw-r--r-- | src/udev/scsi_id/scsi_id.c | 2 | ||||
| -rw-r--r-- | src/udev/v4l_id/v4l_id.c | 2 |
5 files changed, 15 insertions, 13 deletions
diff --git a/src/udev/ata_id/ata_id.c b/src/udev/ata_id/ata_id.c index e6344f983a..31bc1675e8 100644 --- a/src/udev/ata_id/ata_id.c +++ b/src/udev/ata_id/ata_id.c @@ -450,8 +450,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/udev/cdrom_id/cdrom_id.c b/src/udev/cdrom_id/cdrom_id.c index 8a41c4f2bd..6052f6abd8 100644 --- a/src/udev/cdrom_id/cdrom_id.c +++ b/src/udev/cdrom_id/cdrom_id.c @@ -891,11 +891,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/udev/collect/collect.c b/src/udev/collect/collect.c index 16675fbe0e..11a618c8e2 100644 --- a/src/udev/collect/collect.c +++ b/src/udev/collect/collect.c @@ -68,15 +68,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/udev/scsi_id/scsi_id.c b/src/udev/scsi_id/scsi_id.c index 27adb09d15..52702331a3 100644 --- a/src/udev/scsi_id/scsi_id.c +++ b/src/udev/scsi_id/scsi_id.c @@ -313,7 +313,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/udev/v4l_id/v4l_id.c b/src/udev/v4l_id/v4l_id.c index d5463b27e5..08d3efa857 100644 --- a/src/udev/v4l_id/v4l_id.c +++ b/src/udev/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; |