security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00
Code Activity

g10: Rename 'card-edit' to 'edit-card'.

Browse Source 
* g10/gpg.c (opts): Rename option.
* g10/call-agent.c (agent_scd_learn): Update comment.
* doc/gpg.texi: Update accordingly.
--
This change has a surprising side effect.  Previously, --edit was an
alias for --edit-key, because the argument parser actually accepts
unique prefixes of all options.  With this change, however, --edit is
ambiguous.

GnuPG-bug-id: 2700
Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Justus Winter 2016-12-15 14:50:10 +01:00
parent 3c691097ca
commit 6e4396723e
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/gpg.texi
View File

@ -367,7 +367,9 @@ values are dumped and not only their lengths. Note that the output of
this command may change with new releases. this command may change with new releases.
@item --card-edit @item --edit-card
@opindex edit-card
@itemx --card-edit
@opindex card-edit @opindex card-edit
Present a menu to work with a smartcard. The subcommand "help" provides Present a menu to work with a smartcard. The subcommand "help" provides
an overview on available commands. For a detailed description, please an overview on available commands. For a detailed description, please
@ -382,7 +384,7 @@ Show the content of the smart card.
@opindex change-pin @opindex change-pin
Present a menu to allow changing the PIN of a smartcard. This Present a menu to allow changing the PIN of a smartcard. This
functionality is also available as the subcommand "passwd" with the functionality is also available as the subcommand "passwd" with the
@option{--card-edit} command. @option{--edit-card} command.
@item --delete-keys @code{name} @item --delete-keys @code{name}
@itemx --delete-keys @code{name} @itemx --delete-keys @code{name}

2
g10/call-agent.c
View File

@ -660,7 +660,7 @@ agent_scd_learn (struct agent_card_info_s *info, int force)
care about the data returned. If the card has already been care about the data returned. If the card has already been
initialized, this is a very fast command. The main reason we initialized, this is a very fast command. The main reason we
need to do this here is to handle a card removed case so that an need to do this here is to handle a card removed case so that an
"l" command in --card-edit can be used to show ta newly inserted "l" command in --edit-card can be used to show ta newly inserted
card. We request the openpgp card because that is what we card. We request the openpgp card because that is what we
expect. */ expect. */
rc = assuan_transact (agent_ctx, "SCD SERIALNO openpgp", rc = assuan_transact (agent_ctx, "SCD SERIALNO openpgp",

3
g10/gpg.c
View File

@ -495,7 +495,8 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_c (aFastImport, "fast-import", "@"), ARGPARSE_c (aFastImport, "fast-import", "@"),
#ifdef ENABLE_CARD_SUPPORT #ifdef ENABLE_CARD_SUPPORT
ARGPARSE_c (aCardStatus, "card-status", N_("print the card status")), ARGPARSE_c (aCardStatus, "card-status", N_("print the card status")),
ARGPARSE_c (aCardEdit, "card-edit", N_("change data on a card")), ARGPARSE_c (aCardEdit, "edit-card", N_("change data on a card")),
ARGPARSE_c (aCardEdit, "card-edit", "@"),
ARGPARSE_c (aChangePIN, "change-pin", N_("change a card's PIN")), ARGPARSE_c (aChangePIN, "change-pin", N_("change a card's PIN")),
#endif #endif
ARGPARSE_c (aListConfig, "list-config", "@"), ARGPARSE_c (aListConfig, "list-config", "@"),