giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #582 from marschap/openpgp-tool-fixes 

Openpgp tool fixes
This commit is contained in:
Frank Morgner 2015-10-15 13:13:18 +02:00
parent 71aa6bbced 7de373b3b9
commit e316bf3140
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tools/openpgp-tool.c
View File

@ -209,7 +209,7 @@ static char *prettify_gender(char *str)
case '0': return "unknown"; case '0': return "unknown";
case '1': return "male"; case '1': return "male";
case '2': return "female"; case '2': return "female";
case '9': return "not applicable"; case '9': return "not announced";
} }
} }
return NULL; return NULL;
@ -248,7 +248,7 @@ static int decode_options(int argc, char **argv)
{ {
int c; int c;
while ((c = getopt_long(argc, argv,"r:x:CUG:L:hwvVd:", options, (int *) 0)) != EOF) { while ((c = getopt_long(argc, argv,"r:x:CUG:L:EhwvVd:", options, (int *) 0)) != EOF) {
switch (c) { switch (c) {
case 'r': case 'r':
opt_reader = optarg; opt_reader = optarg;
@ -277,11 +277,11 @@ static int decode_options(int argc, char **argv)
break; break;
case 'C': case 'C':
opt_cardinfo++; opt_cardinfo++;
actions++;; actions++;
break; break;
case 'U': case 'U':
opt_userinfo++; opt_userinfo++;
actions++;; actions++;
break; break;
case 'G': case 'G':
opt_genkey++; opt_genkey++;
@ -308,6 +308,7 @@ static int decode_options(int argc, char **argv)
break; break;
case 'E': case 'E':
opt_erase++; opt_erase++;
actions++;
break; break;
case OPT_DELKEY: case OPT_DELKEY:
opt_delkey++; opt_delkey++;