summaryrefslogtreecommitdiff
path: root/miscutils
diff options
context:
space:
mode:
authorDenys Vlasenko2011-08-28 13:00:29 +0200
committerDenys Vlasenko2011-08-28 13:00:29 +0200
commitcc272b06eefb87030bb85b686abdbc22b5ed1c34 (patch)
tree06024199184cfab43807a1fdcc2a240b9cf5ac99 /miscutils
parentd84b175cb6948eb17f847313bf912174e2f934e1 (diff)
downloadbusybox-cc272b06eefb87030bb85b686abdbc22b5ed1c34.zip
busybox-cc272b06eefb87030bb85b686abdbc22b5ed1c34.tar.gz
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 9543fb9..045fd2d 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -721,8 +721,8 @@ static void print_found(const char *line)
while (match_status == 0) {
char *new = xasprintf("%s%.*s"HIGHLIGHT"%.*s"NORMAL,
growline ? growline : "",
- match_structs.rm_so, str,
- match_structs.rm_eo - match_structs.rm_so,
+ (int)match_structs.rm_so, str,
+ (int)(match_structs.rm_eo - match_structs.rm_so),
str + match_structs.rm_so);
free(growline);
growline = new;
@@ -990,7 +990,8 @@ static int64_t less_getch(int pos)
*/
if (key >= 0 && key < ' ' && key != 0x0d && key != 8)
goto again;
- return key;
+
+ return key64;
}
static char* less_gets(int sz)