diff options
| author | Pedro F. Giffuni <pfg@FreeBSD.org> | 2016-02-07 01:38:50 +0000 |
|---|---|---|
| committer | Pedro F. Giffuni <pfg@FreeBSD.org> | 2016-02-07 01:38:50 +0000 |
| commit | c729c39672cd6bc2e7f57dccc8aab4eb761f0ba6 (patch) | |
| tree | a142d083d50d23398f35db049fff87cb80bef6d5 /vi.c | |
| parent | 5b6fd65dbfcb7ec622b234a3a55d028c0028f24f (diff) | |
Import libedit 2016-01-16vendor/NetBSD/libedit/2016-01-30
Obtained from: NetBSD
Notes
Notes:
svn path=/vendor/NetBSD/libedit/dist/; revision=295360
svn path=/vendor/NetBSD/libedit/2016-01-16/; revision=295361; tag=vendor/NetBSD/libedit/2016-01-30
Diffstat (limited to 'vi.c')
| -rw-r--r-- | vi.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -1,4 +1,4 @@ -/* $NetBSD: vi.c,v 1.45 2014/06/18 18:12:28 christos Exp $ */ +/* $NetBSD: vi.c,v 1.47 2015/10/21 21:45:30 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)vi.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: vi.c,v 1.45 2014/06/18 18:12:28 christos Exp $"); +__RCSID("$NetBSD: vi.c,v 1.47 2015/10/21 21:45:30 christos Exp $"); #endif #endif /* not lint && not SCCSID */ @@ -1038,12 +1038,12 @@ vi_histedit(EditLine *el, Int c __attribute__((__unused__))) while (waitpid(pid, &status, 0) != pid) continue; lseek(fd, (off_t)0, SEEK_SET); - st = read(fd, cp, TMP_BUFSIZ); + st = read(fd, cp, TMP_BUFSIZ - 1); if (st > 0) { - len = (size_t)(el->el_line.lastchar - - el->el_line.buffer); + cp[st] = '\0'; + len = (size_t)(el->el_line.limit - el->el_line.buffer); len = ct_mbstowcs(el->el_line.buffer, cp, len); - if (len > 0 && el->el_line.buffer[len -1] == '\n') + if (len > 0 && el->el_line.buffer[len - 1] == '\n') --len; } else |