Changeset 2859 in MondoRescue for branches/2.2.9/mindi-busybox/shell/hush.c

Timestamp:

Jul 26, 2011, 1:25:42 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Update to upstream busybox 1.18.5

File:

• branches/2.2.9/mindi-busybox/shell/hush.c (modified) (12 diffs)

branches/2.2.9/mindi-busybox/shell/hush.c

@@ -428 +428 @@
 #define NULL_O_STRING { NULL }
 
+#ifndef debug_printf_parse
+static const char *const assignment_flag[] = {
+    "MAYBE_ASSIGNMENT",
+    "DEFINITELY_ASSIGNMENT",
+    "NOT_ASSIGNMENT",
+    "WORD_IS_KEYWORD",
+};
+#endif
+
 /* I can almost use ordinary FILE*.  Is open_memstream() universally
  * available?  Where is it documented? */
@@ -2886 +2895 @@
     static const struct reserved_combo reserved_list[] = {
 # if ENABLE_HUSH_IF
-        { "!",     RES_NONE,  NOT_ASSIGNMENT , 0 },
-        { "if",    RES_IF,    WORD_IS_KEYWORD, FLAG_THEN | FLAG_START },
-        { "then",  RES_THEN,  WORD_IS_KEYWORD, FLAG_ELIF | FLAG_ELSE | FLAG_FI },
-        { "elif",  RES_ELIF,  WORD_IS_KEYWORD, FLAG_THEN },
-        { "else",  RES_ELSE,  WORD_IS_KEYWORD, FLAG_FI   },
-        { "fi",    RES_FI,    NOT_ASSIGNMENT , FLAG_END  },
+        { "!",     RES_NONE,  NOT_ASSIGNMENT  , 0 },
+        { "if",    RES_IF,    MAYBE_ASSIGNMENT, FLAG_THEN | FLAG_START },
+        { "then",  RES_THEN,  MAYBE_ASSIGNMENT, FLAG_ELIF | FLAG_ELSE | FLAG_FI },
+        { "elif",  RES_ELIF,  MAYBE_ASSIGNMENT, FLAG_THEN },
+        { "else",  RES_ELSE,  MAYBE_ASSIGNMENT, FLAG_FI   },
+        { "fi",    RES_FI,    NOT_ASSIGNMENT  , FLAG_END  },
 # endif
 # if ENABLE_HUSH_LOOPS
-        { "for",   RES_FOR,   NOT_ASSIGNMENT , FLAG_IN | FLAG_DO | FLAG_START },
-        { "while", RES_WHILE, WORD_IS_KEYWORD, FLAG_DO | FLAG_START },
-        { "until", RES_UNTIL, WORD_IS_KEYWORD, FLAG_DO | FLAG_START },
-        { "in",    RES_IN,    NOT_ASSIGNMENT , FLAG_DO   },
-        { "do",    RES_DO,    WORD_IS_KEYWORD, FLAG_DONE },
-        { "done",  RES_DONE,  NOT_ASSIGNMENT , FLAG_END  },
+        { "for",   RES_FOR,   NOT_ASSIGNMENT  , FLAG_IN | FLAG_DO | FLAG_START },
+        { "while", RES_WHILE, MAYBE_ASSIGNMENT, FLAG_DO | FLAG_START },
+        { "until", RES_UNTIL, MAYBE_ASSIGNMENT, FLAG_DO | FLAG_START },
+        { "in",    RES_IN,    NOT_ASSIGNMENT  , FLAG_DO   },
+        { "do",    RES_DO,    MAYBE_ASSIGNMENT, FLAG_DONE },
+        { "done",  RES_DONE,  NOT_ASSIGNMENT  , FLAG_END  },
 # endif
 # if ENABLE_HUSH_CASE
-        { "case",  RES_CASE,  NOT_ASSIGNMENT , FLAG_MATCH | FLAG_START },
-        { "esac",  RES_ESAC,  NOT_ASSIGNMENT , FLAG_END  },
+        { "case",  RES_CASE,  NOT_ASSIGNMENT  , FLAG_MATCH | FLAG_START },
+        { "esac",  RES_ESAC,  NOT_ASSIGNMENT  , FLAG_END  },
 # endif
     };
@@ -2969 +2978 @@
     ctx->old_flag = r->flag;
     word->o_assignment = r->assignment_flag;
