diff options
| author | christos <christos@NetBSD.org> | 2019-04-26 16:56:57 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2019-04-26 16:56:57 +0000 |
| commit | 0fb0b804fe3595b78ed466ed644eb7c18f4cd620 (patch) | |
| tree | f10d296eb975706e7d3e0a2f978cf8368d49cb8e /lib/libedit | |
| parent | 2cb683dd71fa2d92e793f97e1009fb42572bb3af (diff) | |
Follow the man page for EL_GETTC and not require a NULL terminated argument
list: https://reviews.llvm.org/D61191
Diffstat (limited to 'lib/libedit')
| -rw-r--r-- | lib/libedit/el.c | 16 | ||||
| -rw-r--r-- | lib/libedit/eln.c | 14 | ||||
| -rw-r--r-- | lib/libedit/readline.c | 8 |
3 files changed, 16 insertions, 22 deletions
diff --git a/lib/libedit/el.c b/lib/libedit/el.c index 632fafe35e4..9a4773653e0 100644 --- a/lib/libedit/el.c +++ b/lib/libedit/el.c @@ -1,4 +1,4 @@ -/* $NetBSD: el.c,v 1.97 2018/11/18 17:09:39 christos Exp $ */ +/* $NetBSD: el.c,v 1.98 2019/04/26 16:56:57 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)el.c 8.2 (Berkeley) 1/3/94"; #else -__RCSID("$NetBSD: el.c,v 1.97 2018/11/18 17:09:39 christos Exp $"); +__RCSID("$NetBSD: el.c,v 1.98 2019/04/26 16:56:57 christos Exp $"); #endif #endif /* not lint && not SCCSID */ @@ -439,15 +439,11 @@ el_wget(EditLine *el, int op, ...) case EL_GETTC: { static char name[] = "gettc"; - char *argv[20]; - int i; - - for (i = 1; i < (int)__arraycount(argv); i++) - if ((argv[i] = va_arg(ap, char *)) == NULL) - break; - + char *argv[3]; argv[0] = name; - rv = terminal_gettc(el, i, argv); + argv[1] = va_arg(ap, char *); + argv[2] = va_arg(ap, void *); + rv = terminal_gettc(el, 3, argv); break; } diff --git a/lib/libedit/eln.c b/lib/libedit/eln.c index aa0a5b565dd..e980bc5f9d2 100644 --- a/lib/libedit/eln.c +++ b/lib/libedit/eln.c @@ -1,4 +1,4 @@ -/* $NetBSD: eln.c,v 1.34 2016/05/09 21:37:34 christos Exp $ */ +/* $NetBSD: eln.c,v 1.35 2019/04/26 16:56:57 christos Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -27,7 +27,7 @@ */ #include "config.h" #if !defined(lint) && !defined(SCCSID) -__RCSID("$NetBSD: eln.c,v 1.34 2016/05/09 21:37:34 christos Exp $"); +__RCSID("$NetBSD: eln.c,v 1.35 2019/04/26 16:56:57 christos Exp $"); #endif /* not lint && not SCCSID */ #include <errno.h> @@ -321,14 +321,12 @@ el_get(EditLine *el, int op, ...) break; case EL_GETTC: { - char *argv[20]; + char *argv[3]; static char gettc[] = "gettc"; - int i; - for (i = 1; i < (int)__arraycount(argv); ++i) - if ((argv[i] = va_arg(ap, char *)) == NULL) - break; argv[0] = gettc; - ret = terminal_gettc(el, i, argv); + argv[1] = va_arg(ap, char *); + argv[2] = va_arg(ap, void *); + ret = terminal_gettc(el, 3, argv); break; } diff --git a/lib/libedit/readline.c b/lib/libedit/readline.c index 6e8442f0c44..f45e872472f 100644 --- a/lib/libedit/readline.c +++ b/lib/libedit/readline.c @@ -1,4 +1,4 @@ -/* $NetBSD: readline.c,v 1.151 2019/02/15 23:20:35 christos Exp $ */ +/* $NetBSD: readline.c,v 1.152 2019/04/26 16:56:57 christos Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include "config.h" #if !defined(lint) && !defined(SCCSID) -__RCSID("$NetBSD: readline.c,v 1.151 2019/02/15 23:20:35 christos Exp $"); +__RCSID("$NetBSD: readline.c,v 1.152 2019/04/26 16:56:57 christos Exp $"); #endif /* not lint && not SCCSID */ #include <sys/types.h> @@ -2237,9 +2237,9 @@ void rl_get_screen_size(int *rows, int *cols) { if (rows) - el_get(e, EL_GETTC, "li", rows, (void *)0); + el_get(e, EL_GETTC, "li", rows); if (cols) - el_get(e, EL_GETTC, "co", cols, (void *)0); + el_get(e, EL_GETTC, "co", cols); } void |
