security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-03-21 21:39:58 +01:00
Code Activity

* gpgv.c: Stubs for tty_enable_completion() & tty_disable_completion().

Browse Source 
* openfile.c (ask_outfile_name): Enable readline completion when prompting
for an output filename.

* plaintext.c (ask_for_detached_datafile): Enable readline completion when
prompting for a detached sig datafile.
This commit is contained in:
David Shaw 2005-03-21 20:47:28 +00:00
parent 31135aff14
commit 57b9ba5e16
4 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
g10/ChangeLog
View File

@ -1,3 +1,14 @@
2005-03-21 David Shaw <dshaw@jabberwocky.com>
* gpgv.c: Stubs for tty_enable_completion() &
tty_disable_completion().
* openfile.c (ask_outfile_name): Enable readline completion when
prompting for an output filename.
* plaintext.c (ask_for_detached_datafile): Enable readline
completion when prompting for a detached sig datafile.
2005-03-21 Werner Koch <wk@g10code.com> 2005-03-21 Werner Koch <wk@g10code.com>
* keyedit.c (command_generator, keyedit_completion): Changed * keyedit.c (command_generator, keyedit_completion): Changed

8
g10/gpgv.c
View File

@ -29,6 +29,10 @@
#ifdef HAVE_DOSISH_SYSTEM #ifdef HAVE_DOSISH_SYSTEM
#include <fcntl.h> /* for setmode() */ #include <fcntl.h> /* for setmode() */
#endif #endif
#ifdef HAVE_LIBREADLINE
#include <stdio.h>
#include <readline/readline.h>
#endif
#define INCLUDED_BY_MAIN_MODULE 1 #define INCLUDED_BY_MAIN_MODULE 1
#include "packet.h" #include "packet.h"
@ -389,6 +393,10 @@ char *tty_get_hidden( const char *prompt ) {return NULL; }
void tty_kill_prompt(void) {} void tty_kill_prompt(void) {}
int tty_get_answer_is_yes( const char *prompt ) {return 0;} int tty_get_answer_is_yes( const char *prompt ) {return 0;}
int tty_no_terminal(int onoff) {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 */ /* We do not do any locking, so use these stubs here */
void disable_dotlock(void) {} void disable_dotlock(void) {}

5
g10/openfile.c
View File

@ -1,5 +1,6 @@
/* openfile.c /* openfile.c
* Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
* 2005 Free Software Foundation, Inc.
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *
@ -147,8 +148,10 @@ ask_outfile_name( const char *name, size_t namelen )
sprintf(prompt, "%s [%s]: ", s, defname ); sprintf(prompt, "%s [%s]: ", s, defname );
else else
sprintf(prompt, "%s: ", s ); sprintf(prompt, "%s: ", s );
tty_enable_completion(NULL);
fname = cpr_get("openfile.askoutname", prompt ); fname = cpr_get("openfile.askoutname", prompt );
cpr_kill_prompt(); cpr_kill_prompt();
tty_disable_completion();
m_free(prompt); m_free(prompt);
if( !*fname ) { if( !*fname ) {
m_free( fname ); fname = NULL; m_free( fname ); fname = NULL;

6
g10/plaintext.c
View File

@ -1,6 +1,6 @@
/* plaintext.c - process plaintext packets /* plaintext.c - process plaintext packets
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
* 2004 Free Software Foundation, Inc. * 2005 Free Software Foundation, Inc.
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *
@ -446,8 +446,10 @@ ask_for_detached_datafile( MD_HANDLE md, MD_HANDLE md2,
tty_printf(_("Detached signature.\n")); tty_printf(_("Detached signature.\n"));
do { do {
m_free(answer); m_free(answer);
tty_enable_completion(NULL);
answer = cpr_get("detached_signature.filename", answer = cpr_get("detached_signature.filename",
_("Please enter name of data file: ")); _("Please enter name of data file: "));
tty_disable_completion();
cpr_kill_prompt(); cpr_kill_prompt();
if( any && !*answer ) { if( any && !*answer ) {
rc = G10ERR_READ_FILE; rc = G10ERR_READ_FILE;