aboutsummaryrefslogtreecommitdiffstats
path: root/g10/gpg.c
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2016-06-28 06:56:48 +0000
committerNIIBE Yutaka <[email protected]>2016-06-28 06:56:48 +0000
commit52f65281f9743c42a48bf5a3354c9ab0ecdb681a (patch)
tree2e35aea8f498ccc4cb8eb0763ed2af9831932ed4 /g10/gpg.c
parentbuild: Add aclocal macro from pkg-config. (diff)
downloadgnupg-52f65281f9743c42a48bf5a3354c9ab0ecdb681a.tar.gz
gnupg-52f65281f9743c42a48bf5a3354c9ab0ecdb681a.zip
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 <[email protected]>
Diffstat (limited to 'g10/gpg.c')
-rw-r--r--g10/gpg.c3
1 files changed, 1 insertions, 2 deletions
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 )