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

bmomjian · bmomjian · commit b6f0ad4b0ed7 · 2008-04-04T18:00:25.000Z
Greg Sabino Mullane
diff --git 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
@@ -3,15 +3,14 @@
  *
  * 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"
 
 
 #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;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2008, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.125 2008/04/04 17:42:43 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.126 2008/04/04 18:00:25 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include "postgres_fe.h"`
`9`	`9`
`@@ -188,7 +188,6 @@ slashUsage(unsigned short int pager)`
`188`	`188`	`ON(pset.timing));`
`189`	`189`	`fprintf(output, _(" \\unset NAME unset (delete) internal variable\n"));`
`190`	`190`	`fprintf(output, _(" \\! [COMMAND] execute command in shell or start interactive shell\n"));`
`191`		`- fprintf(output, _(" \\? display this help output\n"));`
`192`	`191`	`fprintf(output, "\n");`
`193`	`192`
`194`	`193`	`fprintf(output, _("Query Buffer\n"));`