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

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

diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index 8dce2924dbd1df35d1584283c595057966bea41a..02c298f91a69439c08dc596f723a36f375fee9f3 100644 (file)
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.122 2004/09/20 18:51:17 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.123 2004/10/06 18:39:15 momjian Exp $
 PostgreSQL documentation
 -->
 
@@ -1603,7 +1603,7 @@ lo_import 152801
         class="parameter">filename</replaceable> is omitted, the history
         is written to the standard output. This option is only available
         if <application>psql</application> is configured to use the
-        <acronym>GNU</acronym> history library.
+        <acronym>GNU</acronym> readline (or history) library.
         </para>
 
         <note>

diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index 24d2c8f59f16543121f0dc07e03f29e1f9894449..1fa93c203a126b5f643316a423450a2e211369ae 100644 (file)
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2004, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.93 2004/08/29 05:06:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.94 2004/10/06 18:39:16 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "common.h"
@@ -194,7 +194,9 @@ slashUsage(unsigned short int pager)
        fprintf(output, _("  \\g [FILE]      send query buffer to server (and results to file or |pipe)\n"));
        fprintf(output, _("  \\p             show the contents of the query buffer\n"));
        fprintf(output, _("  \\r             reset (clear) the query buffer\n"));
+#ifdef USE_READLINE
        fprintf(output, _("  \\s [FILE]      display history or save it to file\n"));
+#endif
        fprintf(output, _("  \\w FILE        write query buffer to file\n"));
        fprintf(output, "\n");
 

diff --git a/src/bin/psql/input.c b/src/bin/psql/input.c
index 7cc59c1421883669d86479cadcaec8140ceefa57..769ac88229652a7b934d6415be2b97a5a3689ca8 100644 (file)
--- a/src/bin/psql/input.c
+++ b/src/bin/psql/input.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2004, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/input.c,v 1.38 2004/09/27 19:16:02 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/input.c,v 1.39 2004/10/06 18:39:16 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "input.h"
@@ -209,6 +209,8 @@ saveHistory(char *fname)
 
                psql_error("could not save history to file \"%s\": %s\n", fname, strerror(errno));
        }
+#else
+               psql_error("history is not supported on this platform\n");
 #endif
 
        return false;