Merge branch 'origin/master' (early part)

Conflicts:
	shell/ash.c

3 files changed, 16 insertions, 31 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 89e70c1ee..5ac2a1922 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -48,18 +48,13 @@
 
 #define JOBS ENABLE_ASH_JOB_CONTROL
 
-#if DEBUG
-# ifndef _GNU_SOURCE
-#  define _GNU_SOURCE
-# endif
-#endif
-
 #include "busybox.h" /* for applet_names */
 #ifndef __MINGW32__
 #include <paths.h>
 #endif
 #include <setjmp.h>
 #include <fnmatch.h>
+#include <sys/times.h>
 
 #include "shell_common.h"
 #include "math.h"
@@ -7572,6 +7567,7 @@ tryexec(IF_FEATURE_SH_STANDALONE(int applet_no,) char *cmd, char **argv, char **
 #if ENABLE_FEATURE_SH_STANDALONE
         if (applet_no >= 0) {
                 if (APPLET_IS_NOEXEC(applet_no)) {
+                        clearenv();
                         while (*envp)
                                 putenv(*envp++);
                         run_applet_no_and_exit(applet_no, argv);
@@ -7631,7 +7627,7 @@ shellexec(char **argv, const char *path, int idx)
 #endif
 
         clearredir(/*drop:*/ 1);
-        envp = listvars(VEXPORT, VUNSET, 0);
+        envp = listvars(VEXPORT, VUNSET, /*end:*/ NULL);
         if ((strchr(argv[0], '/') || (ENABLE_PLATFORM_MINGW32 && strchr(argv[0], '\\')))
 #if ENABLE_FEATURE_SH_STANDALONE
          || (applet_no = find_applet_by_name(argv[0])) >= 0
@@ -12962,7 +12958,7 @@ unsetfunc(const char *name)
         struct tblentry *cmdp;
 
         cmdp = cmdlookup(name, 0);
-        if (cmdp!= NULL && cmdp->cmdtype == CMDFUNCTION)
+        if (cmdp != NULL && cmdp->cmdtype == CMDFUNCTION)
                 delete_cmd_entry();
 }
 
@@ -12979,7 +12975,7 @@ unsetcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
         int flag = 0;
         int ret = 0;
 
-        while ((i = nextopt("vf")) != '\0') {
+        while ((i = nextopt("vf")) != 0) {
                 flag = i;
         }
 
@@ -12996,13 +12992,10 @@ unsetcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
         return ret & 1;
 }
 
-
 /*      setmode.c      */
 
 #if !ENABLE_PLATFORM_MINGW32
 
-#include <sys/times.h>
-
 static const unsigned char timescmd_str[] ALIGN1 = {
         ' ',  offsetof(struct tms, tms_utime),
         '\n', offsetof(struct tms, tms_stime),
@@ -13010,11 +13003,10 @@ static const unsigned char timescmd_str[] ALIGN1 = {
         '\n', offsetof(struct tms, tms_cstime),
         0
 };
-
 static int FAST_FUNC
 timescmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
-        long clk_tck, s, t;
+        unsigned long clk_tck, s, t;
         const unsigned char *p;
         struct tms buf;
 
@@ -13025,11 +13017,13 @@ timescmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
         do {
                 t = *(clock_t *)(((char *) &buf) + p[1]);
                 s = t / clk_tck;
-                out1fmt("%ldm%ld.%.3lds%c",
-                        s/60, s%60,
-                        ((t - s * clk_tck) * 1000) / clk_tck,
+                t = t % clk_tck;
+                out1fmt("%lum%lu.%03lus%c",
+                        s / 60, s % 60,
+                        (t * 1000) / clk_tck,
                         p[0]);
-        } while (*(p += 2));
+                p += 2;
+        } while (*p);
 
         return 0;
 }
@@ -13043,7 +13037,7 @@ timescmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 
 #if ENABLE_SH_MATH_SUPPORT
 /*
- * The let builtin. partial stolen from GNU Bash, the Bourne Again SHell.
+ * The let builtin. Partially stolen from GNU Bash, the Bourne Again SHell.
  * Copyright (C) 1987, 1989, 1991 Free Software Foundation, Inc.
  *
  * Copyright (C) 2003 Vladimir Oleynik <dzo@simtreas.ru>
@@ -13062,18 +13056,6 @@ letcmd(int argc UNUSED_PARAM, char **argv)
 
         return !i;
 }
-#endif /* SH_MATH_SUPPORT */
-
-
-/* ============ miscbltin.c
- *
- * Miscellaneous builtins.
- */
-
-#undef rflag
-
-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ < 1
-typedef enum __rlimit_resource rlim_t;
 #endif
 
 /*
diff --git a/shell/ash_test/ash-standalone/var_standalone1.right b/shell/ash_test/ash-standalone/var_standalone1.right
new file mode 100644
index 000000000..37457fd74
--- /dev/null
+++ b/shell/ash_test/ash-standalone/var_standalone1.right
@@ -0,0 +1 @@
+Done: 1
diff --git a/shell/ash_test/ash-standalone/var_standalone1.tests b/shell/ash_test/ash-standalone/var_standalone1.tests
new file mode 100755
index 000000000..1e905ba75
--- /dev/null
+++ b/shell/ash_test/ash-standalone/var_standalone1.tests
@@ -0,0 +1,2 @@
+VAR=42 $THIS_SH -c 'unset VAR; env | grep ^VAR'
+echo Done: $?