aboutsummaryrefslogtreecommitdiffstats
path: root/g10/gpg.c
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2017-03-27 05:02:01 +0000
committerNIIBE Yutaka <[email protected]>2017-03-27 05:02:01 +0000
commitc1e6302b347caf852a056b9c721469ccb51f44da (patch)
tree920546cd3c6c252c64e1d5c0c8981e1054a13d1c /g10/gpg.c
parentscd: Change the order of applications when accessed. (diff)
downloadgnupg-c1e6302b347caf852a056b9c721469ccb51f44da.tar.gz
gnupg-c1e6302b347caf852a056b9c721469ccb51f44da.zip
g10: Support specifying SERIALNO for --card-status.
* g10/gpg.c (main): Allow an argument for --card-status. * g10/card-util.c (current_card_status): Rename from card_status. (card_status): New, which supports multiple cards. (get_one_name): Use current_card_status. Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to '')
-rw-r--r--g10/gpg.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/g10/gpg.c b/g10/gpg.c
index b3d606bc5..507422c73 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -4791,9 +4791,12 @@ main (int argc, char **argv)
#ifdef ENABLE_CARD_SUPPORT
case aCardStatus:
- if (argc)
- wrong_args ("--card-status");
- card_status (es_stdout, NULL, 0);
+ if (argc == 0)
+ card_status (es_stdout, NULL);
+ else if (argc == 1)
+ card_status (es_stdout, *argv);
+ else
+ wrong_args ("--card-status [serialno]");
break;
case aCardEdit: