security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-31 11:41:32 +01:00
Code Activity

g10: Fix --list-packets.

Browse Source 
* 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 of master
commit 52f65281f9743c42a48bf5a3354c9ab0ecdb681a)

Debian-bug-id: 828109
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2016-06-28 15:56:48 +09:00
parent fb0e18b384
commit 4f336ed780
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
g10/gpg.c
View File

@ -4130,7 +4130,6 @@ main (int argc, char **argv)
break; break;
case aListPackets: case aListPackets:
opt.list_packets=2;
default: default:
if( argc > 1 ) if( argc > 1 )
wrong_args(_("[filename]")); wrong_args(_("[filename]"));
@ -4157,8 +4156,8 @@ main (int argc, char **argv)
} }
} }
if( cmd == aListPackets ) { if( cmd == aListPackets ) {
set_packet_list_mode(1);
opt.list_packets=1; opt.list_packets=1;
set_packet_list_mode(1);
} }
rc = proc_packets(NULL, a ); rc = proc_packets(NULL, a );
if( rc ) if( rc )

2
g10/mainproc.c
View File

@ -1292,7 +1292,7 @@ do_proc_packets( CTX c, IOBUF a )
/* stop processing when an invalid packet has been encountered /* stop processing when an invalid packet has been encountered
* but don't do so when we are doing a --list-packets. */ * but don't do so when we are doing a --list-packets. */
if (gpg_err_code (rc) == GPG_ERR_INV_PACKET if (gpg_err_code (rc) == GPG_ERR_INV_PACKET
&& opt.list_packets != 2 ) && opt.list_packets == 0 )
break; break;
continue; continue;
} }

2
g10/options.h
View File

@ -62,7 +62,7 @@ struct
int fingerprint; /* list fingerprints */ int fingerprint; /* list fingerprints */
int list_sigs; /* list signatures */ int list_sigs; /* list signatures */
int no_armor; 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 def_cipher_algo;
int force_v3_sigs; int force_v3_sigs;
int force_v4_certs; int force_v4_certs;

2
g10/parse-packet.c
View File

@ -207,7 +207,7 @@ set_packet_list_mode( int mode )
whether using log_stream() would be better. Perhaps we should whether using log_stream() would be better. Perhaps we should
enable the list mdoe only with a special option. */ enable the list mdoe only with a special option. */
if (!listfp) if (!listfp)
listfp = opt.list_packets == 2 ? stdout : stderr; listfp = opt.list_packets ? stdout : stderr;
return old; return old;
} }