security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Activity

gpg: Remove option --yes from gpgv 

* g10/gpgv.c (opts): Remove --yes.
(main): Always set opt.ANSWER_YES.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-09-08 14:34:07 +02:00
parent a8363b7d0b
commit 30a9f53a0f
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/gpgv.texi
View File

@ -95,12 +95,12 @@ home-directory ("~/.gnupg" if --homedir is not used).
@item --output @var{file} @item --output @var{file}
@itemx -o @var{file} @itemx -o @var{file}
@opindex output @opindex output
Write output to @var{file}. This option can be used to get the signed Write output to @var{file}; to write to stdout use @code{-}. This
text from a cleartext or binary signature; it also works for detached option can be used to get the signed text from a cleartext or binary
signatures, but in that case this option is in general not signature; it also works for detached signatures, but in that case
useful. Unless you write to stdout (using @code{-} for @var{file}) you this option is in general not useful. Note that an existing file will
should also use the option @option{--yes} to force overwriting an be overwritten.
existing file.
@item --status-fd @var{n} @item --status-fd @var{n}
@opindex status-fd @opindex status-fd

5
g10/gpgv.c
View File

@ -63,8 +63,6 @@ enum cmd_and_opt_values {
oLoggerFD, oLoggerFD,
oHomedir, oHomedir,
oWeakDigest, oWeakDigest,
oAnswerYes,
oAnswerNo,
aTest aTest
}; };
@ -85,7 +83,6 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_s_s (oHomedir, "homedir", "@"), ARGPARSE_s_s (oHomedir, "homedir", "@"),
ARGPARSE_s_s (oWeakDigest, "weak-digest", ARGPARSE_s_s (oWeakDigest, "weak-digest",
N_("|ALGO|reject signatures made with ALGO")), N_("|ALGO|reject signatures made with ALGO")),
ARGPARSE_s_n (oAnswerYes, "yes", "@"),
ARGPARSE_end () ARGPARSE_end ()
}; };
@ -170,6 +167,7 @@ main( int argc, char **argv )
opt.no_sig_cache = 1; opt.no_sig_cache = 1;
opt.flags.require_cross_cert = 1; opt.flags.require_cross_cert = 1;
opt.batch = 1; opt.batch = 1;
opt.answer_yes = 1;
opt.weak_digests = NULL; opt.weak_digests = NULL;
@ -194,7 +192,6 @@ main( int argc, char **argv )
break; break;
case oKeyring: append_to_strlist( &nrings, pargs.r.ret_str); break; case oKeyring: append_to_strlist( &nrings, pargs.r.ret_str); break;
case oOutput: opt.outfile = 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 oStatusFD: set_status_fd( pargs.r.ret_int ); break;
case oLoggerFD: case oLoggerFD:
log_set_fd (translate_sys2libc_fd_int (pargs.r.ret_int, 1)); log_set_fd (translate_sys2libc_fd_int (pargs.r.ret_int, 1));