Have psql command 'help' suggest the use of \?, updated version.

Greg Sabino Mullane

diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index cb60dd8759dcfbc2fce2b8c027d6b69541b72434..1cd6a87e153f26b685d0cb99893705e14be87c4e 100644 (file)
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2008, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.125 2008/04/04 17:42:43 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.126 2008/04/04 18:00:25 momjian Exp $
  */
 #include "postgres_fe.h"
 
@@ -188,7 +188,6 @@ slashUsage(unsigned short int pager)
                        ON(pset.timing));
        fprintf(output, _("  \\unset NAME    unset (delete) internal variable\n"));
        fprintf(output, _("  \\! [COMMAND]   execute command in shell or start interactive shell\n"));
-       fprintf(output, _("  \\?             display this help output\n"));
        fprintf(output, "\n");
 
        fprintf(output, _("Query Buffer\n"));

diff --git a/src/bin/psql/mainloop.c b/src/bin/psql/mainloop.c
index 3cdcd2d3cd66dac2624976d5a108aecba9bad75f..bec930b8f5db61b35ae6ac5b046320268a048f09 100644 (file)
--- a/src/bin/psql/mainloop.c
+++ b/src/bin/psql/mainloop.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2008, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/mainloop.c,v 1.88 2008/04/04 17:42:43 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/mainloop.c,v 1.89 2008/04/04 18:00:25 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "mainloop.h"
@@ -11,7 +11,6 @@
 
 #include "command.h"
 #include "common.h"
-#include "help.h"
 #include "input.h"
 #include "settings.h"
 
@@ -172,13 +171,16 @@ MainLoop(FILE *source)
                        continue;
                }
 
-               /* A request for help? Be friendly and show them the slash way of doing things */
+               /* A request for help? Be friendly and give them some guidance */
                if (pset.cur_cmd_interactive && query_buf->len == 0 &&
                        pg_strncasecmp(line, "help", 4) == 0 &&
                        (line[4] == '\0' || line[4] == ';' || isspace(line[4])))
                {
                        free(line);
-                       slashUsage(pset.popt.topt.pager);
+                       puts("You are using psql, the command-line interface to PostgreSQL.");
+                       puts("Enter SQL commands, or type \\? for a list of backslash options.");
+                       puts("Use \\h for SQL command help.");
+                       puts("Use \\q to quit.");
                        continue;
                }