From 52f65281f9743c42a48bf5a3354c9ab0ecdb681a Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Tue, 28 Jun 2016 15:56:48 +0900 Subject: g10: Fix --list-packets. * g10/gpg.c (main): Call set_packet_list_mode after assignment of opt.list_packets. * g10/mainproc.c (do_proc_packets): Don't stop processing with --list-packets as the comment says. * g10/options.h (list_packets): Fix the comment. * g10/parse-packet.c: Fix the condition for opt.list_packets. -- Debian-bug-id: 828109 Signed-off-by: NIIBE Yutaka --- g10/gpg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'g10/gpg.c') diff --git a/g10/gpg.c b/g10/gpg.c index ef27562f0..9750c57ce 100644 --- a/g10/gpg.c +++ b/g10/gpg.c @@ -4656,7 +4656,6 @@ main (int argc, char **argv) break; case aListPackets: - opt.list_packets=2; default: if( argc > 1 ) wrong_args(_("[filename]")); @@ -4685,8 +4684,8 @@ main (int argc, char **argv) } } if( cmd == aListPackets ) { - set_packet_list_mode(1); opt.list_packets=1; + set_packet_list_mode(1); } rc = proc_packets (ctrl, NULL, a ); if( rc ) -- cgit