Module Name: src
Committed By: christos
Date: Thu Apr 15 00:56:40 UTC 2010
Modified Files:
src/lib/libedit: el.c
Log Message:
>From Jess Thrysoee
- use nl_langinfo to test for UTF-8, because some locales are UTF-8 without
reflecting it in their names.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/lib/libedit/el.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libedit/el.c
diff -u src/lib/libedit/el.c:1.58 src/lib/libedit/el.c:1.59
--- src/lib/libedit/el.c:1.58 Thu Dec 31 10:58:26 2009
+++ src/lib/libedit/el.c Wed Apr 14 20:56:40 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: el.c,v 1.58 2009/12/31 15:58:26 christos Exp $ */
+/* $NetBSD: el.c,v 1.59 2010/04/15 00:56:40 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.58 2009/12/31 15:58:26 christos Exp $");
+__RCSID("$NetBSD: el.c,v 1.59 2010/04/15 00:56:40 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -51,6 +51,7 @@
#include <stdarg.h>
#include <ctype.h>
#include <locale.h>
+#include <langinfo.h>
#include "el.h"
/* el_init():
@@ -59,9 +60,6 @@
public EditLine *
el_init(const char *prog, FILE *fin, FILE *fout, FILE *ferr)
{
-#ifdef WIDECHAR
- char *locale;
-#endif
EditLine *el = (EditLine *) el_malloc(sizeof(EditLine));
if (el == NULL)
@@ -86,8 +84,8 @@
*/
el->el_flags = 0;
#ifdef WIDECHAR
- if ((locale = setlocale(LC_CTYPE, NULL)) != NULL){
- if (strcasestr(locale, ".UTF-8") != NULL)
+ if (setlocale(LC_CTYPE, NULL) != NULL){
+ if (strcmp(nl_langinfo(CODESET), "UTF-8") == 0)
el->el_flags |= CHARSET_IS_UTF8;
}
#endif
@@ -266,7 +264,8 @@
ptr_t ptr = va_arg(ap, ptr_t);
rv = hist_set(el, func, ptr);
- el->el_flags &= ~NARROW_HISTORY;
+ if (!(el->el_flags & CHARSET_IS_UTF8))
+ el->el_flags &= ~NARROW_HISTORY;
break;
}
