From bb345baf45b5849fc708f40ca83d92d7079eeee6 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Fri, 12 Sep 2003 00:43:12 +0000 Subject: [PATCH] * g10.c (main): Deprecate -f in favor of --encrypt-files. --- g10/ChangeLog | 4 ++++ g10/g10.c | 11 ++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/g10/ChangeLog b/g10/ChangeLog index 769c12064..e979bf02b 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,7 @@ +2003-09-11 David Shaw + + * g10.c (main): Deprecate -f in favor of --encrypt-files. + 2003-09-08 David Shaw * g10.c (main): Error out if --multifile is used with the commands diff --git a/g10/g10.c b/g10/g10.c index 4753db9e2..84f32d674 100644 --- a/g10/g10.c +++ b/g10/g10.c @@ -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 */