Commitb6f0ad4

committed

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

Greg Sabino Mullane

1 parentdc565af commitb6f0ad4Copy full SHA for b6f0ad4

File tree

-6

lines changed

-6

lines changed

Lines changed: 1 addition & 2 deletions

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/0417:42:43 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.126 2008/04/0418: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"));`

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,15 +3,14 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2008, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/mainloop.c,v 1.88 2008/04/0417:42:43 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/mainloop.c,v 1.89 2008/04/0418:00:25 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`	`#include"mainloop.h"`
`10`	`10`
`11`	`11`
`12`	`12`	`#include"command.h"`
`13`	`13`	`#include"common.h"`
`14`		`-#include"help.h"`
`15`	`14`	`#include"input.h"`
`16`	`15`	`#include"settings.h"`
`17`	`16`
`@@ -172,13 +171,16 @@ MainLoop(FILE *source)`
`172`	`171`	`continue;`
`173`	`172`	`}`
`174`	`173`
`175`		`-/* A request for help? Be friendly andshow themthe slash way of doing things */`
	`174`	`+/* A request for help? Be friendly andgive themsome guidance */`
`176`	`175`	`if (pset.cur_cmd_interactive&&query_buf->len==0&&`
`177`	`176`	`pg_strncasecmp(line,"help",4)==0&&`
`178`	`177`	`(line[4]=='\0'\|\|line[4]==';'\|\|isspace(line[4])))`
`179`	`178`	`{`
`180`	`179`	`free(line);`
`181`		`-slashUsage(pset.popt.topt.pager);`
	`180`	`+puts("You are using psql, the command-line interface to PostgreSQL.");`
	`181`	`+puts("Enter SQL commands, or type \\? for a list of backslash options.");`
	`182`	`+puts("Use \\h for SQL command help.");`
	`183`	`+puts("Use \\q to quit.");`
`182`	`184`	`continue;`
`183`	`185`	`}`
`184`	`186`

Comments

(0)