Commitc62a546

committed

Suppress psql \s help display for platforms like Win32 that don't

typically install witn readline, and throw an error if they try toaccess it.

1 parent94954c7 commitc62a546Copy full SHA for c62a546

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`<!--`
`2`		`-$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.122 2004/09/20 18:51:17 tgl Exp $`
	`2`	`+$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.123 2004/10/06 18:39:15 momjian Exp $`
`3`	`3`	`PostgreSQL documentation`
`4`	`4`	`-->`
`5`	`5`
`@@ -1603,7 +1603,7 @@ lo_import 152801`
`1603`	`1603`	`class="parameter">filename</replaceable> is omitted, the history`
`1604`	`1604`	`is written to the standard output. This option is only available`
`1605`	`1605`	`if <application>psql</application> is configured to use the`
`1606`		`- <acronym>GNU</acronym> history library.`
	`1606`	`+ <acronym>GNU</acronym>readline (orhistory) library.`
`1607`	`1607`	`</para>`
`1608`	`1608`
`1609`	`1609`	`<note>`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2004, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.93 2004/08/29 05:06:54 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.94 2004/10/06 18:39:16 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`	`#include"common.h"`
`@@ -194,7 +194,9 @@ slashUsage(unsigned short int pager)`
`194`	`194`	`fprintf(output,_(" \\g [FILE] send query buffer to server (and results to file or \|pipe)\n"));`
`195`	`195`	`fprintf(output,_(" \\p show the contents of the query buffer\n"));`
`196`	`196`	`fprintf(output,_(" \\r reset (clear) the query buffer\n"));`
	`197`	`+#ifdefUSE_READLINE`
`197`	`198`	`fprintf(output,_(" \\s [FILE] display history or save it to file\n"));`
	`199`	`+#endif`
`198`	`200`	`fprintf(output,_(" \\w FILE write query buffer to file\n"));`
`199`	`201`	`fprintf(output,"\n");`
`200`	`202`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2004, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/input.c,v 1.38 2004/09/27 19:16:02 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/input.c,v 1.39 2004/10/06 18:39:16 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`	`#include"input.h"`
`@@ -209,6 +209,8 @@ saveHistory(char *fname)`
`209`	`209`
`210`	`210`	`psql_error("could not save history to file \"%s\": %s\n",fname,strerror(errno));`
`211`	`211`	`}`
	`212`	`+#else`
	`213`	`+psql_error("history is not supported on this platform\n");`
`212`	`214`	`#endif`
`213`	`215`
`214`	`216`	`return false;`

Comments

(0)