summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRon Yorston2015-07-19 21:41:09 +0100
committerDenys Vlasenko2015-07-19 22:50:25 +0200
commit78cfa00154dca18a1326d2064121bf65cd081781 (patch)
tree6594491f559a06370f6fd455bc336e7c2c695c3e
parentf06386ad4f5e1e5b5a3aea71ac757d5be8574067 (diff)
downloadbusybox-78cfa00154dca18a1326d2064121bf65cd081781.zip
busybox-78cfa00154dca18a1326d2064121bf65cd081781.tar.gz
less: correctly account for tabs when rewrapping lines
Lines are rewrapped when the terminal width changes or line numbers are enabled/disabled. The current calculation always adds eight to the line length for a tab whereas it should only add enough to move to the next tab stop. This doesn't affect the display of lines, which is handled elsewhere and gets tab stops right, but it does cause lines to be wrapped at the wrong position. Signed-off-by: Ron Yorston <rmy@frippery.org> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--miscutils/less.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/miscutils/less.c b/miscutils/less.c
index 7c46ba5..90c1038 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -331,8 +331,10 @@ static void re_wrap(void)
*d = *s;
if (*d != '\0') {
new_line_pos++;
- if (*d == '\t') /* tab */
+ if (*d == '\t') { /* tab */
new_line_pos += 7;
+ new_line_pos &= (~7);
+ }
s++;
d++;
if (new_line_pos >= w) {