aboutsummaryrefslogtreecommitdiffstats
path: root/g10/gpgv.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2016-09-08 12:34:07 +0000
committerWerner Koch <[email protected]>2016-09-08 12:34:13 +0000
commit30a9f53a0f2af6b98c26b8ddc0b4b87c38416f2a (patch)
treec9333d1ff0362e656ecc8d84023eaeaf5977e2b6 /g10/gpgv.c
parentgpg: Add options --output and --yes to gpgv. (diff)
downloadgnupg-30a9f53a0f2af6b98c26b8ddc0b4b87c38416f2a.tar.gz
gnupg-30a9f53a0f2af6b98c26b8ddc0b4b87c38416f2a.zip
gpg: Remove option --yes from gpgv
* g10/gpgv.c (opts): Remove --yes. (main): Always set opt.ANSWER_YES. Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/gpgv.c')
-rw-r--r--g10/gpgv.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/g10/gpgv.c b/g10/gpgv.c
index aa1fcea13..2f34e72f1 100644
--- a/g10/gpgv.c
+++ b/g10/gpgv.c
@@ -63,8 +63,6 @@ enum cmd_and_opt_values {
oLoggerFD,
oHomedir,
oWeakDigest,
- oAnswerYes,
- oAnswerNo,
aTest
};
@@ -85,7 +83,6 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_s_s (oHomedir, "homedir", "@"),
ARGPARSE_s_s (oWeakDigest, "weak-digest",
N_("|ALGO|reject signatures made with ALGO")),
- ARGPARSE_s_n (oAnswerYes, "yes", "@"),
ARGPARSE_end ()
};
@@ -170,6 +167,7 @@ main( int argc, char **argv )
opt.no_sig_cache = 1;
opt.flags.require_cross_cert = 1;
opt.batch = 1;
+ opt.answer_yes = 1;
opt.weak_digests = NULL;
@@ -194,7 +192,6 @@ main( int argc, char **argv )
break;
case oKeyring: append_to_strlist( &nrings, pargs.r.ret_str); break;
case oOutput: opt.outfile = pargs.r.ret_str; break;
- case oAnswerYes: opt.answer_yes = 1; break;
case oStatusFD: set_status_fd( pargs.r.ret_int ); break;
case oLoggerFD:
log_set_fd (translate_sys2libc_fd_int (pargs.r.ret_int, 1));