mirror of git://git.gnupg.org/gnupg.git
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. -- (backport from 2.0 commit4f336ed780
which is backport of master commit52f65281f9
) Debian-bug-id: 828109 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
parent
db246f8b18
commit
39e32d375e
|
@ -3953,7 +3953,6 @@ main (int argc, char **argv )
|
|||
break;
|
||||
|
||||
case aListPackets:
|
||||
opt.list_packets=2;
|
||||
default:
|
||||
if( argc > 1 )
|
||||
wrong_args(_("[filename]"));
|
||||
|
@ -3980,8 +3979,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(NULL, a );
|
||||
if( rc )
|
||||
|
|
|
@ -1264,7 +1264,7 @@ do_proc_packets( CTX c, IOBUF a )
|
|||
free_packet(pkt);
|
||||
/* stop processing when an invalid packet has been encountered
|
||||
* but don't do so when we are doing a --list-packets. */
|
||||
if( rc == G10ERR_INVALID_PACKET && opt.list_packets != 2 )
|
||||
if( rc == G10ERR_INVALID_PACKET && opt.list_packets == 0 )
|
||||
break;
|
||||
continue;
|
||||
}
|
||||
|
|
|
@ -61,7 +61,7 @@ struct
|
|||
int fingerprint; /* list fingerprints */
|
||||
int list_sigs; /* list signatures */
|
||||
int no_armor;
|
||||
int list_packets; /* list-packets mode: 1=normal, 2=invoked by command*/
|
||||
int list_packets; /* Option --list-packets active. */
|
||||
int def_cipher_algo;
|
||||
int force_v3_sigs;
|
||||
int force_v4_certs;
|
||||
|
|
|
@ -134,7 +134,7 @@ set_packet_list_mode( int mode )
|
|||
whether using log_stream() would be better. Perhaps we should
|
||||
enable the list mdoe only with a special option. */
|
||||
if (!listfp)
|
||||
listfp = opt.list_packets == 2 ? stdout : stderr;
|
||||
listfp = opt.list_packets ? stdout : stderr;
|
||||
return old;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue