1
0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00

* plaintext.c (handle_plaintext): Properly handle a --max-output of zero

(do not limit output at all).
This commit is contained in:
David Shaw 2004-02-22 04:16:31 +00:00
parent 3ddd4410ae
commit d8590475fe
2 changed files with 8 additions and 5 deletions

View File

@ -1,5 +1,8 @@
2004-02-21 David Shaw <dshaw@jabberwocky.com> 2004-02-21 David Shaw <dshaw@jabberwocky.com>
* plaintext.c (handle_plaintext): Properly handle a --max-output
of zero (do not limit output at all).
* keyserver.c (keyserver_spawn): Use the full 64-bit keyid in the * keyserver.c (keyserver_spawn): Use the full 64-bit keyid in the
INFO header lines, and include "sig:" records for the benefit of INFO header lines, and include "sig:" records for the benefit of
people who store their keys in LDAP servers. It makes it easy to people who store their keys in LDAP servers. It makes it easy to

View File

@ -168,7 +168,7 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
#endif #endif
if( fp ) if( fp )
{ {
if((count++)>opt.max_output) if(opt.max_output && (count++)>opt.max_output)
{ {
log_error("Error writing to `%s': %s\n", log_error("Error writing to `%s': %s\n",
fname,"exceeded --max-output limit\n"); fname,"exceeded --max-output limit\n");
@ -201,7 +201,7 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
md_write( mfx->md, buffer, len ); md_write( mfx->md, buffer, len );
if( fp ) if( fp )
{ {
if((count+=len)>opt.max_output) if(opt.max_output && (count+=len)>opt.max_output)
{ {
log_error("Error writing to `%s': %s\n", log_error("Error writing to `%s': %s\n",
fname,"exceeded --max-output limit\n"); fname,"exceeded --max-output limit\n");
@ -234,7 +234,7 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
#endif #endif
if( fp ) if( fp )
{ {
if((count++)>opt.max_output) if(opt.max_output && (count++)>opt.max_output)
{ {
log_error("Error writing to `%s': %s\n", log_error("Error writing to `%s': %s\n",
fname,"exceeded --max-output limit\n"); fname,"exceeded --max-output limit\n");
@ -270,7 +270,7 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
md_write( mfx->md, buffer, len ); md_write( mfx->md, buffer, len );
if( fp ) if( fp )
{ {
if((count+=len)>opt.max_output) if(opt.max_output && (count+=len)>opt.max_output)
{ {
log_error("Error writing to `%s': %s\n", log_error("Error writing to `%s': %s\n",
fname,"exceeded --max-output limit\n"); fname,"exceeded --max-output limit\n");
@ -297,7 +297,7 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
while( (c = iobuf_get(pt->buf)) != -1 ) { while( (c = iobuf_get(pt->buf)) != -1 ) {
if( fp ) if( fp )
{ {
if((count++)>opt.max_output) if(opt.max_output && (count++)>opt.max_output)
{ {
log_error("Error writing to `%s': %s\n", log_error("Error writing to `%s': %s\n",
fname,"exceeded --max-output limit\n"); fname,"exceeded --max-output limit\n");