security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-11-10 21:38:50 +01:00
Code Activity

* keyedit.c (command_generator, keyedit_completion): Changed

Browse Source 
indentation.
* card-util.c (command_generator, card_edit_completion): Ditto.
This commit is contained in:
Werner Koch 2005-03-21 15:24:48 +00:00
parent f58ccc8c3d
commit 31135aff14
4 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
g10/ChangeLog
View File

@ -1,3 +1,9 @@
2005-03-21 Werner Koch <wk@g10code.com>
* keyedit.c (command_generator, keyedit_completion): Changed
indentation.
* card-util.c (command_generator, card_edit_completion): Ditto.
2005-03-19 David Shaw <dshaw@jabberwocky.com>
* card-util.c (command_generator, card_edit_completion)
@ -20,8 +26,8 @@
* Makefile.am: Calculate GNUPG_LIBEXECDIR directly. Do not
redefine $libexecdir.
* options.h, keyserver.c (parse_keyserver_options,
keyserver_spawn): Don't treat 'verbose' and 'include-disabled' as
* options.h, keyserver.c (parse_keyserver_options)
(keyserver_spawn): Don't treat 'verbose' and 'include-disabled' as
special. Just pass them through silently to the keyserver helper.
2005-03-16 Werner Koch <wk@g10code.com>

25
g10/card-util.c
View File

@ -27,7 +27,7 @@
#if GNUPG_MAJOR_VERSION != 1
#include "gpg.h"
#endif
#endif /*GNUPG_MAJOR_VERSION != 1*/
#include "util.h"
#include "i18n.h"
#include "ttyio.h"
@ -39,11 +39,11 @@
#ifdef HAVE_LIBREADLINE
#include <stdio.h>
#include <readline/readline.h>
#endif
#endif /*HAVE_LIBREADLINE*/
#include "cardglue.h"
#else
#else /*GNUPG_MAJOR_VERSION!=1*/
#include "call-agent.h"
#endif
#endif /*GNUPG_MAJOR_VERSION!=1*/
#define CONTROL_D ('D' - 'A' + 1)
@ -1275,6 +1275,10 @@ card_store_subkey (KBNODE node, int use)
#endif
}
/* Data used by the command parser. This needs to be outside of the
function scope to allow readline based command completion. */
enum cmdids
{
cmdNOP = 0,
@ -1315,11 +1319,13 @@ static struct
{ NULL, cmdINVCMD, 0, NULL }
};
#if GNUPG_MAJOR_VERSION == 1 && defined (HAVE_LIBREADLINE)
/* These two functions are used by readline for command completion. */
static char *command_generator(const char *text,int state)
static char *
command_generator(const char *text,int state)
{
static int list_index,len;
const char *name;
@ -1344,7 +1350,8 @@ static char *command_generator(const char *text,int state)
return NULL;
}
static char **card_edit_completion(const char *text, int start, int end)
static char **
card_edit_completion(const char *text, int start, int end)
{
/* If we are at the start of a line, we try and command-complete.
If not, just do nothing for now. */
@ -1356,7 +1363,7 @@ static char **card_edit_completion(const char *text, int start, int end)
return NULL;
}
#endif
#endif /* GNUPG_MAJOR_VERSION == 1 && HAVE_LIBREADLINE */
/* Menu to edit all user changeable values on an OpenPGP card. Only
Key creation is not handled here. */
@ -1424,12 +1431,12 @@ card_edit (STRLIST commands)
if (!have_commands)
{
#if GNUPG_MAJOR_VERSION == 1
tty_enable_completion(card_edit_completion);
tty_enable_completion (card_edit_completion);
#endif
answer = cpr_get_no_help("cardedit.prompt", _("Command> "));
cpr_kill_prompt();
#if GNUPG_MAJOR_VERSION == 1
tty_disable_completion();
tty_disable_completion ();
#endif
}
trim_spaces(answer);

12
g10/keyedit.c
View File

@ -1280,6 +1280,7 @@ parse_sign_type(const char *str,int *localsig,int *nonrevokesig,int *trustsig)
return 1;
}
/****************
* Menu driven key editor. If seckey_check is true, then a secret key
* that matches username will be looked for. If it is false, not all
@ -1408,11 +1409,13 @@ static struct
{ NULL, cmdNONE, 0, NULL }
};
#ifdef HAVE_LIBREADLINE
/* These two functions are used by readline for command completion. */
static char *command_generator(const char *text,int state)
static char *
command_generator(const char *text,int state)
{
static int list_index,len;
const char *name;
@ -1437,7 +1440,8 @@ static char *command_generator(const char *text,int state)
return NULL;
}
static char **keyedit_completion(const char *text, int start, int end)
static char **
keyedit_completion(const char *text, int start, int end)
{
/* If we are at the start of a line, we try and command-complete.
If not, just do nothing for now. */
@ -1449,7 +1453,8 @@ static char **keyedit_completion(const char *text, int start, int end)
return NULL;
}
#endif
#endif /* HAVE_LIBREADLINE */
void
keyedit_menu( const char *username, STRLIST locusr,
@ -2163,6 +2168,7 @@ keyedit_menu( const char *username, STRLIST locusr,
}
/****************
* show preferences of a public keyblock.
*/

2
util/ttyio.c
View File

@ -191,7 +191,7 @@ tty_disable_completion(void)
init_ttyfp();
rl_inhibit_completion=1;
}
#endif
#endif /*HAVE_LIBREADLINE*/
int
tty_batchmode( int onoff )