Merge branch 'busybox' into merge

author: Ron Yorston <rmy@pobox.com> 2014-10-06 12:50:22 +0100
committer: Ron Yorston <rmy@pobox.com> 2014-10-06 12:50:22 +0100
commit: b04d11dcbadda2620743a1dd923938f2f3043a38 (patch)
tree: 971afe425a81304b79e44122e220c7a69efe2616 /shell
parent: 124bbf02948b7ac0babb4ead04acd1559db182d3 (diff)
parent: 760d035699c4a878f9109544c1d35ea0d5f6b76c (diff)
download: busybox-w32-b04d11dcbadda2620743a1dd923938f2f3043a38.tar.gz
busybox-w32-b04d11dcbadda2620743a1dd923938f2f3043a38.tar.bz2
busybox-w32-b04d11dcbadda2620743a1dd923938f2f3043a38.zip
4 files changed, 81 insertions, 33 deletions
diff --git a/shell/ash.c b/shell/ash.c
index 550a98db6..3f3e2f4bc 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -161,6 +161,13 @@
 //config:       help
 //config:         Enable support for test builtin in ash.
 //config:
+//config:config ASH_HELP
+//config:       bool "help builtin"
+//config:       default y
+//config:       depends on ASH
+//config:       help
+//config:         Enable help builtin in ash.
+//config:
 //config:config ASH_CMDCMD
 //config:       bool "'command' command to override shell builtins"
 //config:       default y
@@ -2189,6 +2196,22 @@ lookupvar(const char *name)
        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.
 */
