mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
Various changes
This commit is contained in:
parent
4d770bedc1
commit
2e8481c03b
56 changed files with 527 additions and 337 deletions
|
@ -1,3 +1,17 @@
|
|||
2006-10-08 Werner Koch <wk@g10code.com>
|
||||
|
||||
* 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 <wk@g10code.com>
|
||||
|
||||
* Makefile.am (AM_CFLAGS): Use PTH version of libassuan.
|
||||
|
||||
2006-10-06 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* keyserver.c (keyserver_spawn): Write the 16-digit keyid rather
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
16
g10/gpgv.c
16
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) {}
|
||||
|
|
|
@ -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();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue