security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

* keyedit.c (keyedit_menu): Move command strings outside the function to

Browse Source 
get ready for the readline completion code.
This commit is contained in:
David Shaw 2005-01-11 04:15:55 +00:00
parent 74ca58ee94
commit 96a3982b9b
2 changed files with 89 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
g10/ChangeLog
View File

@ -1,5 +1,8 @@
2005-01-10 David Shaw <dshaw@jabberwocky.com> 2005-01-10 David Shaw <dshaw@jabberwocky.com>
* keyedit.c (keyedit_menu): Move command strings outside the
function to get ready for the readline completion code.
* passphrase.c (readline, agent_send_option, agent_open, * passphrase.c (readline, agent_send_option, agent_open,
agent_get_passphrase, passphrase_clear_cache): Rename readline() agent_get_passphrase, passphrase_clear_cache): Rename readline()
to readaline() to keep readline library namespace clear. to readaline() to keep readline library namespace clear.

38
g10/keyedit.c
View File

@ -1,6 +1,6 @@
/* keyedit.c - keyedit stuff /* keyedit.c - keyedit stuff
* 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.
* *
@ -1261,20 +1261,18 @@ parse_sign_type(const char *str,int *localsig,int *nonrevokesig,int *trustsig)
/* Match the tail of the string */ /* Match the tail of the string */
#define KEYEDIT_TAIL_MATCH 8 #define KEYEDIT_TAIL_MATCH 8
void
keyedit_menu( const char *username, STRLIST locusr,
STRLIST commands, int quiet, int seckey_check )
{
enum cmdids enum cmdids
{ cmdNONE = 0, {
cmdNONE = 0,
cmdQUIT, cmdHELP, cmdFPR, cmdLIST, cmdSELUID, cmdCHECK, cmdSIGN, cmdQUIT, cmdHELP, cmdFPR, cmdLIST, cmdSELUID, cmdCHECK, cmdSIGN,
cmdREVSIG, cmdREVKEY, cmdREVUID, cmdDELSIG, cmdPRIMARY, cmdDEBUG, cmdREVSIG, cmdREVKEY, cmdREVUID, cmdDELSIG, cmdPRIMARY, cmdDEBUG,
cmdSAVE, cmdADDUID, cmdADDPHOTO, cmdDELUID, cmdADDKEY, cmdDELKEY, cmdSAVE, cmdADDUID, cmdADDPHOTO, cmdDELUID, cmdADDKEY, cmdDELKEY,
cmdADDREVOKER, cmdTOGGLE, cmdSELKEY, cmdPASSWD, cmdTRUST, cmdPREF, cmdADDREVOKER, cmdTOGGLE, cmdSELKEY, cmdPASSWD, cmdTRUST, cmdPREF,
cmdEXPIRE, cmdENABLEKEY, cmdDISABLEKEY, cmdSHOWPREF, cmdSETPREF, cmdEXPIRE, cmdENABLEKEY, cmdDISABLEKEY, cmdSHOWPREF, cmdSETPREF,
cmdPREFKS, cmdINVCMD, cmdSHOWPHOTO, cmdUPDTRUST, cmdCHKTRUST, cmdPREFKS, cmdINVCMD, cmdSHOWPHOTO, cmdUPDTRUST, cmdCHKTRUST,
cmdADDCARDKEY, cmdKEYTOCARD, cmdADDCARDKEY, cmdKEYTOCARD, cmdNOP
cmdNOP }; };
static struct static struct
{ {
const char *name; const char *name;
@ -1297,10 +1295,12 @@ keyedit_menu( const char *username, STRLIST locusr,
{ "c" , cmdCHECK , 0, NULL }, { "c" , cmdCHECK , 0, NULL },
{ "sign" , cmdSIGN , KEYEDIT_NOT_SK|KEYEDIT_TAIL_MATCH, N_("sign selected user IDs [* see below for related commands]") }, { "sign" , cmdSIGN , KEYEDIT_NOT_SK|KEYEDIT_TAIL_MATCH, N_("sign selected user IDs [* see below for related commands]") },
{ "s" , cmdSIGN , KEYEDIT_NOT_SK, NULL }, { "s" , cmdSIGN , KEYEDIT_NOT_SK, NULL },
/* "lsign" will never match since "sign" comes first and it is a /* "lsign" and friends will never match since "sign" comes first
tail match. It is just here so it shows up in the help and it is a tail match. They are just here so they show up in
menu. */ the help menu. */
{ "lsign" , cmdNOP , 0, N_("sign selected user IDs locally") }, { "lsign" , cmdNOP , 0, N_("sign selected user IDs locally") },
{ "tsign" , cmdNOP , 0, N_("sign selected user IDs with a trust signature") },
{ "nrsign" , cmdNOP , 0, N_("sign selected user IDs with a non-revocable signature") },
{ "debug" , cmdDEBUG , 0, NULL }, { "debug" , cmdDEBUG , 0, NULL },
{ "adduid" , cmdADDUID , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a user ID") }, { "adduid" , cmdADDUID , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a user ID") },
{ "addphoto", cmdADDPHOTO , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a photo ID") }, { "addphoto", cmdADDPHOTO , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a photo ID") },
@ -1339,6 +1339,11 @@ keyedit_menu( const char *username, STRLIST locusr,
{ "showphoto",cmdSHOWPHOTO , 0, N_("show selected photo IDs") }, { "showphoto",cmdSHOWPHOTO , 0, N_("show selected photo IDs") },
{ NULL, cmdNONE, 0, NULL } { NULL, cmdNONE, 0, NULL }
}; };
void
keyedit_menu( const char *username, STRLIST locusr,
STRLIST commands, int quiet, int seckey_check )
{
enum cmdids cmd = 0; enum cmdids cmd = 0;
int rc = 0; int rc = 0;
KBNODE keyblock = NULL; KBNODE keyblock = NULL;
@ -1499,7 +1504,8 @@ keyedit_menu( const char *username, STRLIST locusr,
else else
cmd = cmds[i].id; cmd = cmds[i].id;
} }
switch( cmd ) { switch( cmd )
{
case cmdHELP: case cmdHELP:
for(i=0; cmds[i].name; i++ ) for(i=0; cmds[i].name; i++ )
{ {
@ -1511,9 +1517,9 @@ keyedit_menu( const char *username, STRLIST locusr,
tty_printf("\n"); tty_printf("\n");
tty_printf(_( tty_printf(_(
"* The `sign' command may be prefixed with `l' for local signatures (lsign),\n" "* The `sign' command may be prefixed with an `l' for local signatures (lsign),\n"
" a `t' for trust signatures (tsign), a `nr' for non-revocable signatures\n" " a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
" (nrsign), or any combination thereof (ltsign, tnrsign, etc).\n")); " (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"));
break; break;