diff options
| author | David Shaw <[email protected]> | 2004-02-22 04:16:31 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-02-22 04:16:31 +0000 |
| commit | d8590475fe1a01941a673e49396a26339b65fccd (patch) | |
| tree | 539d005f77f204b0651edee2dbf3c8ea34885b5d | |
| parent | * keyserver.c (keyserver_spawn): Use the full 64-bit keyid in the INFO (diff) | |
| download | gnupg-d8590475fe1a01941a673e49396a26339b65fccd.tar.gz gnupg-d8590475fe1a01941a673e49396a26339b65fccd.zip | |
* plaintext.c (handle_plaintext): Properly handle a --max-output of zero
(do not limit output at all).
| -rw-r--r-- | g10/ChangeLog | 3 | ||||
| -rw-r--r-- | g10/plaintext.c | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 679940f78..141241c62 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,8 @@ 2004-02-21 David Shaw <[email protected]> + * 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 INFO header lines, and include "sig:" records for the benefit of people who store their keys in LDAP servers. It makes it easy to diff --git a/g10/plaintext.c b/g10/plaintext.c index e057d3fae..a998acbb2 100644 --- a/g10/plaintext.c +++ b/g10/plaintext.c @@ -168,7 +168,7 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx, #endif if( fp ) { - if((count++)>opt.max_output) + if(opt.max_output && (count++)>opt.max_output) { log_error("Error writing to `%s': %s\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 ); 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", fname,"exceeded --max-output limit\n"); @@ -234,7 +234,7 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx, #endif if( fp ) { - if((count++)>opt.max_output) + if(opt.max_output && (count++)>opt.max_output) { log_error("Error writing to `%s': %s\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 ); 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", 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 ) { if( fp ) { - if((count++)>opt.max_output) + if(opt.max_output && (count++)>opt.max_output) { log_error("Error writing to `%s': %s\n", fname,"exceeded --max-output limit\n"); |