security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00
Code Activity

* ttyio.h, ttyio.c (tty_enable_completion): Some ifdefs around

Browse Source 
HAVE_LIBREADLINE to allow building when readline isn't available.
This commit is contained in:
David Shaw 2009-08-11 18:34:16 +00:00
parent 25659d66f1
commit ad2f896855
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/ChangeLog
View File

@ -1,3 +1,8 @@
2009-08-11 David Shaw <dshaw@jabberwocky.com>
* ttyio.h, ttyio.c (tty_enable_completion): Some ifdefs around
HAVE_LIBREADLINE to allow building when readline isn't available.
2009-08-06 Werner Koch <wk@g10code.com> 2009-08-06 Werner Koch <wk@g10code.com>
* status.h (STATUS_INV_SGNR, STATUS_NO_SGNR): New. * status.h (STATUS_INV_SGNR, STATUS_NO_SGNR): New.

7
common/ttyio.c
View File

@ -1,6 +1,6 @@
/* ttyio.c - tty i/O functions /* ttyio.c - tty i/O functions
* Copyright (C) 1998,1999,2000,2001,2002,2003, * Copyright (C) 1998,1999,2000,2001,2002,2003,2004,2006,2007,
* 2004, 2006 Free Software Foundation, Inc. * 2009 Free Software Foundation, Inc.
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *
@ -648,6 +648,7 @@ tty_private_set_rl_hooks (void (*init_stream) (FILE *),
} }
#ifdef HAVE_LIBREADLINE
void void
tty_enable_completion (rl_completion_func_t *completer) tty_enable_completion (rl_completion_func_t *completer)
{ {
@ -671,7 +672,7 @@ tty_disable_completion (void)
my_rl_inhibit_completion (1); my_rl_inhibit_completion (1);
} }
#endif
void void
tty_cleanup_after_signal (void) tty_cleanup_after_signal (void)

11
common/ttyio.h
View File

@ -1,5 +1,6 @@
/* ttyio.h /* ttyio.h
* Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. * Copyright (C) 1998, 1999, 2000, 2001, 2003, 2006,
* 2009 Free Software Foundation, Inc.
* *
* This file is part of GNUPG. * This file is part of GNUPG.
* *
@ -45,8 +46,16 @@ void tty_kill_prompt (void);
int tty_get_answer_is_yes (const char *prompt); int tty_get_answer_is_yes (const char *prompt);
int tty_no_terminal (int onoff); int tty_no_terminal (int onoff);
#ifdef HAVE_LIBREADLINE
void tty_enable_completion (rl_completion_func_t *completer); void tty_enable_completion (rl_completion_func_t *completer);
void tty_disable_completion (void); void tty_disable_completion (void);
#else
/* Use a macro to stub out these functions since a macro has no need
to typedef a "rl_completion_func_t" which would be undefined
without readline. */
#define tty_enable_completion(x)
#define tty_disable_completion()
#endif
void tty_cleanup_after_signal (void); void tty_cleanup_after_signal (void);
void tty_cleanup_rl_after_signal (void); void tty_cleanup_rl_after_signal (void);