security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +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

8
util/ttyio.c
View file

@ -46,7 +46,7 @@
#endif
#include <errno.h>
#include <ctype.h>
#ifdef HAVE_READLINE_READLINE_H
#ifdef HAVE_LIBREADLINE
#include <readline/readline.h>
#include <readline/history.h>
#endif
@ -162,7 +162,7 @@ init_ttyfp(void)
tty_get_ttyname (), strerror(errno) );
exit(2);
}
#if defined(HAVE_READLINE_READLINE_H) && defined(HAVE_LIBREADLINE)
#ifdef HAVE_LIBREADLINE
rl_catch_signals = 0;
rl_instream = rl_outstream = ttyfp;
#endif
@ -512,7 +512,7 @@ do_get( const char *prompt, int hidden )
char *
tty_get( const char *prompt )
{
#if defined(HAVE_READLINE_READLINE_H) && defined(HAVE_LIBREADLINE)
#ifdef HAVE_LIBREADLINE
if (!batchmode && !no_terminal) {
char *line;
char *buf;
@ -544,7 +544,7 @@ tty_get( const char *prompt )
return buf;
}
else
#endif /* HAVE_READLINE_READLINE_H && HAVE_LIBREADLINE */
#endif /* HAVE_LIBREADLINE */
return do_get( prompt, 0 );
}