Enhanced error/help message for pg_controldata.

Serguei Mokhov

diff --git a/src/bin/pg_controldata/pg_controldata.c b/src/bin/pg_controldata/pg_controldata.c
index 2a6c5c7d8072470b8656d2e39264e3cad2a2ab04..7c99bbb10cf6646cb0a308768ad347ab9d0c31c3 100644 (file)
--- a/src/bin/pg_controldata/pg_controldata.c
+++ b/src/bin/pg_controldata/pg_controldata.c
@@ -6,7 +6,7 @@
  * copyright (c) Oliver Elphick <olly@lfix.co.uk>, 2001;
  * licence: BSD
  *
- * $Header: /cvsroot/pgsql/src/bin/pg_controldata/pg_controldata.c,v 1.7 2002/10/18 22:05:35 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/pg_controldata/pg_controldata.c,v 1.8 2003/01/08 22:26:34 momjian Exp $
  */
 #include "postgres.h"
 
@@ -25,9 +25,20 @@
 static void
 usage(const char *progname)
 {
-       printf(_("%s displays PostgreSQL database cluster control information.\n\n"), progname);
-       printf(_("Usage:\n  %s [DATADIR]\n\n"), progname);
-       printf(_("If not data directory is specified, the environment variable PGDATA\nis used.\n\n"));
+       printf
+       (
+               _(
+                       "Usage:\n"
+                       "  %s [OPTION]\n\n"
+                       "Options:\n"
+                       "  DATADIR        show cluster control information for DATADIR\n"
+                       "  -?, --help     display this help and exit\n"
+                       "  -V, --version  display pg_controldata's version and exit\n\n"
+               ),
+               progname
+       );
+       printf(_("%s displays PostgreSQL database cluster control information.\n"), progname);
+       printf(_("If no data directory is specified, the environment variable PGDATA\nis used.\n\n"));
        printf(_("Report bugs to <pgsql-bugs@postgresql.org>.\n"));
 }
 
@@ -97,6 +108,7 @@ main(int argc, char *argv[])
        if (DataDir == NULL)
        {
                fprintf(stderr, _("%s: no data directory specified\n"), progname);
+               fprintf(stderr, _("Try '%s --help' for more information.\n"), progname);
                exit(1);
        }