diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2019-09-10 13:55:44 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2019-09-10 13:55:44 +0000 |
| commit | 3150625201d9c293e5c34b19b8a2d48a27da5f07 (patch) | |
| tree | 4b83d615adb9f3870c56fd4e3caf62956df0f12c /history.c | |
| parent | 8c36b0434ca4a5ba6df2724542048eb219af7a34 (diff) | |
| download | src-3150625201d9c293e5c34b19b8a2d48a27da5f07.tar.gz src-3150625201d9c293e5c34b19b8a2d48a27da5f07.zip | |
Update libedit to snapshot 2019-09-10vendor/NetBSD/libedit/2019-09-10
Notes
Notes:
svn path=/vendor/NetBSD/libedit/dist/; revision=352134
svn path=/vendor/NetBSD/libedit/2019-09-10/; revision=352135; tag=vendor/NetBSD/libedit/2019-09-10
Diffstat (limited to 'history.c')
| -rw-r--r-- | history.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/history.c b/history.c index 47cff4d167eb..227f72c4a102 100644 --- a/history.c +++ b/history.c @@ -1,4 +1,4 @@ -/* $NetBSD: history.c,v 1.58 2017/09/01 10:19:10 christos Exp $ */ +/* $NetBSD: history.c,v 1.62 2018/09/13 09:03:40 kre Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)history.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: history.c,v 1.58 2017/09/01 10:19:10 christos Exp $"); +__RCSID("$NetBSD: history.c,v 1.62 2018/09/13 09:03:40 kre Exp $"); #endif #endif /* not lint && not SCCSID */ @@ -775,6 +775,7 @@ history_load(TYPE(History) *h, const char *fname) char *ptr; int i = -1; TYPE(HistEvent) ev; + Char *decode_result; #ifndef NARROWCHAR static ct_buffer_t conv; #endif @@ -807,7 +808,10 @@ history_load(TYPE(History) *h, const char *fname) ptr = nptr; } (void) strunvis(ptr, line); - if (HENTER(h, &ev, ct_decode_string(ptr, &conv)) == -1) { + decode_result = ct_decode_string(ptr, &conv); + if (decode_result == NULL) + continue; + if (HENTER(h, &ev, decode_result) == -1) { i = -1; goto oomem; } @@ -1082,11 +1086,13 @@ FUNW(history)(TYPE(History) *h, TYPE(HistEvent) *ev, int fun, ...) break; case H_NSAVE_FP: - retval = history_save_fp(h, va_arg(va, size_t), - va_arg(va, FILE *)); + { + size_t sz = va_arg(va, size_t); + retval = history_save_fp(h, sz, va_arg(va, FILE *)); if (retval == -1) he_seterrev(ev, _HE_HIST_WRITE); break; + } case H_PREV_EVENT: retval = history_prev_event(h, ev, va_arg(va, int)); |