CF_USAGE printed (description of -S and -C parameters)

diff --git a/lib/bucket.c b/lib/bucket.c
index e073e6df201c923ba1406c1cdf2c785ea322cebd..38d552e0c44d0ed2016d73371ac8241d6091264b 100644 (file)
--- a/lib/bucket.c
+++ b/lib/bucket.c
@@ -428,7 +428,7 @@ int main(int argc, char **argv)
   log_init(NULL);
   if (cf_getopt(argc, argv, CF_SHORT_OPTS, CF_NO_LONG_OPTS, NULL) >= 0 ||
       optind < argc)
-    die("This program has no command-line arguments.");
+    die("This program supports only the following command-line arguments:\n" CF_USAGE);
 
   unlink(obuck_name);
   obuck_init(1);

diff --git a/lib/buckettool.c b/lib/buckettool.c
index 427543098cc2b40d3b8e0bcffd05e4e1a476f227..488074e29bf0870f7efc28e177faad7334e27276 100644 (file)
--- a/lib/buckettool.c
+++ b/lib/buckettool.c
@@ -22,9 +22,11 @@ static void
 help(void)
 {
   fprintf(stderr, "\
-Usage: buckettool <command>\n\
+Usage: buckettool [<options>] <command>\n\
 \n\
-Commands:\n\
+Options:\n"
+CF_USAGE
+"\nCommands:\n\
 -l\t\tlist all buckets\n\
 -L\t\tlist all buckets including deleted ones\n\
 -d <obj>\tdelete bucket\n\

diff --git a/lib/sort-test.c b/lib/sort-test.c
index 337c4fa2ddea0b365929dd705b7917a680749c7f..9d32277797af76f22eb929d3b948b39fc62a6d7f 100644 (file)
--- a/lib/sort-test.c
+++ b/lib/sort-test.c
@@ -79,7 +79,7 @@ main(int argc, char **argv)
   log_init(NULL);
   if (cf_getopt(argc, argv, CF_SHORT_OPTS, CF_NO_LONG_OPTS, NULL) >= 0 ||
       optind != argc - 2)
-    die("Usage: sort-test <input> <output>");
+    die("Usage: sort-test [<options>] <input> <output>\nOptions:\n" CF_USAGE);
 
   s_sort(argv[optind], argv[optind+1]);
   return 0;