From 98c0bba09d326624740a120173dbd28fbed2da22 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Fri, 26 Jan 2007 23:31:05 +0000 Subject: [PATCH] fix bin2hex bug. lowercase = uppercase | 0x20, not | 0x10! --- include/libbb.h | 2 +- libbb/xfuncs.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/libbb.h b/include/libbb.h index d2da056f7..8b9842344 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -739,7 +739,7 @@ extern const char bb_msg_standard_input[]; extern const char bb_msg_standard_output[]; extern const char bb_str_default[]; -/* NB: (bb_hexdigits_upcase[i] | 0x10) -> lowercase hex digit */ +/* NB: (bb_hexdigits_upcase[i] | 0x20) -> lowercase hex digit */ extern const char bb_hexdigits_upcase[]; extern const char bb_path_mtab_file[]; diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c index f6b904f78..4d85b1181 100644 --- a/libbb/xfuncs.c +++ b/libbb/xfuncs.c @@ -343,8 +343,8 @@ char *bin2hex(char *p, const char *cp, int count) while (count) { unsigned char c = *cp++; /* put lowercase hex digits */ - *p++ = 0x10 | bb_hexdigits_upcase[c >> 4]; - *p++ = 0x10 | bb_hexdigits_upcase[c & 0xf]; + *p++ = 0x20 | bb_hexdigits_upcase[c >> 4]; + *p++ = 0x20 | bb_hexdigits_upcase[c & 0xf]; count--; } return p;