From 809a8df5810b5ddb0f83ef3d38a4146c7c88601e Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 27 Oct 2014 11:22:41 +0000 Subject: [PATCH] BB: busybox: make high ASCII chars printable (#7993) Currently busybox utils like "ls" fail to display filenames containing UTF-8 characters, replacing any special characters with "?". Change libbb's printable_string() function to allow high ASCII characters so that unicode filenames are displayed correctls. Signed-off-by: Jo-Philipp Wich Backport of r43084 SVN-Revision: 43085 --- package/utils/busybox/Makefile | 2 +- .../270-libbb_make_unicode_printable.patch | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 package/utils/busybox/patches/270-libbb_make_unicode_printable.patch diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile index 668679e4d2..59a84a2f94 100644 --- a/package/utils/busybox/Makefile +++ b/package/utils/busybox/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=busybox PKG_VERSION:=1.22.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_FLAGS:=essential PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 diff --git a/package/utils/busybox/patches/270-libbb_make_unicode_printable.patch b/package/utils/busybox/patches/270-libbb_make_unicode_printable.patch new file mode 100644 index 0000000000..3bfd48a23b --- /dev/null +++ b/package/utils/busybox/patches/270-libbb_make_unicode_printable.patch @@ -0,0 +1,20 @@ +--- a/libbb/printable_string.c ++++ b/libbb/printable_string.c +@@ -31,8 +31,6 @@ const char* FAST_FUNC printable_string(u + } + if (c < ' ') + break; +- if (c >= 0x7f) +- break; + s++; + } + +@@ -45,7 +43,7 @@ const char* FAST_FUNC printable_string(u + unsigned char c = *d; + if (c == '\0') + break; +- if (c < ' ' || c >= 0x7f) ++ if (c < ' ') + *d = '?'; + d++; + } -- 2.30.2