diff options
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 14 | ||||
| -rw-r--r-- | g10/Makefile.am | 2 | ||||
| -rw-r--r-- | g10/gpgv.c | 16 | ||||
| -rw-r--r-- | g10/keyedit.c | 2 |
4 files changed, 17 insertions, 17 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 6ad1da667..e5b900607 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,17 @@ +2006-10-08 Werner Koch <[email protected]> + + * gpgv.c: Remove the tty stubs as we are now required to link to + tty anyway (it is included in libcommand and has dependencies to + other modules as well). + + * keyedit.c (keyedit_menu): Use keyedit_completion only if + readline is available. It would be better to move this code into + gpgrlhelp.c + +2006-10-06 Werner Koch <[email protected]> + + * Makefile.am (AM_CFLAGS): Use PTH version of libassuan. + 2006-10-06 David Shaw <[email protected]> * keyserver.c (keyserver_spawn): Write the 16-digit keyid rather diff --git a/g10/Makefile.am b/g10/Makefile.am index 580ac7605..d7a5ac1f6 100644 --- a/g10/Makefile.am +++ b/g10/Makefile.am @@ -27,7 +27,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common \ include $(top_srcdir)/am/cmacros.am -AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) +AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(GPG_ERROR_CFLAGS) needed_libs = ../gl/libgnu.a ../common/libcommon.a ../jnlib/libjnlib.a diff --git a/g10/gpgv.c b/g10/gpgv.c index 0333d084b..b4730f459 100644 --- a/g10/gpgv.c +++ b/g10/gpgv.c @@ -388,22 +388,6 @@ void cipher_decrypt( gcry_cipher_hd_t c, byte *outbuf, void cipher_sync( gcry_cipher_hd_t c ) {} -/* Stubs to avoid linking to ../util/ttyio.c */ -int tty_batchmode( int onoff ) { return 0; } -void tty_printf( const char *fmt, ... ) { } -void tty_fprintf (FILE *fp, const char *fmt, ... ) { } -void tty_print_string( const byte *p, size_t n ) { } -void tty_print_utf8_string( const byte *p, size_t n ) {} -void tty_print_utf8_string2( const byte *p, size_t n, size_t max_n ) {} -char *tty_get( const char *prompt ) { return NULL;} -char *tty_get_hidden( const char *prompt ) {return NULL; } -void tty_kill_prompt(void) {} -int tty_get_answer_is_yes( const char *prompt ) {return 0;} -int tty_no_terminal(int onoff) {return 0;} -#ifdef HAVE_LIBREADLINE -void tty_enable_completion(rl_completion_func_t *completer) {} -void tty_disable_completion(void) {} -#endif /* We do not do any locking, so use these stubs here */ void disable_dotlock(void) {} diff --git a/g10/keyedit.c b/g10/keyedit.c index 71ad9f083..d01bbbc59 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -1620,7 +1620,9 @@ keyedit_menu( const char *username, strlist_t locusr, } if( !have_commands ) { +#ifdef HAVE_LIBREADLINE tty_enable_completion(keyedit_completion); +#endif answer = cpr_get_no_help("keyedit.prompt", _("Command> ")); cpr_kill_prompt(); tty_disable_completion(); |