Merge branch 'busybox' into merge

1 files changed, 10 insertions, 4 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 8a27d5cc3..95d0aebf0 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -638,7 +638,7 @@ extern struct globals_misc *BB_GLOBAL_CONST ash_ptr_to_globals_misc;
 #define random_gen  (G_misc.random_gen )
 #define backgndpid  (G_misc.backgndpid )
 #define INIT_G_misc() do { \
-        (*(struct globals_misc**)&ash_ptr_to_globals_misc) = xzalloc(sizeof(G_misc)); \
+        (*(struct globals_misc**)not_const_pp(&ash_ptr_to_globals_misc)) = xzalloc(sizeof(G_misc)); \
         barrier(); \
         curdir = nullstr; \
         physdir = nullstr; \
@@ -1693,7 +1693,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**)&ash_ptr_to_globals_memstack) = xzalloc(sizeof(G_memstack)); \
+        (*(struct globals_memstack**)not_const_pp(&ash_ptr_to_globals_memstack)) = xzalloc(sizeof(G_memstack)); \
         barrier(); \
         g_stackp = &stackbase; \
         g_stacknxt = stackbase.space; \
@@ -2316,7 +2316,7 @@ extern struct globals_var *BB_GLOBAL_CONST ash_ptr_to_globals_var;
 #endif
 #define INIT_G_var() do { \
         unsigned i; \
-        (*(struct globals_var**)&ash_ptr_to_globals_var) = xzalloc(sizeof(G_var)); \
+        (*(struct globals_var**)not_const_pp(&ash_ptr_to_globals_var)) = xzalloc(sizeof(G_var)); \
         barrier(); \
         for (i = 0; i < ARRAY_SIZE(varinit_data); i++) { \
                 varinit[i].flags    = varinit_data[i].flags; \
@@ -13112,7 +13112,13 @@ checkend: {
                 for (p = eofmark; STPUTC(c, out), *p; p++) {
                         if (c != *p)
                                 goto more_heredoc;
-
+                        /* FIXME: fails for backslash-newlined terminator:
+                         * cat <<EOF
+                         * ...
+                         * EO\
+                         * F
+                         * (see heredoc_bkslash_newline2.tests)
+                         */
                         c = pgetc_without_PEOA();
                 }