summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko2007-01-26 23:31:05 +0000
committerDenis Vlasenko2007-01-26 23:31:05 +0000
commit98c0bba09d326624740a120173dbd28fbed2da22 (patch)
tree1e1682b33073c2afd28d210b01c7179776146356
parentfc7f92253ae1c4f050e5ea2322b53b0e81bf96be (diff)
downloadbusybox-98c0bba09d326624740a120173dbd28fbed2da22.zip
busybox-98c0bba09d326624740a120173dbd28fbed2da22.tar.gz
fix bin2hex bug. lowercase = uppercase | 0x20, not | 0x10!
-rw-r--r--include/libbb.h2
-rw-r--r--libbb/xfuncs.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/libbb.h b/include/libbb.h
index d2da056..8b98423 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 f6b904f..4d85b11 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;