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

Add "help" sub option to --*-options.

Browse Source
This commit is contained in:
Werner Koch 2005-09-07 15:53:03 +00:00
parent 039c27f153
commit 9a2a2904cc
4 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
g10/ChangeLog
View File

@ -1,3 +1,8 @@
2005-09-07 Werner Koch <wk@g10code.com>
* misc.c (parse_options): Allow meta option "help" to list all
options and to exit the program.
2005-09-02 David Shaw <dshaw@jabberwocky.com> 2005-09-02 David Shaw <dshaw@jabberwocky.com>
* parse-packet.c (enum_sig_subpkt, parse_signature, * parse-packet.c (enum_sig_subpkt, parse_signature,
@ -18,6 +23,11 @@
* photoid.c (generate_photo_id): Enable readline completion and * photoid.c (generate_photo_id): Enable readline completion and
tilde expansion for the JPEG prompt. tilde expansion for the JPEG prompt.
2005-08-30 Werner Koch <wk@g10code.com>
* passphrase.c (agent_open): Print a warning and not an error in
case of a missing agent. Should fix Debian bug #325578.
2005-08-26 David Shaw <dshaw@jabberwocky.com> 2005-08-26 David Shaw <dshaw@jabberwocky.com>
* misc.c (openpgp_pk_algo_usage): Default to allowing CERT for * misc.c (openpgp_pk_algo_usage): Default to allowing CERT for
@ -79,6 +89,7 @@
--passphrase command line option. Only useful in very special --passphrase command line option. Only useful in very special
circumstances. circumstances.
>>>>>>> .r3884
2005-08-05 Werner Koch <wk@g10code.com> 2005-08-05 Werner Koch <wk@g10code.com>
* gpgv.c (keyserver_import_fprint): New stub. * gpgv.c (keyserver_import_fprint): New stub.

1
g10/card-util.c
View File

@ -156,6 +156,7 @@ get_manufacturer (unsigned int no)
case 0: case 0:
case 0xffff: return "test card"; case 0xffff: return "test card";
case 0x0001: return "PPC Card Systems"; case 0x0001: return "PPC Card Systems";
case 0x0002: return "Prism";
default: return "unknown"; default: return "unknown";
} }
} }

9
g10/misc.c
View File

@ -966,6 +966,15 @@ parse_options(char *str,unsigned int *options,
{ {
char *tok; char *tok;
if (str && !strcmp (str, "help"))
{
int i;
for(i=0;opts[i].name;i++)
printf ("%s\n", opts[i].name);
g10_exit (0);
}
while((tok=optsep(&str))) while((tok=optsep(&str)))
{ {
int i,rev=0; int i,rev=0;

2
g10/passphrase.c
View File

@ -314,7 +314,7 @@ agent_open (int try, const char *orig_codeset)
if (orig_codeset) if (orig_codeset)
bind_textdomain_codeset (PACKAGE, orig_codeset); bind_textdomain_codeset (PACKAGE, orig_codeset);
#endif /*ENABLE_NLS*/ #endif /*ENABLE_NLS*/
log_error (_("gpg-agent is not available in this session\n")); log_info (_("gpg-agent is not available in this session\n"));
opt.use_agent = 0; opt.use_agent = 0;
} }
return NULL; return NULL;