@@ -3818,7 +3841,7 @@ getjob(const char *name, int getctl)
        if (is_number(p)) {
                num = atoi(p);
-                if (num < njobs) {
+                if (num <= njobs) {
                        jp = jobtab + num - 1;
                        if (jp->used)
                                goto gotit;
@@ -7127,7 +7150,15 @@ evalvar(char *p, int flags, struct strlist *var_str_list)
                varunset(p, var, 0, 0);
        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;
        }
@@ -9180,8 +9211,8 @@ setinteractive(int on)
                if (!did_banner) {
                        /* note: ash and hush share this string */
                        out1fmt("\n\n%s %s\n"
-                                "Enter 'help' for a list of built-in commands."
+                                IF_ASH_HELP("Enter 'help' for a list of built-in commands.\n")
-                                "\n\n",
+                                "\n",
                                bb_banner,
                                "built-in shell (ash)"
                        );
@@ -9434,7 +9465,7 @@ static int exportcmd(int, char **) FAST_FUNC;
 #if ENABLE_ASH_GETOPTS
 static int getoptscmd(int, char **) FAST_FUNC;
 #endif
-#if !ENABLE_FEATURE_SH_EXTRA_QUIET
+#if ENABLE_ASH_HELP
 static int helpcmd(int, char **) FAST_FUNC;
 #endif
 #if MAX_HISTORY
@@ -9510,7 +9541,7 @@ static const struct builtincmd builtintab[] = {
        { BUILTIN_REGULAR       "getopts" , getoptscmd },
 #endif
        { BUILTIN_NOSPEC        "hash"    , hashcmd    },
-#if !ENABLE_FEATURE_SH_EXTRA_QUIET
+#if ENABLE_ASH_HELP
        { BUILTIN_NOSPEC        "help"    , helpcmd    },
 #endif
 #if MAX_HISTORY
@@ -10080,16 +10111,7 @@ preadfd(void)
 # if ENABLE_FEATURE_TAB_COMPLETION
                line_input_state->path_lookup = pathval();
 # 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:
-                 */
-                {
-                        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);
                if (nr == 0) {
                        /* Ctrl+C pressed */
@@ -13059,10 +13081,7 @@ trapcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 /* ============ Builtins */
-#if !ENABLE_FEATURE_SH_EXTRA_QUIET
+#if ENABLE_ASH_HELP
-/*
- * Lists available builtins
- */
 static int FAST_FUNC
 helpcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
@@ -13080,7 +13099,7 @@ helpcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                        col = 0;
                }
        }
-#if ENABLE_FEATURE_SH_STANDALONE
+# if ENABLE_FEATURE_SH_STANDALONE
        {
                const char *a = applet_names;
                while (*a) {
@@ -13092,11 +13111,11 @@ helpcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                        a += strlen(a) + 1;
                }
        }
-#endif
+# endif
        out1fmt("\n\n");
        return EXIT_SUCCESS;
 }
-#endif /* FEATURE_SH_EXTRA_QUIET */
+#endif
 #if MAX_HISTORY
 static int FAST_FUNC
diff --git a/shell/hush.c b/shell/hush.c
index e1d0ece29..92d790180 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -1977,6 +1977,26 @@ static struct variable *set_vars_and_save_old(char **strings)
 /*
+ * Unicode helper
+ */
+static void reinit_unicode_for_hush(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 = get_local_var_value("LC_ALL");
+                if (!s) s = get_local_var_value("LC_CTYPE");
+                if (!s) s = get_local_var_value("LANG");
+                reinit_unicode(s);
+        }
+}
+/*
 * in_str support
 */
 static int FAST_FUNC static_get(struct in_str *i)
@@ -2042,15 +2062,7 @@ static void get_user_input(struct in_str *i)
        /* Enable command line editing only while a command line
         * is actually being read */
        do {
-                /* Unicode support should be activated even if LANG is set
+                reinit_unicode_for_hush();
-                 * _during_ shell execution, not only if it was set when
-                 * shell was started. Therefore, re-check LANG every time:
-                 */
-                const char *s = get_local_var_value("LC_ALL");
-                if (!s) s = get_local_var_value("LC_CTYPE");
-                if (!s) s = get_local_var_value("LANG");
-                reinit_unicode(s);
                G.flag_SIGINT = 0;
                /* buglet: SIGINT will not make new prompt to appear _at once_,
                 * only after <Enter>. (^C will work) */
@@ -5028,8 +5040,9 @@ static NOINLINE const char *expand_one_var(char **to_be_freed_pp, char *arg, cha
        /* Handle any expansions */
        if (exp_op == 'L') {
+                reinit_unicode_for_hush();
                debug_printf_expand("expand: length(%s)=", val);
-                val = utoa(val ? strlen(val) : 0);
+                val = utoa(val ? unicode_strlen(val) : 0);
                debug_printf_expand("%s\n", val);
        } else if (exp_op) {
                if (exp_op == '%' || exp_op == '#') {
diff --git a/shell/hush_test/hush-misc/unicode1.right b/shell/hush_test/hush-misc/unicode1.right
new file mode 100644
index 000000000..d3bbbf697
--- /dev/null
+++ b/shell/hush_test/hush-misc/unicode1.right
@@ -0,0 +1,3 @@
+1
+1
+Ok
diff --git a/shell/hush_test/hush-misc/unicode1.tests b/shell/hush_test/hush-misc/unicode1.tests
new file mode 100755
index 000000000..8788ba910
--- /dev/null
+++ b/shell/hush_test/hush-misc/unicode1.tests
@@ -0,0 +1,13 @@
+LANG=en_US.UTF-8
+# A combining character U+300
+a=`printf "\xcc\x80"`
+# Should print 1
+echo ${#a}
+# A Japanese katakana charachter U+30a3
+a=`printf "\xe3\x82\xa3"`
+# Should print 1
+echo ${#a}
+echo Ok
author	Ron Yorston <rmy@pobox.com>	2014-10-06 12:50:22 +0100
committer	Ron Yorston <rmy@pobox.com>	2014-10-06 12:50:22 +0100
commit	b04d11dcbadda2620743a1dd923938f2f3043a38 (patch)
tree	971afe425a81304b79e44122e220c7a69efe2616 /shell
parent	124bbf02948b7ac0babb4ead04acd1559db182d3 (diff)
parent	760d035699c4a878f9109544c1d35ea0d5f6b76c (diff)
download	busybox-w32-b04d11dcbadda2620743a1dd923938f2f3043a38.tar.gz busybox-w32-b04d11dcbadda2620743a1dd923938f2f3043a38.tar.bz2 busybox-w32-b04d11dcbadda2620743a1dd923938f2f3043a38.zip