Merge branch 'busybox' into merge

1 files changed, 31 insertions, 37 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 9214982c1..98da20f8a 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -351,19 +351,6 @@ typedef long arith_t;
 # error "Do not even bother, ash will not run on NOMMU machine"
 #endif
 
-/* We use a trick to have more optimized code (fewer pointer reloads):
- *  ash.c:   extern struct globals *const ash_ptr_to_globals;
- *  ash_ptr_hack.c: struct globals *ash_ptr_to_globals;
- * This way, compiler in ash.c knows the pointer can not change.
- *
- * However, this may break on weird arches or toolchains. In this case,
- * set "-DBB_GLOBAL_CONST=''" in CONFIG_EXTRA_CFLAGS to disable
- * this optimization.
- */
-#ifndef BB_GLOBAL_CONST
-# define BB_GLOBAL_CONST const
-#endif
-
 #if ENABLE_PLATFORM_MINGW32
 # define FORKSHELL_DEBUG 0
 
@@ -693,8 +680,7 @@ extern struct globals_misc *BB_GLOBAL_CONST ash_ptr_to_globals_misc;
 #endif
 
 #define INIT_G_misc() do { \
-        (*(struct globals_misc**)not_const_pp(&ash_ptr_to_globals_misc)) = xzalloc(sizeof(G_misc)); \
-        barrier(); \
+        XZALLOC_CONST_PTR(&ash_ptr_to_globals_misc, sizeof(G_misc)); \
         savestatus = -1; \
         curdir = nullstr; \
         physdir = nullstr; \
@@ -1783,8 +1769,7 @@ extern struct globals_memstack *BB_GLOBAL_CONST ash_ptr_to_globals_memstack;
 #define g_stacknleft (G_memstack.g_stacknleft)
 #define stackbase    (G_memstack.stackbase   )
 #define INIT_G_memstack() do { \
-        (*(struct globals_memstack**)not_const_pp(&ash_ptr_to_globals_memstack)) = xzalloc(sizeof(G_memstack)); \
-        barrier(); \
+        XZALLOC_CONST_PTR(&ash_ptr_to_globals_memstack, sizeof(G_memstack)); \
         g_stackp = &stackbase; \
         g_stacknxt = stackbase.space; \
         g_stacknleft = MINSIZE; \
@@ -2445,8 +2430,7 @@ extern struct globals_var *BB_GLOBAL_CONST ash_ptr_to_globals_var;
 #endif
 #define INIT_G_var() do { \
         unsigned i; \
