[git commit master] fix Unicode config option limits and some comments in less

Denys Vlasenko vda.linux at googlemail.com
Sat Jan 30 17:09:18 UTC 2010


commit: http://git.busybox.net/busybox/commit/?id=ecd90fd488cd0c519070656f5cfa0b0959979be9
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 Config.in        |    2 --
 miscutils/less.c |    5 +++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Config.in b/Config.in
index 6844483..b4ea702 100644
--- a/Config.in
+++ b/Config.in
@@ -143,7 +143,6 @@ config FEATURE_CHECK_UNICODE_IN_ENV
 
 config SUBST_WCHAR
 	int "Character code to substitute unprintable characters with"
-	range 1 4294967295
 	depends on FEATURE_ASSUME_UNICODE
 	default 63
 	help
@@ -153,7 +152,6 @@ config SUBST_WCHAR
 
 config LAST_SUPPORTED_WCHAR
 	int "Range of supported Unicode characters"
-	range 0 4294967295
 	depends on FEATURE_ASSUME_UNICODE
 	default 767
 	help
diff --git a/miscutils/less.c b/miscutils/less.c
index 48f3a75..92d0f32 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -542,7 +542,7 @@ static void cap_cur_fline(int nlines)
 			cur_fline = 0;
 		diff = max_fline - (cur_fline + max_displayed_line) + TILDES;
 		/* As the number of lines requested was too large, we just move
-		to the end of the file */
+		 * to the end of the file */
 		if (diff > 0)
 			cur_fline += diff;
 	}
@@ -554,7 +554,8 @@ static const char controls[] ALIGN1 =
 	"\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"
 	"\x7f\x9b"; /* DEL and infamous Meta-ESC :( */
 static const char ctrlconv[] ALIGN1 =
-	/* '\n': it's a former NUL - subst with '@', not 'J' */
+	/* why 40 instead of 4a below? - it is a replacement for '\n'.
+	 * '\n' is a former NUL - we subst it with @, not J */
 	"\x40\x41\x42\x43\x44\x45\x46\x47\x48\x49\x40\x4b\x4c\x4d\x4e\x4f"
 	"\x50\x51\x52\x53\x54\x55\x56\x57\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f";
 
-- 
1.6.3.3



More information about the busybox-cvs mailing list