mirror of
https://github.com/sheumann/hush.git
synced 2024-08-21 11:28:57 +00:00
unicode: check $LC_ALL to detect Unicode mode, not only $LANG
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
parent
ea267d518f
commit
3e7ecb179b
@ -39,8 +39,11 @@ void FAST_FUNC reinit_unicode(const char *LANG)
|
|||||||
|
|
||||||
void FAST_FUNC init_unicode(void)
|
void FAST_FUNC init_unicode(void)
|
||||||
{
|
{
|
||||||
if (unicode_status == UNICODE_UNKNOWN)
|
if (unicode_status == UNICODE_UNKNOWN) {
|
||||||
reinit_unicode(getenv("LANG"));
|
char *s = getenv("LC_ALL");
|
||||||
|
if (!s) s = getenv("LANG");
|
||||||
|
reinit_unicode(s);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#else
|
#else
|
||||||
@ -58,8 +61,11 @@ void FAST_FUNC reinit_unicode(const char *LANG)
|
|||||||
|
|
||||||
void FAST_FUNC init_unicode(void)
|
void FAST_FUNC init_unicode(void)
|
||||||
{
|
{
|
||||||
if (unicode_status == UNICODE_UNKNOWN)
|
if (unicode_status == UNICODE_UNKNOWN) {
|
||||||
reinit_unicode(getenv("LANG"));
|
char *s = getenv("LC_ALL");
|
||||||
|
if (!s) s = getenv("LANG");
|
||||||
|
reinit_unicode(s);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
|
@ -9657,7 +9657,11 @@ preadfd(void)
|
|||||||
* _during_ shell execution, not only if it was set when
|
* _during_ shell execution, not only if it was set when
|
||||||
* shell was started. Therefore, re-check LANG every time:
|
* shell was started. Therefore, re-check LANG every time:
|
||||||
*/
|
*/
|
||||||
reinit_unicode(lookupvar("LANG"));
|
{
|
||||||
|
const char *s = lookupvar("LC_ALL");
|
||||||
|
if (!s) s = lookupvar("LANG");
|
||||||
|
reinit_unicode(s);
|
||||||
|
}
|
||||||
nr = read_line_input(line_input_state, cmdedit_prompt, buf, IBUFSIZ, timeout);
|
nr = read_line_input(line_input_state, cmdedit_prompt, buf, IBUFSIZ, timeout);
|
||||||
if (nr == 0) {
|
if (nr == 0) {
|
||||||
/* Ctrl+C pressed */
|
/* Ctrl+C pressed */
|
||||||
|
@ -2044,7 +2044,9 @@ static void get_user_input(struct in_str *i)
|
|||||||
* _during_ shell execution, not only if it was set when
|
* _during_ shell execution, not only if it was set when
|
||||||
* shell was started. Therefore, re-check LANG every time:
|
* shell was started. Therefore, re-check LANG every time:
|
||||||
*/
|
*/
|
||||||
reinit_unicode(get_local_var_value("LANG"));
|
const char *s = get_local_var_value("LC_ALL");
|
||||||
|
if (!s) s = get_local_var_value("LANG");
|
||||||
|
reinit_unicode(s);
|
||||||
|
|
||||||
G.flag_SIGINT = 0;
|
G.flag_SIGINT = 0;
|
||||||
/* buglet: SIGINT will not make new prompt to appear _at once_,
|
/* buglet: SIGINT will not make new prompt to appear _at once_,
|
||||||
|
Loading…
Reference in New Issue
Block a user