diff options
| author | Randy Dunlap <randy.dunlap@oracle.com> | 2007-11-28 16:21:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-29 09:24:53 -0800 |
| commit | d0eec99ce50baa5cc2ac02363cdb2a771ed4e1e2 (patch) | |
| tree | 435b232daf15193124f2365882f5068b812e4449 | |
| parent | 6454d1f9038f708d7deef6270ed4ba5bb6e55869 (diff) | |
| download | linux-d0eec99ce50baa5cc2ac02363cdb2a771ed4e1e2.tar.gz linux-d0eec99ce50baa5cc2ac02363cdb2a771ed4e1e2.tar.bz2 linux-d0eec99ce50baa5cc2ac02363cdb2a771ed4e1e2.zip | |
hexdump: don't print bytes with bit 7 set
As Herbert Xu pointed out, bytes (chars) with bit 7 (0x80) set are true
with isprint() but they may not be isascii() but be Unicode instead, so
don't try to print them in hex dumps.
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | lib/hexdump.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/hexdump.c b/lib/hexdump.c index bd5edaeaa80b..343546550dc9 100644 --- a/lib/hexdump.c +++ b/lib/hexdump.c @@ -106,7 +106,8 @@ void hex_dump_to_buffer(const void *buf, size_t len, int rowsize, while (lx < (linebuflen - 1) && lx < (ascii_column - 1)) linebuf[lx++] = ' '; for (j = 0; (j < rowsize) && (j < len) && (lx + 2) < linebuflen; j++) - linebuf[lx++] = isprint(ptr[j]) ? ptr[j] : '.'; + linebuf[lx++] = (isascii(ptr[j]) && isprint(ptr[j])) ? ptr[j] + : '.'; nil: linebuf[lx++] = '\0'; } |