More descriptive usage screen.

Slightly modified from patch by Jacob Coby.

diff --git a/src/main.c b/src/main.c
index aa9afe39a9e4ec6b972dcc867e8bc766a01a6961..d8b19c927ce09989f580031f86f925d5f972e225 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -34,11 +34,17 @@ static const char *get_auth(ConfElem *elem);
 static bool set_defer_accept(ConfElem *elem, const char *val, PgSocket *console);
 
 static const char *usage_str =
-"usage: pgbouncer [-d] [-R] [-q] [-v] [-h|-V] config.ini\n";
-
-static void usage(int err)
+"Usage: %s [OPTION]... config.ini\n"
+"  -d            Run in background (as a daemon)\n"
+"  -R            Do a online restart\n"
+"  -q            Run quietly\n"
+"  -v            Increase verbosity\n"
+"  -V            Show version\n"
+"  -h            Show this help screen and exit\n";
+
+static void usage(int err, const char *exe)
 {
-       printf(usage_str);
+       printf(usage_str, basename(exe));
        exit(err);
 }
 
@@ -577,12 +583,13 @@ int main(int argc, char *argv[])
                        cf_quiet = 1;
                        break;
                case 'h':
+                       usage(0, argv[0]);
                default:
-                       usage(1);
+                       usage(1, argv[0]);
                }
        }
        if (optind + 1 != argc)
-               usage(1);
+               usage(1, argv[0]);
        cf_config_file = argv[optind];
 
        init_objects();