Merge branch 'busybox' into merge

2 files changed, 5 insertions, 2 deletions

diff --git a/editors/awk.c b/editors/awk.c
index 76385f33b..509f4ddd8 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -1363,8 +1363,10 @@ static node *parse_expr(uint32_t iexp)
                                         v = cn->l.v = xzalloc(sizeof(var));
                                         if (tc & TC_NUMBER)
                                                 setvar_i(v, t_double);
-                                        else
+                                        else {
                                                 setvar_s(v, t_string);
+                                                xtc &= ~TC_UOPPOST; /* "str"++ is not allowed */
+                                        }
                                         break;
 
                                 case TC_REGEXP:
diff --git a/editors/patch.c b/editors/patch.c
index 0ce0210fd..aaa253591 100644
--- a/editors/patch.c
+++ b/editors/patch.c
@@ -264,7 +264,7 @@ static int apply_one_hunk(void)
                         if (!plist && matcheof) break;
 
                         if (backwarn)
-                                fdprintf(2,"Possibly reversed hunk %d at %ld\n",
+                                fdprintf(2, "Possibly reversed hunk %d at %ld\n",
                                         TT.hunknum, TT.linenum);
 
                         // File ended before we found a place for this hunk.
@@ -593,6 +593,7 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
                                         TT.linenum = 0;
                                         TT.hunknum = 0;
                                 }
+                                fflush_all(); // make "patching file F" visible
                         }
 
                         TT.hunknum++;