diff options
| author |   schwarze <schwarze@openbsd.org> | 2016-04-11 19:54:53 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2016-04-11 19:54:53 +0000 |
| commit | 5c93237dc61741a77e4aedea71fcbacffe8f97ad (patch) | |
| tree | bc0e95ee0e85ecbc603cd014b3d6702559a8323f /lib/libedit/map.c | |
| parent | - In isin(), quote $_b to ensure it's treated as string not as pattern. (diff) | |
| download | wireguard-openbsd-5c93237dc61741a77e4aedea71fcbacffe8f97ad.tar.xz wireguard-openbsd-5c93237dc61741a77e4aedea71fcbacffe8f97ad.zip | |
Move wrapper macros to the two files actually needing them:
FUNW, Strlen, Strdup, Strcmp, Strncmp, Strncpy, Strncat -> history.c
Strchr, tok_strdup -> tokenizer.c
FUN, TYPE, STR -> both of these files
OK martijn@
Also proofread by Christian Heckendorf <mbie at ulmus dot me>
who reported some whitespace issues in parse.c.
Diffstat (limited to 'lib/libedit/map.c')
| -rw-r--r-- | lib/libedit/map.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/libedit/map.c b/lib/libedit/map.c index 75b5771645b..4eb562abd65 100644 --- a/lib/libedit/map.c +++ b/lib/libedit/map.c @@ -1,4 +1,4 @@ -/* $OpenBSD: map.c,v 1.20 2016/04/09 20:15:26 schwarze Exp $ */ +/* $OpenBSD: map.c,v 1.21 2016/04/11 19:54:54 schwarze Exp $ */ /* $NetBSD: map.c,v 1.25 2009/12/30 22:37:40 christos Exp $ */ /*- @@ -1082,11 +1082,11 @@ protected int map_set_editor(EditLine *el, Char *editor) { - if (Strcmp(editor, STR("emacs")) == 0) { + if (wcscmp(editor, L"emacs") == 0) { map_init_emacs(el); return 0; } - if (Strcmp(editor, STR("vi")) == 0) { + if (wcscmp(editor, L"vi") == 0) { map_init_vi(el); return 0; } @@ -1105,10 +1105,10 @@ map_get_editor(EditLine *el, const Char **editor) return -1; switch (el->el_map.type) { case MAP_EMACS: - *editor = STR("emacs"); + *editor = L"emacs"; return 0; case MAP_VI: - *editor = STR("vi"); + *editor = L"vi"; return 0; } return -1; @@ -1231,9 +1231,9 @@ map_print_all_keys(EditLine *el) map_print_some_keys(el, el->el_map.alt, prev, i - 1); (void) fprintf(el->el_outfile, "Multi-character bindings\n"); - keymacro_print(el, STR("")); + keymacro_print(el, L""); (void) fprintf(el->el_outfile, "Arrow key bindings\n"); - terminal_print_arrow(el, STR("")); + terminal_print_arrow(el, L""); } |