Merge branch 'busybox' into merge

Conflicts:
	debianutils/which.c
	editors/vi.c
	libbb/executable.c

1 files changed, 10 insertions, 1 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 19565d185..ce6e355eb 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -55,6 +55,7 @@
 #include <setjmp.h>
 #include <fnmatch.h>
 #include <sys/times.h>
+#include <sys/utsname.h> /* for setting $HOSTNAME */
 
 #include "busybox.h" /* for applet_names */
 #include "unicode.h"
@@ -9353,6 +9354,9 @@ mklocal(char *name)
                         vp->flags |= VSTRFIXED|VTEXTFIXED;
                         if (eq)
                                 setvareq(name, 0);
+                        else
+                                /* "local VAR" unsets VAR: */
+                                setvar(name, NULL, 0);
                 }
         }
         lvp->vp = vp;
@@ -12899,7 +12903,7 @@ find_command(char *name, struct cmdentry *entry, int act, const char *path)
                                                         e = errno;
                                                 goto loop;
                                         }
-                                        if (!execable_file(fullname)) {
+                                        if (!file_is_executable(fullname)) {
                                                 e = ENOEXEC;
                                                 goto loop;
                                         }
@@ -13522,6 +13526,11 @@ init(void)
 #if ENABLE_ASH_BASH_COMPAT
                 p = lookupvar("SHLVL");
                 setvar("SHLVL", utoa((p ? atoi(p) : 0) + 1), VEXPORT);
+                if (!lookupvar("HOSTNAME")) {
+                        struct utsname uts;
+                        uname(&uts);
+                        setvar2("HOSTNAME", uts.nodename);
+                }
 #endif
                 p = lookupvar("PWD");
                 if (p) {