emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ash: make ${#var} unicode-aware

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2014-08-13 18:00:08 +02:00
parent 841f8331d7
commit e9ab07c211
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
shell/ash.c
View File

@ -2121,6 +2121,22 @@ lookupvar(const char *name)
return NULL; return NULL;
} }
static void reinit_unicode_for_ash(void)
{
/* Unicode support should be activated even if LANG is set
* _during_ shell execution, not only if it was set when
* shell was started. Therefore, re-check LANG every time:
*/
if (ENABLE_FEATURE_CHECK_UNICODE_IN_ENV
|| ENABLE_UNICODE_USING_LOCALE
) {
const char *s = lookupvar("LC_ALL");
if (!s) s = lookupvar("LC_CTYPE");
if (!s) s = lookupvar("LANG");
reinit_unicode(s);
}
}
/* /*
* Search the environment of a builtin command. * Search the environment of a builtin command.
*/ */
@ -6798,7 +6814,15 @@ evalvar(char *p, int flags, struct strlist *var_str_list)
varunset(p, var, 0, 0); varunset(p, var, 0, 0);
if (subtype == VSLENGTH) { if (subtype == VSLENGTH) {
cvtnum(varlen > 0 ? varlen : 0); ssize_t n = varlen;
if (n > 0) {
reinit_unicode_for_ash();
if (unicode_status == UNICODE_ON) {
const char *val = lookupvar(var);
n = unicode_strlen(val);
}
}
cvtnum(n > 0 ? n : 0);
goto record; goto record;
} }
@ -9657,18 +9681,7 @@ preadfd(void)
# if ENABLE_FEATURE_TAB_COMPLETION # if ENABLE_FEATURE_TAB_COMPLETION
line_input_state->path_lookup = pathval(); line_input_state->path_lookup = pathval();
# endif # endif
/* Unicode support should be activated even if LANG is set reinit_unicode_for_ash();
* _during_ shell execution, not only if it was set when
* shell was started. Therefore, re-check LANG every time:
*/
if (ENABLE_FEATURE_CHECK_UNICODE_IN_ENV
|| ENABLE_UNICODE_USING_LOCALE
) {
const char *s = lookupvar("LC_ALL");
if (!s) s = lookupvar("LC_CTYPE");
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 */