5 files changed, 13 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)
                 if (subtype == VSLENGTH && len > 0) {
                         reinit_unicode_for_ash();
                         if (unicode_status == UNICODE_ON) {
+                                STADJUST(-len, expdest);
+                                discard = 0;
                                 len = unicode_strlen(p);
                         }
                 }
diff --git a/shell/ash_test/.gitignore b/shell/ash_test/.gitignore
new file mode 100644
index 000000000..a1f937cdd
--- /dev/null
+++ b/shell/ash_test/.gitignore
@@ -0,0 +1,7 @@
+/ash
+/printenv
+/recho
+/zecho
+
+/*.fail
+*.xx
diff --git a/shell/ash_test/ash-vars/var-utf8-length.right b/shell/ash_test/ash-vars/var-utf8-length.right
new file mode 100644
index 000000000..6f4247a62
--- /dev/null
+++ b/shell/ash_test/ash-vars/var-utf8-length.right
@@ -0,0 +1 @@
+26
diff --git a/shell/ash_test/ash-vars/var-utf8-length.tests b/shell/ash_test/ash-vars/var-utf8-length.tests
new file mode 100755
index 000000000..d04b2cbb6
--- /dev/null
+++ b/shell/ash_test/ash-vars/var-utf8-length.tests
@@ -0,0 +1,2 @@
+X=abcdÉfghÍjklmnÓpqrstÚvwcyz
+echo ${#X}
diff --git a/shell/ash_test/printenv.c b/shell/ash_test/printenv.c
index c4ccda8a6..c0c5e197c 100644
--- a/shell/ash_test/printenv.c
+++ b/shell/ash_test/printenv.c
@@ -24,6 +24,7 @@
    with Bash; see the file COPYING.  If not, write to the Free Software
    Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>