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

* configure.ac: Check for readline.

Browse source 
* signal.c (got_fatal_signal): Do readline cleanup.  Print signal
number if we can't print the name. Use new autoconf macro
HAVE_DECL_SYS_SIGLIST.
(get_signal_name): Removed.

* ttyio.c (tty_get): Add readline support.
This commit is contained in:
Werner Koch 2004-09-09 17:04:44 +00:00
parent 87e3264f77
commit bfc45cc8bc
7 changed files with 93 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

47
util/ttyio.c
View file

@ -1,5 +1,6 @@
/* ttyio.c - tty i/O functions
* Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
* Copyright (C) 1998, 1999, 2000, 2001, 2002,
* 2004 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
@ -45,6 +46,11 @@
#endif
#include <errno.h>
#include <ctype.h>
#ifdef HAVE_READLINE_READLINE_H
#include <readline/readline.h>
#include <readline/history.h>
#endif
#include "util.h"
#include "memory.h"
#include "ttyio.h"
@ -156,6 +162,10 @@ init_ttyfp(void)
tty_get_ttyname (), strerror(errno) );
exit(2);
}
#if defined(HAVE_READLINE_READLINE_H) && defined(HAVE_LIBREADLINE)
rl_catch_signals = 0;
rl_instream = rl_outstream = ttyfp;
#endif
#endif
#ifdef HAVE_TCGETATTR
atexit( cleanup );
@ -502,7 +512,40 @@ do_get( const char *prompt, int hidden )
char *
tty_get( const char *prompt )
{
return do_get( prompt, 0 );
#if defined(HAVE_READLINE_READLINE_H) && defined(HAVE_LIBREADLINE)
if (!batchmode && !no_terminal) {
char *line;
char *buf;
if( !initialized )
init_ttyfp();
last_prompt_len = 0;
line = readline (prompt?prompt:"");
/* We need to copy it to memory controlled by our malloc
implementations; further we need to convert an EOF to our
convention. */
buf = m_alloc(line? strlen(line)+1:2);
if (line)
{
strcpy (buf, line);
trim_spaces (buf);
if (strlen (buf) > 2 )
add_history (line); /* Note that we test BUF but add LINE. */
free (line);
}
else
{
buf[0] = CONTROL_D;
buf[1] = 0;
}
return buf;
}
else
#endif /* HAVE_READLINE_READLINE_H && HAVE_LIBREADLINE */
return do_get( prompt, 0 );
}
char *