diff options
author | Ron Yorston <rmy@pobox.com> | 2016-04-04 16:22:54 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2016-04-04 16:22:54 +0100 |
commit | 253dbd612b2d2f041f4263e15a3b94df70f41e36 (patch) | |
tree | f6c6e12a0541233058a7f7ccb1251afeb457da06 /shell/ash.c | |
parent | 3cf56a021d7a62512b477640e930e1a78288075c (diff) | |
parent | d7d4750e1e213e7448147186dddfe3bfbb47eea0 (diff) | |
download | busybox-w32-253dbd612b2d2f041f4263e15a3b94df70f41e36.tar.gz busybox-w32-253dbd612b2d2f041f4263e15a3b94df70f41e36.tar.bz2 busybox-w32-253dbd612b2d2f041f4263e15a3b94df70f41e36.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'shell/ash.c')
-rw-r--r-- | shell/ash.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/shell/ash.c b/shell/ash.c index 57d192822..7cad34511 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
@@ -7026,6 +7026,8 @@ varvalue(char *name, int varflags, int flags, struct strlist *var_str_list) | |||
7026 | if (subtype == VSLENGTH && len > 0) { | 7026 | if (subtype == VSLENGTH && len > 0) { |
7027 | reinit_unicode_for_ash(); | 7027 | reinit_unicode_for_ash(); |
7028 | if (unicode_status == UNICODE_ON) { | 7028 | if (unicode_status == UNICODE_ON) { |
7029 | STADJUST(-len, expdest); | ||
7030 | discard = 0; | ||
7029 | len = unicode_strlen(p); | 7031 | len = unicode_strlen(p); |
7030 | } | 7032 | } |
7031 | } | 7033 | } |