-        (*(struct globals_var**)not_const_pp(&ash_ptr_to_globals_var)) = xzalloc(sizeof(G_var)); \
-        barrier(); \
+        XZALLOC_CONST_PTR(&ash_ptr_to_globals_var, sizeof(G_var)); \
         for (i = 0; i < ARRAY_SIZE(varinit_data); i++) { \
                 varinit[i].flags    = varinit_data[i].flags; \
                 varinit[i].var_text = varinit_data[i].var_text; \
@@ -7840,14 +7824,19 @@ subevalvar(char *start, char *str, int strloc,
                 if ((unsigned)len > (orig_len - pos))
                         len = orig_len - pos;
 
-                for (vstr = startp; pos; vstr++, pos--) {
-                        if (quotes && (unsigned char)*vstr == CTLESC)
+                if (!quotes) {
+                        loc = mempcpy(startp, startp + pos, len);
+                } else {
+                        for (vstr = startp; pos != 0; pos--) {
+                                if ((unsigned char)*vstr == CTLESC)
+                                        vstr++;
                                 vstr++;
-                }
-                for (loc = startp; len; len--) {
-                        if (quotes && (unsigned char)*vstr == CTLESC)
+                        }
+                        for (loc = startp; len != 0; len--) {
+                                if ((unsigned char)*vstr == CTLESC)
+                                        *loc++ = *vstr++;
                                 *loc++ = *vstr++;
-                        *loc++ = *vstr++;
+                        }
                 }
                 *loc = '\0';
                 goto out;
@@ -7901,7 +7890,7 @@ subevalvar(char *start, char *str, int strloc,
 #if BASH_PATTERN_SUBST
         workloc = expdest - (char *)stackblock();
         if (subtype == VSREPLACE || subtype == VSREPLACEALL) {
-                size_t no_meta_len;
+                size_t no_meta_len, first_escaped;
                 int len;
                 char *idx, *end;
 
@@ -7919,28 +7908,34 @@ subevalvar(char *start, char *str, int strloc,
                 if (str[0] == '\0')
                         goto out1;
 
-                no_meta_len = (ENABLE_ASH_OPTIMIZE_FOR_SIZE || strpbrk(str, "*?[\\")) ? 0 : strlen(str);
+                first_escaped = (str[0] == '\\' && str[1]);
+                /* "first_escaped" trick allows to treat e.g. "\*no_glob_chars"
+                 * as literal too (as it is semi-common, and easy to accomodate
+                 * by just using str + 1).
+                 */
+                no_meta_len = strpbrk(str + first_escaped * 2, "*?[\\") ? 0 : strlen(str);
                 len = 0;
                 idx = startp;
                 end = str - 1;
                 while (idx <= end) {
  try_to_match:
                         if (no_meta_len == 0) {
-                                /* pattern has meta chars, have to glob; or ENABLE_ASH_OPTIMIZE_FOR_SIZE */
+                                /* pattern has meta chars, have to glob */
                                 loc = scanright(idx, rmesc, rmescend, str, quotes, /*match_at_start:*/ 1);
                         } else {
                                 /* Testcase for very slow replace (performs about 22k replaces):
                                  * x=::::::::::::::::::::::
                                  * x=$x$x;x=$x$x;x=$x$x;x=$x$x;x=$x$x;x=$x$x;x=$x$x;x=$x$x;x=$x$x;x=$x$x;echo ${#x}
                                  * echo "${x//:/|}"
+                                 * To test "first_escaped" logic, replace : with *.
                                  */
-                                if (strncmp(rmesc, str, no_meta_len) != 0)
+                                if (strncmp(rmesc, str + first_escaped, no_meta_len - first_escaped) != 0)
                                         goto no_match;
                                 loc = idx;
                                 if (!quotes) {
-                                        loc += no_meta_len;
+                                        loc += no_meta_len - first_escaped;
                                 } else {
-                                        size_t n = no_meta_len;
+                                        size_t n = no_meta_len - first_escaped;
                                         do {
                                                 if ((unsigned char)*loc == CTLESC)
                                                         loc++;
@@ -11811,14 +11806,14 @@ static void freestrings(struct strpush *sp)
         INT_OFF;
         do {
                 struct strpush *psp;
-
+#if ENABLE_ASH_ALIAS
                 if (sp->ap) {
                         sp->ap->flag &= ~ALIASINUSE;
                         if (sp->ap->flag & ALIASDEAD) {
                                 unalias(sp->ap->name);
                         }
                 }
-
+#endif
                 psp = sp;
                 sp = sp->spfree;
 
@@ -15497,7 +15492,7 @@ init(void)
 
 
 //usage:#define ash_trivial_usage
-//usage:        "[-il] [-|+Cabefmnuvx] [-|+o OPT]... [-c 'SCRIPT' [ARG0 ARGS] | FILE [ARGS] | -s [ARGS]]"
+//usage:        "[-il] [-|+Cabefmnuvx] [-|+o OPT]... [-c 'SCRIPT' [ARG0 ARGS] | FILE ARGS | -s ARGS]"
 ////////        comes from ^^^^^^^^^^optletters
 //usage:#define ash_full_usage "\n\n"
 //usage:        "Unix shell interpreter"
@@ -15764,13 +15759,12 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
         }
  state2:
         state = 3;
-        if (
+        if (iflag
 #if ENABLE_PLATFORM_POSIX
 #ifndef linux
-         getuid() == geteuid() && getgid() == getegid() &&
+         && getuid() == geteuid() && getgid() == getegid()
 #endif
 #endif
-         iflag
         ) {
                 const char *shinit = lookupvar("ENV");
                 if (shinit != NULL && *shinit != '\0')