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 792c4eea22b643394bd41cd0c3f29c4954299242..8d3b24368ddf55f3dcba2e3212315fb46a86d368 100644 (file)
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -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 ab0743a853df4e4bf63825a2065a3a03eb9d4727..cbeef4637c3a535a15a0e7bdd928adca22ae1c9c 100644 (file)
--- a/src/bin/psql/mainloop.c
+++ b/src/bin/psql/mainloop.c
@@ -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;
                }