emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vi: fix reading of file after last line

Browse Source 
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 <rmy@tigress.co.uk>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Ron Yorston 2014-11-30 20:39:53 +00:00 committed by Denys Vlasenko
parent e5213cee38
commit 70f4320b40
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
editors/vi.c
View File

@ -1318,8 +1318,12 @@ static void colon(char *buf)
q = begin_line(dot); // assume "dot" q = begin_line(dot); // assume "dot"
} }
// read after current line- unless user said ":0r foo" // read after current line- unless user said ":0r foo"
if (b != 0) if (b != 0) {
q = next_line(q); q = next_line(q);
// read after last line
if (q == end-1)
++q;
}
{ // dance around potentially-reallocated text[] { // dance around potentially-reallocated text[]
uintptr_t ofs = q - text; uintptr_t ofs = q - text;
size = file_insert(fn, q, 0); size = file_insert(fn, q, 0);