Merge branch 'busybox' into merge

Conflicts:
	archival/Config.src
	shell/ash.c

2 files changed, 12 insertions, 10 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 6e6fc6a71..97c9589cc 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -2348,7 +2348,7 @@ unsetvar(const char *s)
                         free(vp);
                         INT_ON;
                 } else {
-                        setvar(s, 0, 0);
+                        setvar2(s, 0);
                         vp->flags &= ~VEXPORT;
                 }
  ok:
@@ -6698,7 +6698,7 @@ subevalvar(char *p, char *varname, int strloc, int subtype,
 
         switch (subtype) {
         case VSASSIGN:
-                setvar(varname, startp, 0);
+                setvar2(varname, startp);
                 amount = startp - expdest;
                 STADJUST(amount, expdest);
                 return startp;
@@ -8960,7 +8960,7 @@ evalfor(union node *n, int flags)
         loopnest++;
         flags &= EV_TESTED;
         for (sp = arglist.list; sp; sp = sp->next) {
-                setvar(n->nfor.var, sp->text, 0);
+                setvar2(n->nfor.var, sp->text);
                 evaltree(n->nfor.body, flags);
                 if (evalskip) {
                         if (evalskip == SKIPCONT && --skipcount <= 0) {
@@ -9955,7 +9955,7 @@ evalcommand(union node *cmd, int flags)
                  * '_' in 'vi' command mode during line editing...
                  * However I implemented that within libedit itself.
                  */
-                setvar("_", lastarg, 0);
+                setvar2("_", lastarg);
         }
         popstackmark(&smark);
 }
@@ -12777,7 +12777,6 @@ dotcmd(int argc, char **argv)
          * bash returns exitcode 1 instead.
          */
         fullname = find_dot_file(argv[1]);
-
         argv += 2;
         argc -= 2;
         if (argc) { /* argc > 0, argv[0] != NULL */
@@ -13615,8 +13614,11 @@ init(void)
                 }
 
                 if (!ENABLE_PLATFORM_MINGW32)
-                        setvar("PPID", utoa(getppid()), 0);
-
+                        setvar2("PPID", utoa(getppid()));
+#if ENABLE_ASH_BASH_COMPAT
+                p = lookupvar("SHLVL");
+                setvar2("SHLVL", utoa(p ? atoi(p) + 1 : 1));
+#endif
                 p = lookupvar("PWD");
                 if (p) {
                         if (*p != '/' || stat(p, &st1) || stat(".", &st2)
@@ -13909,7 +13911,7 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
                                 hp = lookupvar("HOME");
                                 if (hp) {
                                         hp = concat_path_file(hp, ".ash_history");
-                                        setvar("HISTFILE", hp, 0);
+                                        setvar2("HISTFILE", hp);
                                         free((char*)hp);
                                         hp = lookupvar("HISTFILE");
                                 }
diff --git a/shell/hush.c b/shell/hush.c
index 912ecf15f..927193450 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -1310,7 +1310,7 @@ static void restore_G_args(save_arg_t *sv, char **argv)
  * backgrounds (i.e. stops) or kills all members of currently running
  * pipe.
  *
- * Wait builtin in interruptible by signals for which user trap is set
+ * Wait builtin is interruptible by signals for which user trap is set
  * or by SIGINT in interactive shell.
  *
  * Trap handlers will execute even within trap handlers. (right?)
@@ -1398,7 +1398,7 @@ static void restore_G_args(save_arg_t *sv, char **argv)
  * for them - a bit like emulating kernel pending signal mask in userspace.
  * We are interested in: signals which need to have special handling
  * as described above, and all signals which have traps set.
- * Signals are rocorded in pending_set.
+ * Signals are recorded in pending_set.
  * After each pipe execution, we extract any pending signals
  * and act on them.
  *