diff options
| author |   schwarze <schwarze@openbsd.org> | 2016-01-30 00:06:39 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2016-01-30 00:06:39 +0000 |
| commit | fd40972a32cae034e619460a2b6f83c3492db0ca (patch) | |
| tree | 72798d3d835644ba0a1c63eade7f249cf5f8e482 /lib/libedit/tty.c | |
| parent | whitespace fixes; ok ajacoutot (diff) | |
| download | wireguard-openbsd-fd40972a32cae034e619460a2b6f83c3492db0ca.tar.xz wireguard-openbsd-fd40972a32cae034e619460a2b6f83c3492db0ca.zip | |
Third step in synching with NetBSD:
* rename fkey_t to funckey_t and el_term_t to el_terminal_t
* rename struct editline member el_term to el_terminal
* rename many functions in terminal.c from term_*() to terminal_*(),
for consistency with the file name and to not look related to <term.h>
No functional change.
This makes refresh.c and sig.c almost identical to the NetBSD versions.
It reduces the remaining diff from +2446 -1805 to +2053 -1420.
OK czarkoff@
Diffstat (limited to 'lib/libedit/tty.c')
| -rw-r--r-- | lib/libedit/tty.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/libedit/tty.c b/lib/libedit/tty.c index 962baaa6829..34458939d20 100644 --- a/lib/libedit/tty.c +++ b/lib/libedit/tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty.c,v 1.15 2016/01/29 19:32:34 schwarze Exp $ */ +/* $OpenBSD: tty.c,v 1.16 2016/01/30 00:06:39 schwarze Exp $ */ /* $NetBSD: tty.c,v 1.34 2011/01/27 23:11:40 christos Exp $ */ /*- @@ -1196,7 +1196,8 @@ tty_stty(EditLine *el, int argc __attribute__((__unused__)), const Char **argv) cu = strlen(m->m_name) + (x != '\0') + 1; - if (len + cu >= (size_t)el->el_term.t_size.h) { + if (len + cu >= + (size_t)el->el_terminal.t_size.h) { (void) fprintf(el->el_outfile, "\n%*s", (int)st, ""); len = st + cu; |