From 9702e85d5d3c7d1e3ea8ccac7852fa8d1523d4a3 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 18 Feb 2004 16:59:19 +0000 Subject: [PATCH] (print_sanitized_buffer): Don't care about non-ASCII characaters. (sanitize_buffer): Ditto. --- jnlib/ChangeLog | 6 ++++++ jnlib/stringhelp.c | 8 +++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/jnlib/ChangeLog b/jnlib/ChangeLog index d6361153c..6867b4fb9 100644 --- a/jnlib/ChangeLog +++ b/jnlib/ChangeLog @@ -1,3 +1,9 @@ +2004-02-18 Werner Koch + + * stringhelp.c (print_sanitized_buffer): Don't care about + non-ASCII characaters. + (sanitize_buffer): Ditto. + 2004-02-12 Werner Koch * Makefile.am: Replaced INCLUDES by AM_CPPFLAGS. diff --git a/jnlib/stringhelp.c b/jnlib/stringhelp.c index e2744a5ac..4c8ab314b 100644 --- a/jnlib/stringhelp.c +++ b/jnlib/stringhelp.c @@ -327,7 +327,7 @@ print_sanitized_buffer (FILE *fp, const void *buffer, size_t length, for (; length; length--, p++, count++) { - if (*p < 0x20 || (*p >= 0x7f && *p < 0xa0) || *p == delim) + if (*p < 0x20 || *p == 0x7f || *p == delim) { putc ('\\', fp); count++; @@ -408,8 +408,7 @@ sanitize_buffer (const unsigned char *p, size_t n, int delim) /* first count length */ for (save_n = n, save_p = p, buflen=1 ; n; n--, p++ ) { - if ( *p < 0x20 || (*p >= 0x7f && *p < 0xa0) || *p == delim - || (delim && *p=='\\')) + if ( *p < 0x20 || *p == 0x7f || *p == delim || (delim && *p=='\\')) { if ( *p=='\n' || *p=='\r' || *p=='\f' || *p=='\v' || *p=='\b' || !*p ) @@ -426,8 +425,7 @@ sanitize_buffer (const unsigned char *p, size_t n, int delim) d = buffer = jnlib_xmalloc( buflen ); for ( ; n; n--, p++ ) { - if (*p < 0x20 || (*p >= 0x7f && *p < 0xa0) || *p == delim - ||(delim && *p=='\\')) { + if (*p < 0x20 || *p == 0x7f || *p == delim || (delim && *p=='\\')) { *d++ = '\\'; if( *p == '\n' ) *d++ = 'n';