diff options
| author | David Shaw <[email protected]> | 2003-02-22 23:45:28 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-02-22 23:45:28 +0000 |
| commit | 2c1e7afe061303a728e1a3648c91c995f7835fb2 (patch) | |
| tree | 16d6c3f0df4185e50b79958fc35d549c122f429b | |
| parent | * configure.ac: Add --disable-idea for IDEA. Note that disabling IDEA (diff) | |
| download | gnupg-2c1e7afe061303a728e1a3648c91c995f7835fb2.tar.gz gnupg-2c1e7afe061303a728e1a3648c91c995f7835fb2.zip | |
* ttyio.c (tty_print_utf8_string, tty_print_utf8_string2): Use 0 to
indicate a string with no maximum size. This prevents early truncation of
strings that contain control chars which are expanded into \xXX form.
Diffstat (limited to '')
| -rw-r--r-- | util/ChangeLog | 7 | ||||
| -rw-r--r-- | util/ttyio.c | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/util/ChangeLog b/util/ChangeLog index 1c84af189..035126606 100644 --- a/util/ChangeLog +++ b/util/ChangeLog @@ -1,3 +1,10 @@ +2003-02-22 David Shaw <[email protected]> + + * ttyio.c (tty_print_utf8_string, tty_print_utf8_string2): Use 0 + to indicate a string with no maximum size. This prevents early + truncation of strings that contain control chars which are + expanded into \xXX form. + 2002-12-26 David Shaw <[email protected]> * iobuf.c (iobuf_flush): Only print debug info if debugging is on. diff --git a/util/ttyio.c b/util/ttyio.c index 2d362a502..e5b2b581a 100644 --- a/util/ttyio.c +++ b/util/ttyio.c @@ -274,7 +274,7 @@ tty_print_utf8_string2( byte *p, size_t n, size_t max_n ) } if( i < n ) { buf = utf8_to_native( p, n, 0 ); - if( strlen( buf ) > max_n ) { + if( max_n && (strlen( buf ) > max_n )) { buf[max_n] = 0; } /*(utf8 conversion already does the control character quoting)*/ @@ -282,7 +282,7 @@ tty_print_utf8_string2( byte *p, size_t n, size_t max_n ) m_free( buf ); } else { - if( n > max_n ) { + if( max_n && (n > max_n) ) { n = max_n; } tty_print_string( p, n ); @@ -292,7 +292,7 @@ tty_print_utf8_string2( byte *p, size_t n, size_t max_n ) void tty_print_utf8_string( byte *p, size_t n ) { - tty_print_utf8_string2( p, n, n ); + tty_print_utf8_string2( p, n, 0 ); } |