security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

Readline fix to be robust against platforms where readline has its own

Browse source 
dependencies.  We play guess-the-depedency for a while, and try termcap,
curses, and ncurses.
This commit is contained in:
David Shaw 2004-12-18 22:23:49 +00:00
parent 39b0f6e4ea
commit 005b1d7960
9 changed files with 87 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
g10/ChangeLog
View file

@ -1,3 +1,10 @@
2004-12-18 David Shaw <dshaw@jabberwocky.com>
* signal.c: Use only HAVE_LIBREADLINE to detect readline
availability.
* Makefile.am: Link with readline where necessary.
2004-12-17 Werner Koch <wk@g10code.com>
* passphrase.c (agent_get_passphrase): Define NREAD locally as

2
g10/Makefile.am
View file

@ -132,7 +132,7 @@ gpgv_SOURCES = gpgv.c \
# ks-db.h \
# $(common_source)
LDADD = $(needed_libs) $(other_libs) @ZLIBS@ @W32LIBS@
LDADD = $(needed_libs) $(other_libs) @ZLIBS@ @W32LIBS@ @LIBREADLINE@
gpg_LDADD = $(LDADD) @DLLIBS@ @NETLIBS@ @LIBUSB_LIBS@
$(PROGRAMS): $(needed_libs)

4
g10/signal.c
View file

@ -27,7 +27,7 @@
#include <string.h>
#include <errno.h>
#include <assert.h>
#ifdef HAVE_READLINE_READLINE_H
#ifdef HAVE_LIBREADLINE
#include <readline/readline.h>
#include <readline/history.h>
#endif
@ -83,7 +83,7 @@ got_fatal_signal( int sig )
secmem_term();
#if defined(HAVE_READLINE_READLINE_H) && defined(HAVE_LIBREADLINE)
#ifdef HAVE_LIBREADLINE
rl_free_line_state ();
rl_cleanup_after_signal ();
#endif