Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitadc3b34

Browse files
committed
Here's the patch I promised over on HACKERS - it alters the
implementationof '\e' history tracking for systems that have a readline compatabilitylibrary without replace_history_entry. I fall back to pushing the queryonto the history stack after the \e, rather than replacing it.The patch adds one more place to look for readline headers, and a testfor replace_history_entry. I've only included the patch for configure.inRoss J. Reedstrom
1 parentd0f3a7e commitadc3b34

File tree

4 files changed

+29
-8
lines changed

4 files changed

+29
-8
lines changed

‎configure.in‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $Header: /cvsroot/pgsql/configure.in,v 1.236 2003/02/14 14:05:00 momjian Exp $
2+
dnl $Header: /cvsroot/pgsql/configure.in,v 1.237 2003/02/19 04:04:04 momjian Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -689,17 +689,19 @@ AC_CHECK_HEADERS(netinet/tcp.h, [], [],
689689

690690
if test "$with_readline" = yes; then
691691
AC_CHECK_HEADERS(readline/readline.h, [],
692-
[AC_CHECK_HEADERS(readline.h, [],
692+
[AC_CHECK_HEADERS(editline/readline.h, [],
693+
[AC_CHECK_HEADERS(readline.h, [],
693694
[AC_MSG_ERROR([readline header not found
694695
If you have readline already installed, see config.log for details on the
695696
failure. It is possible the compiler isn't looking in the proper directory.
696-
Use --without-readline to disable readline support.])])])
697+
Use --without-readline to disable readline support.])])])])
697698
AC_CHECK_HEADERS(readline/history.h, [],
698-
[AC_CHECK_HEADERS(history.h, [],
699+
[AC_CHECK_HEADERS(editline/history.h, [],
700+
[AC_CHECK_HEADERS(history.h, [],
699701
[AC_MSG_ERROR([history header not found
700702
If you have readline already installed, see config.log for details on the
701703
failure. It is possible the compiler isn't looking in the proper directory.
702-
Use --without-readline to disable readline support.])])])
704+
Use --without-readline to disable readline support.])])])])
703705
fi
704706

705707
if test "$with_zlib" = yes; then
@@ -878,6 +880,7 @@ AC_CHECK_FUNCS(rint, [],
878880
if test "$with_readline" = yes; then
879881
PGAC_VAR_RL_COMPLETION_APPEND_CHARACTER
880882
AC_CHECK_FUNCS([rl_completion_matches rl_filename_completion_function])
883+
AC_CHECK_FUNCS([replace_history_entry])
881884
fi
882885

883886

‎src/bin/psql/command.c‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright 2000-2002 by PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.89 2003/02/13 04:08:16 momjian Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.90 2003/02/19 04:04:04 momjian Exp $
77
*/
88
#include"postgres_fe.h"
99
#include"command.h"
@@ -1649,7 +1649,12 @@ do_edit(const char *filename_arg, PQExpBuffer query_buf)
16491649
}
16501650

16511651
#ifdefUSE_READLINE
1652+
#ifdefHAVE_REPLACE_HISTORY_ENTRY
1653+
16521654
replace_history_entry(where_history(),query_buf->data,NULL);
1655+
#else
1656+
add_history(query_buf->data);
1657+
#endif
16531658
#endif
16541659
fclose(stream);
16551660
}

‎src/bin/psql/input.h‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright 2000 by PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/input.h,v 1.17 2002/09/04 20:31:36 momjian Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/input.h,v 1.18 2003/02/19 04:04:04 momjian Exp $
77
*/
88
#ifndefINPUT_H
99
#defineINPUT_H
@@ -18,11 +18,15 @@
1818
#defineUSE_READLINE 1
1919
#if defined(HAVE_READLINE_READLINE_H)
2020
#include<readline/readline.h>
21+
#elif defined(HAVE_EDITLINE_READLINE_H)
22+
#include<editline/readline.h>
2123
#elif defined(HAVE_READLINE_H)
2224
#include<readline.h>
2325
#endif
2426
#if defined(HAVE_READLINE_HISTORY_H)
2527
#include<readline/history.h>
28+
#elif defined(HAVE_EDITLINE_HISTORY_H)
29+
#include<editline/history.h>
2630
#elif defined(HAVE_HISTORY_H)
2731
#include<history.h>
2832
#endif

‎src/include/pg_config.h.in‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* or in pg_config.h afterwards. Of course, if you edit pg_config.h, then your
99
* changes will be overwritten the next time you run configure.
1010
*
11-
* $Id: pg_config.h.in,v 1.39 2003/02/14 14:05:00 momjian Exp $
11+
* $Id: pg_config.h.in,v 1.40 2003/02/19 04:04:04 momjian Exp $
1212
*/
1313

1414
#ifndefPG_CONFIG_H
@@ -356,6 +356,12 @@
356356
/* Set to 1 if you have <readline/readline.h> */
357357
#undef HAVE_READLINE_READLINE_H
358358

359+
/* Set to 1 if you have <editline/history.h> */
360+
#undef HAVE_EDITLINE_HISTORY_H
361+
362+
/* Set to 1 if you have <editline/readline.h> */
363+
#undef HAVE_EDITLINE_READLINE_H
364+
359365
/* Set to 1 if you have <security/pam_appl.h> */
360366
#undef HAVE_SECURITY_PAM_APPL_H
361367

@@ -553,6 +559,9 @@
553559
/* Set to 1 if you have rl_filename_completion_function */
554560
#undef HAVE_RL_FILENAME_COMPLETION_FUNCTION
555561

562+
/* Set to 1 if you have replace_history_entry */
563+
#undef HAVE_REPLACE_HISTORY_ENTRY
564+
556565
/* Set to 1 if you have getopt_long() (GNU long options) */
557566
#undef HAVE_GETOPT_LONG
558567

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp