diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 11 | ||||
| -rw-r--r-- | g10/Makefile.am | 5 | ||||
| -rw-r--r-- | g10/card-util.c | 1 | ||||
| -rw-r--r-- | g10/comment.c | 1 | ||||
| -rw-r--r-- | g10/gpg.c | 3 | ||||
| -rw-r--r-- | g10/gpgv.c | 2 | ||||
| -rw-r--r-- | g10/keyedit.c | 2 | ||||
| -rw-r--r-- | g10/signal.c | 9 |
8 files changed, 20 insertions, 14 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index fd1d62eea..6c6d2181d 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,14 @@ +2006-09-21 Werner Koch <[email protected]> + + * signal.c (got_fatal_signal): Replaced readline stuff by a tty + function. + + * Makefile.am (LDADD): Include libgpgrl.a. + + * gpg.c (main): Call gpg_rl_initialize. + + * keyedit.c: Removed double inclusion of stdio.h. + 2006-09-20 Werner Koch <[email protected]> * call-agent.c: Include asshelp.h. diff --git a/g10/Makefile.am b/g10/Makefile.am index a49925b43..580ac7605 100644 --- a/g10/Makefile.am +++ b/g10/Makefile.am @@ -108,12 +108,13 @@ gpgv2_SOURCES = gpgv.c \ # ks-db.h \ # $(common_source) -LDADD = $(needed_libs) $(ZLIBS) $(DNSLIBS) $(LIBREADLINE) \ +LDADD = $(needed_libs) ../common/libgpgrl.a \ + $(ZLIBS) $(DNSLIBS) $(LIBREADLINE) \ $(LIBINTL) $(CAPLIBS) $(W32LIBS) gpg2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) gpgv2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) -$(PROGRAMS): $(needed_libs) +$(PROGRAMS): $(needed_libs) ../common/libgpgrl.a install-data-local: $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) diff --git a/g10/card-util.c b/g10/card-util.c index b7da1ba98..2738cbebf 100644 --- a/g10/card-util.c +++ b/g10/card-util.c @@ -38,6 +38,7 @@ #include "keyserver-internal.h" #if GNUPG_MAJOR_VERSION == 1 # ifdef HAVE_LIBREADLINE +# define GNUPG_LIBREADLINE_H_INCLUDED # include <stdio.h> # include <readline/readline.h> # endif /*HAVE_LIBREADLINE*/ diff --git a/g10/comment.c b/g10/comment.c index 193087107..e19ed3994 100644 --- a/g10/comment.c +++ b/g10/comment.c @@ -30,7 +30,6 @@ #include "packet.h" #include "errors.h" #include "iobuf.h" -#include "memory.h" #include "util.h" #include "main.h" #include "keydb.h" @@ -1771,7 +1771,8 @@ main (int argc, char **argv ) when adding any stuff between here and the call to secmem_init() somewhere after the option parsing. */ reopen_std (); - trap_unaligned(); + trap_unaligned (); + gnupg_rl_initialize (); set_strusage (my_strusage); gcry_control (GCRYCTL_SUSPEND_SECMEM_WARN); /* We don't need any locking in libgcrypt unless we use any kind of diff --git a/g10/gpgv.c b/g10/gpgv.c index eff7489e9..a9884a31d 100644 --- a/g10/gpgv.c +++ b/g10/gpgv.c @@ -31,7 +31,7 @@ #include <fcntl.h> /* for setmode() */ #endif #ifdef HAVE_LIBREADLINE -#include <stdio.h> +#define GNUPG_LIBREADLINE_H_INCLUDED #include <readline/readline.h> #endif diff --git a/g10/keyedit.c b/g10/keyedit.c index 80d714adc..6b3fbe818 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -28,7 +28,7 @@ #include <assert.h> #include <ctype.h> #ifdef HAVE_LIBREADLINE -#include <stdio.h> +#define GNUPG_LIBREADLINE_H_INCLUDED #include <readline/readline.h> #endif diff --git a/g10/signal.c b/g10/signal.c index aaeb89841..6055b1c2c 100644 --- a/g10/signal.c +++ b/g10/signal.c @@ -28,10 +28,6 @@ #include <string.h> #include <errno.h> #include <assert.h> -#ifdef HAVE_LIBREADLINE -#include <readline/readline.h> -#include <readline/history.h> -#endif #include "gpg.h" #include "options.h" @@ -86,10 +82,7 @@ got_fatal_signal( int sig ) gcry_control (GCRYCTL_TERM_SECMEM ); -#ifdef HAVE_LIBREADLINE - rl_free_line_state (); - rl_cleanup_after_signal (); -#endif + tty_cleanup_rl_after_signal (); /* Better don't translate these messages. */ write(2, "\n", 1 ); |