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

* g10.c (main): Deprecate -f in favor of --encrypt-files.

Browse Source
This commit is contained in:
David Shaw 2003-09-12 00:43:12 +00:00
parent 0cf79eed68
commit bb345baf45
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
g10/ChangeLog
View File

@ -1,3 +1,7 @@
2003-09-11 David Shaw <dshaw@jabberwocky.com>
* g10.c (main): Deprecate -f in favor of --encrypt-files.
2003-09-08 David Shaw <dshaw@jabberwocky.com>
* g10.c (main): Error out if --multifile is used with the commands

11
g10/g10.c
View File

@ -57,7 +57,7 @@ enum cmd_and_opt_values { aNull = 0,
aSym = 'c',
aDecrypt = 'd',
aEncr = 'e',
aEncrFiles,
aOldEncrFiles = 'f', /* to be removed */
oInteractive = 'i',
oKOption = 'k',
oDryRun = 'n',
@ -75,6 +75,7 @@ enum cmd_and_opt_values { aNull = 0,
oCertNotation,
oShowNotation,
oNoShowNotation,
aEncrFiles,
aDecryptFiles,
aClearsign,
aStore,
@ -306,9 +307,10 @@ static ARGPARSE_OPTS opts[] = {
{ 300, NULL, 0, N_("@Commands:\n ") },
{ aSign, "sign", 256, N_("|[file]|make a signature")},
{ aClearsign, "clearsign", 256, N_("|[file]|make a clear text signature") },
{ aClearsign, "clearsign", 256, N_("|[file]|make a clear text signature")},
{ aDetachedSign, "detach-sign", 256, N_("make a detached signature")},
{ aEncr, "encrypt", 256, N_("encrypt data")},
{ aOldEncrFiles, NULL, 256, "@"},
{ aEncrFiles, "encrypt-files", 256, N_("|[files]|encrypt files")},
{ aSym, "symmetric", 256, N_("encryption only with symmetric cipher")},
{ aStore, "store", 256, N_("store only")},
@ -1279,7 +1281,10 @@ main( int argc, char **argv )
case aDecryptFiles: multifile=1; /* fall through */
case aDecrypt: set_cmd( &cmd, aDecrypt); break;
case aEncrFiles: multifile=1; /* fall through */
case aOldEncrFiles:
deprecated_warning(configname,configlineno,
"-f","--encrypt-files",""); /* fall through */
case aEncrFiles: multifile=1; /* fall through again */
case aEncr: set_cmd( &cmd, aEncr); break;
case aVerifyFiles: multifile=1; /* fall through */