From c22c4261f4d78ae49171ad52aee6ae1851273a96 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Tue, 23 Sep 2003 03:43:12 +0000 Subject: [PATCH] * g10.c (main): Deprecate --no-comment in favor of --no-sk-comments. --- g10/ChangeLog | 5 +++++ g10/g10.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/g10/ChangeLog b/g10/ChangeLog index e979bf02b..ff4fc0bb1 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2003-09-22 David Shaw + + * g10.c (main): Deprecate --no-comment in favor of + --no-sk-comments. + 2003-09-11 David Shaw * g10.c (main): Deprecate -f in favor of --encrypt-files. diff --git a/g10/g10.c b/g10/g10.c index 84f32d674..cbb6e00ec 100644 --- a/g10/g10.c +++ b/g10/g10.c @@ -157,6 +157,7 @@ enum cmd_and_opt_values { aNull = 0, oAttributeFile, /* only used with risc os */ oSKComments, oNoSKComments, + oNoComments, oEmitVersion, oNoEmitVersion, oCompletesNeeded, @@ -432,7 +433,7 @@ static ARGPARSE_OPTS opts[] = { #ifdef __riscos__ { oAttributeFile, "attribute-file" ,2, "@" }, #endif /* __riscos__ */ - { oNoSKComments, "no-comment", 0, "@"}, + { oNoComments, "no-comment", 0, "@"}, { oNoSKComments, "no-sk-comments", 0, "@"}, { oSKComments, "sk-comments", 0, "@"}, { oCompletesNeeded, "completes-needed", 1, "@"}, @@ -1394,6 +1395,10 @@ main( int argc, char **argv ) opt.verbose = 0; opt.list_sigs=0; break; case oQuickRandom: quick_random_gen(1); break; case oSKComments: opt.sk_comments=1; break; + case oNoComments: + deprecated_warning(configname,configlineno, + "--no-comment","--no-sk-comments",""); + /* fall through */ case oNoSKComments: opt.sk_comments=0; break; case oEmitVersion: opt.no_version=0; break; case oNoEmitVersion: opt.no_version=1; break;