summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRon Yorston2015-03-12 20:10:40 +0100
committerDenys Vlasenko2015-03-12 20:11:48 +0100
commit53e9c51aded0af85c33d657143ed94c5151ba6f3 (patch)
treeb58ca53b2200137dc23a52d292e7ad2ee213dd73
parent8dff01d06a7ebd7330e3a1dd1ba47b3c74ee7dfb (diff)
downloadbusybox-53e9c51aded0af85c33d657143ed94c5151ba6f3.zip
busybox-53e9c51aded0af85c33d657143ed94c5151ba6f3.tar.gz
od: fix printing of high-bit chars
Example: echo £ | od -c Signed-off-by: Ron Yorston <rmy@tigress.co.uk> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--coreutils/od_bloaty.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index 2c26dda..ab7ea99 100644
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -387,11 +387,11 @@ print_named_ascii(size_t n_bytes, const char *block,
" sp"
};
// buf[N] pos: 01234 56789
- char buf[12] = " x\0 0xx\0";
- // actually " x\0 xxx\0", but want to share string with print_ascii.
+ char buf[12] = " x\0 xxx\0";
// [12] because we take three 32bit stack slots anyway, and
// gcc is too dumb to initialize with constant stores,
// it copies initializer from rodata. Oh well.
+ // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65410
while (n_bytes--) {
unsigned masked_c = *(unsigned char *) block++;
@@ -419,7 +419,7 @@ print_ascii(size_t n_bytes, const char *block,
const char *unused_fmt_string UNUSED_PARAM)
{
// buf[N] pos: 01234 56789
- char buf[12] = " x\0 0xx\0";
+ char buf[12] = " x\0 xxx\0";
while (n_bytes--) {
const char *s;
@@ -455,11 +455,9 @@ print_ascii(size_t n_bytes, const char *block,
case '\v':
s = " \\v";
break;
- case '\x7f':
- s = " 177";
- break;
- default: /* c is never larger than 040 */
- buf[7] = (c >> 3) + '0';
+ default:
+ buf[6] = (c >> 6 & 3) + '0';
+ buf[7] = (c >> 3 & 7) + '0';
buf[8] = (c & 7) + '0';
s = buf + 5;
}