summaryrefslogtreecommitdiff
path: root/lib/libedit
diff options
context:
space:
mode:
authorryo <ryo@NetBSD.org>2020-03-30 06:56:38 +0000
committerryo <ryo@NetBSD.org>2020-03-30 06:56:38 +0000
commite8260e058912854a8cf5ef4fed9ceebe446d9b2f (patch)
tree33781dbc3c950c5d77b26da3cb04f92dbd770510 /lib/libedit
parent79d12fc806c346e3a015fe92de95e10ad9c8b24f (diff)
patbuf must be updated if the length of patbuf is greater than or equal to 0. (that is always)
fix of r1.7 was incorrect.
Diffstat (limited to 'lib/libedit')
-rw-r--r--lib/libedit/search.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/lib/libedit/search.c b/lib/libedit/search.c
index 09e67386542..e909d147572 100644
--- a/lib/libedit/search.c
+++ b/lib/libedit/search.c
@@ -1,4 +1,4 @@
-/* $NetBSD: search.c,v 1.50 2020/03/30 06:54:37 ryo Exp $ */
+/* $NetBSD: search.c,v 1.51 2020/03/30 06:56:38 ryo Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)search.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: search.c,v 1.50 2020/03/30 06:54:37 ryo Exp $");
+__RCSID("$NetBSD: search.c,v 1.51 2020/03/30 06:56:38 ryo Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -182,12 +182,9 @@ c_setpat(EditLine *el)
(size_t)(EL_CURSOR(el) - el->el_line.buffer);
if (el->el_search.patlen >= EL_BUFSIZ)
el->el_search.patlen = EL_BUFSIZ - 1;
- if (el->el_search.patlen != 0) {
- (void) wcsncpy(el->el_search.patbuf, el->el_line.buffer,
- el->el_search.patlen);
- el->el_search.patbuf[el->el_search.patlen] = '\0';
- } else
- el->el_search.patlen = wcslen(el->el_search.patbuf);
+ (void) wcsncpy(el->el_search.patbuf, el->el_line.buffer,
+ el->el_search.patlen);
+ el->el_search.patbuf[el->el_search.patlen] = '\0';
}
#ifdef SDEBUG
(void) fprintf(el->el_errfile, "\neventno = %d\n",