database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-08 11:42:09 +03:00
Code Activity

this patch solve 2 problemes :

Browse Source 
probleme number 1 :

- configure can find the library readline , but don't
  find the header file . so in this case we don't use lib readline
  .

probleme number 2 :

- when you have postgres 6.2.1 and readline installed
  with the same prefix( and generally all your software ) .  you
  can compile the version 6.3 .  I use this prefix , when configure
  ask me for "Additional directories to search for include files"
  .

  ( because there a conflict in the header when you
    compile psql.c ) In this case, you must permut the sequence of
  directive -I .

Erwan MAS
This commit is contained in:
Bruce Momjian
1998-04-05 21:29:49 +00:00
parent 34fec16198
commit fdb37f073b
5 changed files with 151 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/bin/psql/psql.c
View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.137 1998/03/16 14:27:38 momjian Exp $
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.138 1998/04/05 21:29:36 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -38,13 +38,19 @@
#ifdef HAVE_LIBREADLINE
#ifdef HAVE_READLINE_H
#include <readline.h>
#define USE_READLINE 1
#if defined(HAVE_HISTORY)
#include <history.h>
#define USE_HISTORY 1
#endif
#else
#if defined(HAVE_READLINE_READLINE_H)
#include <readline/readline.h>
#define USE_READLINE 1
#if defined(HAVE_READLINE_HISTORY_H)
#include <readline/history.h>
#define USE_HISTORY 1
#endif
#endif
#endif
#endif
@ -931,7 +937,7 @@ gets_readline(char *prompt, FILE *source)
{
char *s;
#ifdef HAVE_LIBREADLINE
#ifdef USE_READLINE
s = readline(prompt);
#else
char buf[500];
@ -2013,7 +2019,7 @@ HandleSlashCmds(PsqlSettings *pset,
case 's': /* \s is save history to a file */
if (!optarg)
optarg = "/dev/tty";
#ifdef HAVE_HISTORY
#ifdef USE_HISTORY
if (write_history(optarg) != 0)
fprintf(stderr, "cannot write history to %s\n", optarg);
#endif
@ -2137,7 +2143,7 @@ MainLoop(PsqlSettings *pset, char *query, FILE *source)
sprintf(pset->prompt, "%s%s", PQdb(pset->db), PROMPT);
if (pset->useReadline)
{
#ifdef HAVE_HISTORY
#ifdef USE_HISTORY
using_history();
#endif
GetNextLine = gets_readline;
@ -2187,7 +2193,7 @@ MainLoop(PsqlSettings *pset, char *query, FILE *source)
pset->prompt[strlen(pset->prompt) - 3] = PROMPT_READY;
}
line = GetNextLine(pset->prompt, source);
#ifdef HAVE_HISTORY
#ifdef USE_HISTORY
if (interactive && pset->useReadline && line != NULL)
add_history(line); /* save non-empty lines in history */
#endif
@ -2454,7 +2460,7 @@ main(int argc, char **argv)
settings.opt.pager = 1;
if (!isatty(0) || !isatty(1))
settings.notty = 1;
#ifdef HAVE_LIBREADLINE
#ifdef USE_READLINE
else
settings.useReadline = 1;
#endif