This patch, put together by Manuel Novoa III, is a merge of work

done by Evin Robertson (bug#1105) and work from Manuel to make
usage messages occupy less space and simplify how usage messages
are displayed.

3 files changed, 3 insertions, 3 deletions

diff --git a/findutils/find.c b/findutils/find.c
index a4d056b54..a07dc8ecb 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -178,7 +178,7 @@ int find_main(int argc, char **argv)
                                 mtime_days = -mtime_days;
 #endif
                 } else
-                        usage(find_usage);
+                        show_usage();
         }
 
         if (firstopt == 1) {
diff --git a/findutils/grep.c b/findutils/grep.c
index 3eea7792f..475b4ef21 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -237,7 +237,7 @@ extern int grep_main(int argc, char **argv)
 
         /* argv[optind] should be the regex pattern; no pattern, no worky */
         if (argv[optind] == NULL)
-                usage(grep_usage);
+                show_usage();
 
         /* sanity check */
         if (print_count_only || be_quiet) {
diff --git a/findutils/which.c b/findutils/which.c
index 981a8acf5..1908db30a 100644
--- a/findutils/which.c
+++ b/findutils/which.c
@@ -33,7 +33,7 @@ extern int which_main(int argc, char **argv)
         int i, count=1, found, status = EXIT_SUCCESS;
 
         if (argc <= 1 || **(argv + 1) == '-')
-                usage(which_usage);
+                show_usage();
         argc--;
 
         path_list = getenv("PATH");