diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:11 +0700 |
---|---|---|
committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:11 +0700 |
commit | 9db69882bee2d528d706d61d34ef7741122330be (patch) | |
tree | f46c4ed5cae58956cd165e552ea4e366fd9b1a6c /miscutils/less.c | |
parent | 3f357a9c754805c4c38793749927aeda82797735 (diff) | |
parent | e4dcba1c103dc28e927e004791e331aaf604383d (diff) | |
download | busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.tar.gz busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.tar.bz2 busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.zip |
Merge commit 'e4dcba1c103dc28e927e004791e331aaf604383d'
Conflicts:
libbb/make_directory.c
Diffstat (limited to 'miscutils/less.c')
-rw-r--r-- | miscutils/less.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/miscutils/less.c b/miscutils/less.c index d737e4cba..500059d2a 100644 --- a/miscutils/less.c +++ b/miscutils/less.c | |||
@@ -21,7 +21,7 @@ | |||
21 | * redirected input has been read from stdin | 21 | * redirected input has been read from stdin |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <sched.h> /* sched_yield() */ | 24 | #include <sched.h> /* sched_yield() */ |
25 | 25 | ||
26 | #include "libbb.h" | 26 | #include "libbb.h" |
27 | #if ENABLE_FEATURE_LESS_REGEXP | 27 | #if ENABLE_FEATURE_LESS_REGEXP |
@@ -477,7 +477,7 @@ static void m_status_print(void) | |||
477 | { | 477 | { |
478 | int percentage; | 478 | int percentage; |
479 | 479 | ||
480 | if (less_gets_pos >= 0) /* don't touch statusline while input is done! */ | 480 | if (less_gets_pos >= 0) /* don't touch statusline while input is done! */ |
481 | return; | 481 | return; |
482 | 482 | ||
483 | clear_line(); | 483 | clear_line(); |
@@ -503,7 +503,7 @@ static void status_print(void) | |||
503 | { | 503 | { |
504 | const char *p; | 504 | const char *p; |
505 | 505 | ||
506 | if (less_gets_pos >= 0) /* don't touch statusline while input is done! */ | 506 | if (less_gets_pos >= 0) /* don't touch statusline while input is done! */ |
507 | return; | 507 | return; |
508 | 508 | ||
509 | /* Change the status if flags have been set */ | 509 | /* Change the status if flags have been set */ |