+    debug_printf_parse("word->o_assignment='%s'\n", assignment_flag[word->o_assignment]);
 
     if (ctx->old_flag & FLAG_END) {
@@ -3035 +3045 @@
         ctx->pending_redirect = NULL;
     } else {
-        /* If this word wasn't an assignment, next ones definitely
-         * can't be assignments. Even if they look like ones. */
-        if (word->o_assignment != DEFINITELY_ASSIGNMENT
-         && word->o_assignment != WORD_IS_KEYWORD
-        ) {
-            word->o_assignment = NOT_ASSIGNMENT;
-        } else {
-            if (word->o_assignment == DEFINITELY_ASSIGNMENT)
-                command->assignment_cnt++;
-            word->o_assignment = MAYBE_ASSIGNMENT;
-        }
-
 #if HAS_KEYWORDS
 # if ENABLE_HUSH_CASE
@@ -3066 +3064 @@
 # endif
         ) {
-            debug_printf_parse("checking '%s' for reserved-ness\n", word->data);
-            if (reserved_word(word, ctx)) {
+            int reserved = reserved_word(word, ctx);
+            debug_printf_parse("checking for reserved-ness: %d\n", reserved);
+            if (reserved) {
                 o_reset_to_empty_unquoted(word);
                 debug_printf_parse("done_word return %d\n",
@@ -3088 +3087 @@
             return 1;
         }
+
+        /* If this word wasn't an assignment, next ones definitely
+         * can't be assignments. Even if they look like ones. */
+        if (word->o_assignment != DEFINITELY_ASSIGNMENT
+         && word->o_assignment != WORD_IS_KEYWORD
+        ) {
+            word->o_assignment = NOT_ASSIGNMENT;
+        } else {
+            if (word->o_assignment == DEFINITELY_ASSIGNMENT) {
+                command->assignment_cnt++;
+                debug_printf_parse("++assignment_cnt=%d\n", command->assignment_cnt);
+            }
+            debug_printf_parse("word->o_assignment was:'%s'\n", assignment_flag[word->o_assignment]);
+            word->o_assignment = MAYBE_ASSIGNMENT;
+        }
+        debug_printf_parse("word->o_assignment='%s'\n", assignment_flag[word->o_assignment]);
+
         if (word->has_quoted_part
          /* optimization: and if it's ("" or '') or ($v... or `cmd`...): */
@@ -4106 +4122 @@
             ) {
                 dest.o_assignment = DEFINITELY_ASSIGNMENT;
+                debug_printf_parse("dest.o_assignment='%s'\n", assignment_flag[dest.o_assignment]);
             }
             continue;
@@ -4155 +4172 @@
                 }
                 dest.o_assignment = MAYBE_ASSIGNMENT;
+                debug_printf_parse("dest.o_assignment='%s'\n", assignment_flag[dest.o_assignment]);
                 ch = ';';
                 /* note: if (is_blank) continue;
@@ -4204 +4222 @@
             done_pipe(&ctx, PIPE_SEQ);
             dest.o_assignment = MAYBE_ASSIGNMENT;
+            debug_printf_parse("dest.o_assignment='%s'\n", assignment_flag[dest.o_assignment]);
             /* Do we sit outside of any if's, loops or case's? */
             if (!HAS_KEYWORDS
@@ -4310 +4329 @@
              * cannot be an assignment */
             dest.o_assignment = NOT_ASSIGNMENT;
+            debug_printf_parse("dest.o_assignment='%s'\n", assignment_flag[dest.o_assignment]);
         }
 
@@ -4407 +4427 @@
              * with an assignment */
             dest.o_assignment = MAYBE_ASSIGNMENT;
+            debug_printf_parse("dest.o_assignment='%s'\n", assignment_flag[dest.o_assignment]);
             break;
         case '&':
@@ -7293 +7314 @@
 #if ENABLE_HUSH_LOOPS
         /* Beware of "while false; true; do ..."! */
-        if (pi->next && pi->next->res_word == RES_DO) {
+        if (pi->next
+         && (pi->next->res_word == RES_DO || pi->next->res_word == RES_DONE)
+        /* (the second check above is needed for "while ...; do \n done" case) */
+        ) {
             if (rword == RES_WHILE) {
                 if (rcode) {