aboutsummaryrefslogtreecommitdiff
path: root/miscutils
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2011-08-28 13:00:29 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2011-08-28 13:00:29 +0200
commitcc272b06eefb87030bb85b686abdbc22b5ed1c34 (patch)
tree06024199184cfab43807a1fdcc2a240b9cf5ac99 /miscutils
parentd84b175cb6948eb17f847313bf912174e2f934e1 (diff)
downloadbusybox-w32-1_19_1.tar.gz
busybox-w32-1_19_1.tar.bz2
busybox-w32-1_19_1.zip
Apply post-1.19.0 patches, bump version to 1.19.11_19_1
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'miscutils')
-rw-r--r--miscutils/less.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/miscutils/less.c b/miscutils/less.c
index 9543fb9f9..045fd2db3 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -721,8 +721,8 @@ static void print_found(const char *line)
721 while (match_status == 0) { 721 while (match_status == 0) {
722 char *new = xasprintf("%s%.*s"HIGHLIGHT"%.*s"NORMAL, 722 char *new = xasprintf("%s%.*s"HIGHLIGHT"%.*s"NORMAL,
723 growline ? growline : "", 723 growline ? growline : "",
724 match_structs.rm_so, str, 724 (int)match_structs.rm_so, str,
725 match_structs.rm_eo - match_structs.rm_so, 725 (int)(match_structs.rm_eo - match_structs.rm_so),
726 str + match_structs.rm_so); 726 str + match_structs.rm_so);
727 free(growline); 727 free(growline);
728 growline = new; 728 growline = new;
@@ -990,7 +990,8 @@ static int64_t less_getch(int pos)
990 */ 990 */
991 if (key >= 0 && key < ' ' && key != 0x0d && key != 8) 991 if (key >= 0 && key < ' ' && key != 0x0d && key != 8)
992 goto again; 992 goto again;
993 return key; 993
994 return key64;
994} 995}
995 996
996static char* less_gets(int sz) 997static char* less_gets(int sz)