From: Ron Yorston Date: Sun, 30 Nov 2014 20:39:53 +0000 (+0000) Subject: vi: fix reading of file after last line X-Git-Tag: 1_24_0~227 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=70f4320b40b7af83525cebabab2bc437a22c41d2;p=oweals%2Fbusybox.git vi: fix reading of file after last line If the :r command is used to read a file after the last line of the buffer the last line of the buffer and the first line of the file are joined. An extra blank line appears at the end of the buffer. file 1 file 1 file 1file 2 file 2 file 2 ~ ~ The insertion point is normally at the start of the line following the specified line. When the specified line is the last one the next_line function baulks at moving to the non-existent following line. Signed-off-by: Ron Yorston Signed-off-by: Denys Vlasenko --- diff --git a/editors/vi.c b/editors/vi.c index 7b88e8e17..77535be92 100644 --- a/editors/vi.c +++ b/editors/vi.c @@ -1318,8 +1318,12 @@ static void colon(char *buf) q = begin_line(dot); // assume "dot" } // read after current line- unless user said ":0r foo" - if (b != 0) + if (b != 0) { q = next_line(q); + // read after last line + if (q == end-1) + ++q; + } { // dance around potentially-reallocated text[] uintptr_t ofs = q - text; size = file_insert(fn, q, 0);