diff options
| author | christos <christos@NetBSD.org> | 2016-02-24 14:25:38 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2016-02-24 14:25:38 +0000 |
| commit | ce74c8d2e7d88a04f69731bd01092feae274fdc1 (patch) | |
| tree | 49832ea10cbec475589376a9ebcbc30073366610 /lib/libedit/read.c | |
| parent | 2413324545fa331de0b9b1a7599fbbf44f97514b (diff) | |
Get split el_getc and el_wgetc completely and call el_wgetc internally.
Change some character constants to they wide versions. (Ingo Schwarze)
Diffstat (limited to 'lib/libedit/read.c')
| -rw-r--r-- | lib/libedit/read.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/lib/libedit/read.c b/lib/libedit/read.c index 62b86f70439..7ed02bf0d04 100644 --- a/lib/libedit/read.c +++ b/lib/libedit/read.c @@ -1,4 +1,4 @@ -/* $NetBSD: read.c,v 1.82 2016/02/17 19:47:49 christos Exp $ */ +/* $NetBSD: read.c,v 1.83 2016/02/24 14:25:38 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)read.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: read.c,v 1.82 2016/02/17 19:47:49 christos Exp $"); +__RCSID("$NetBSD: read.c,v 1.83 2016/02/24 14:25:38 christos Exp $"); #endif #endif /* not lint && not SCCSID */ @@ -244,14 +244,16 @@ read_getcmd(EditLine *el, el_action_t *cmdnum, Char *ch) { static const Char meta = (Char)0x80; el_action_t cmd; + wchar_t wc; int num; el->el_errno = 0; do { - if ((num = FUN(el,getc)(el, ch)) != 1) {/* if EOF or error */ + if ((num = el_wgetc(el, &wc)) != 1) {/* if EOF or error */ el->el_errno = num == 0 ? 0 : errno; return 0; /* not OKCMD */ } + *ch = (Char)wc; #ifdef KANJI if ((*ch & meta)) { @@ -397,14 +399,15 @@ read_pop(c_macro_t *ma) ma->offset = 0; } -/* el_getc(): - * Read a character +/* el_wgetc(): + * Read a wide character */ public int -FUN(el,getc)(EditLine *el, Char *cp) +el_wgetc(EditLine *el, wchar_t *cp) { int num_read; c_macro_t *ma = &el->el_chared.c_macro; + Char cp_temp; terminal__flush(el); for (;;) { @@ -440,15 +443,16 @@ FUN(el,getc)(EditLine *el, Char *cp) #ifdef DEBUG_READ (void) fprintf(el->el_errfile, "Reading a character\n"); #endif /* DEBUG_READ */ - num_read = (*el->el_read.read_char)(el, cp); + num_read = (*el->el_read.read_char)(el, &cp_temp); if (num_read < 0) el->el_errno = errno; + *cp = cp_temp; #ifdef WIDECHAR if (el->el_flags & NARROW_READ) *cp = *(char *)(void *)cp; #endif #ifdef DEBUG_READ - (void) fprintf(el->el_errfile, "Got it %c\n", *cp); + (void) fprintf(el->el_errfile, "Got it %lc\n", *cp); #endif /* DEBUG_READ */ return num_read; } |
