Merge branch 'busybox' into merge

3 files changed, 30 insertions, 40 deletions

diff --git a/coreutils/timeout.c b/coreutils/timeout.c
index 802ddfc07..764927a12 100644
--- a/coreutils/timeout.c
+++ b/coreutils/timeout.c
@@ -61,10 +61,10 @@ static void kill_child(void)
 }
 
 /* Return TRUE if child exits before timeout expires */
-/* NB timeout is in milliseconds */
-static NOINLINE int timeout_wait(int timeout, HANDLE proc, DWORD *status)
+static NOINLINE int timeout_wait(duration_t timeout, HANDLE proc, DWORD *status)
 {
-        if (WaitForSingleObject(proc, timeout) == WAIT_OBJECT_0) {
+        DWORD t = (DWORD)(timeout * 1000);
+        if (WaitForSingleObject(proc, t) == WAIT_OBJECT_0) {
                 /* process is gone */
                 GetExitCodeProcess(proc, status);
                 return TRUE;
@@ -72,11 +72,16 @@ static NOINLINE int timeout_wait(int timeout, HANDLE proc, DWORD *status)
         return FALSE;
 }
 #else
-static NOINLINE int timeout_wait(int timeout, pid_t pid)
+static NOINLINE int timeout_wait(duration_t timeout, pid_t pid)
 {
         /* Just sleep(HUGE_NUM); kill(parent) may kill wrong process! */
         while (1) {
-                sleep1();
+#if ENABLE_FLOAT_DURATION
+                if (timeout < 1)
+                        sleep_for_duration(timeout);
+                else
+#endif
+                        sleep1();
                 if (--timeout <= 0)
                         break;
                 if (kill(pid, 0)) {
@@ -99,8 +104,8 @@ int timeout_main(int argc UNUSED_PARAM, char **argv)
         intptr_t ret;
         DWORD status = EXIT_SUCCESS;
 #endif
-        int timeout;
-        int kill_timeout;
+        duration_t timeout;
+        duration_t kill_timeout;
         pid_t pid;
 #if !BB_MMU
         char *sv1, *sv2;
@@ -133,11 +138,11 @@ int timeout_main(int argc UNUSED_PARAM, char **argv)
 
         kill_timeout = 0;
         if (opt_k)
-                kill_timeout = parse_duration_str(opt_k) IF_PLATFORM_MINGW32(* 1000);
+                kill_timeout = parse_duration_str(opt_k);
 
         if (!argv[optind])
                 bb_show_usage();
-        timeout = parse_duration_str(argv[optind++]) IF_PLATFORM_MINGW32(* 1000);
+        timeout = parse_duration_str(argv[optind++]);
         if (!argv[optind]) /* no PROG? */
                 bb_show_usage();
 
diff --git a/procps/powertop.c b/procps/powertop.c
index 147b7a3ef..6fe892540 100644
--- a/procps/powertop.c
+++ b/procps/powertop.c
@@ -498,24 +498,11 @@ static NOINLINE int process_timer_stats(void)
 }
 
 #ifdef __i386__
-/*
- * Get information about CPU using CPUID opcode.
- */
-static void cpuid(unsigned int *eax, unsigned int *ebx, unsigned int *ecx,
-                                unsigned int *edx)
+static void cpuid_eax_ecx_edx(unsigned *eax, unsigned *ebx, unsigned *ecx, unsigned *edx)
 {
-        /* EAX value specifies what information to return */
-        asm (
-                "       cpuid\n"
-                : "=a"(*eax), /* Output */
-                  "=b"(*ebx),
-                  "=c"(*ecx),
-                  "=d"(*edx)
-                : "0"(*eax),  /* Input */
-                  "1"(*ebx),
-                  "2"(*ecx),
-                  "3"(*edx)
-                /* No clobbered registers */
+        asm ("cpuid"
+                : "=a"(*eax), "=b"(*ebx), "=c"(*ecx), "=d"(*edx)
+                : "0" (*eax),             "2" (*ecx), "3" (*edx)
         );
 }
 #endif
@@ -592,8 +579,8 @@ static NOINLINE void print_intel_cstates(void)
                 return;
 
         eax = 5;
-        ebx = ecx = edx = 0;
-        cpuid(&eax, &ebx, &ecx, &edx);
+        ecx = edx = 0; /* paranoia, should not be needed */
+        cpuid_eax_ecx_edx(&eax, /*unused:*/&ebx, &ecx, &edx);
         if (!edx || !(ecx & 1))
                 return;
 
diff --git a/shell/ash.c b/shell/ash.c
index 7a9f20ec0..15c0e56a3 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -2592,9 +2592,11 @@ initvar(void)
 }
 
 static struct var **
-findvar(struct var **vpp, const char *name)
+findvar(const char *name)
 {
-        for (; *vpp; vpp = &(*vpp)->next) {
+        struct var **vpp;
+
+        for (vpp = hashvar(name); *vpp; vpp = &(*vpp)->next) {
                 if (varcmp((*vpp)->var_text, name) == 0) {
                         break;
                 }
@@ -2610,7 +2612,7 @@ lookupvar(const char *name)
 {
         struct var *v;
 
-        v = *findvar(hashvar(name), name);
+        v = *findvar(name);
         if (v) {
 #if ENABLE_ASH_RANDOM_SUPPORT || BASH_EPOCH_VARS
         /*
@@ -2756,9 +2758,8 @@ setvareq(char *s, int flags)
         }
 #endif
 
-        vpp = hashvar(s);
         flags |= (VEXPORT & (((unsigned) (1 - aflag)) - 1));
-        vpp = findvar(vpp, s);
+        vpp = findvar(s);
         vp = *vpp;
         if (vp) {
                 if ((vp->flags & (VREADONLY|VDYNAMIC)) == VREADONLY) {
@@ -11131,7 +11132,6 @@ static void
 mklocal(char *name, int flags)
 {
         struct localvar *lvp;
-        struct var **vpp;
         struct var *vp;
         char *eq = strchr(name, '=');
 
@@ -11160,8 +11160,7 @@ mklocal(char *name, int flags)
                 lvp->text = memcpy(p, optlist, sizeof(optlist));
                 vp = NULL;
         } else {
-                vpp = hashvar(name);
-                vp = *findvar(vpp, name);
+                vp = *findvar(name);
                 if (vp == NULL) {
                         /* variable did not exist yet */
                         if (eq)
@@ -15510,7 +15509,7 @@ exportcmd(int argc UNUSED_PARAM, char **argv)
                                 if (p != NULL) {
                                         p++;
                                 } else {
-                                        vp = *findvar(hashvar(name), name);
+                                        vp = *findvar(name);
                                         if (vp) {
 #if ENABLE_PLATFORM_MINGW32
                                                 if (is_bb_var(name) == BB_VAR_EXACT) {
@@ -16553,7 +16552,7 @@ reinitvar(void)
 {
         int i;
         const char *name;
-        struct var **vpp, **old;
+        struct var **old;
 
         for (i=0; i<ARRAY_SIZE(varinit); ++i) {
                 if (i == LINENO_INDEX)
@@ -16562,8 +16561,7 @@ reinitvar(void)
                         name = "FUNCNAME=";
                 else
                         name = varinit_data[i].var_text;
-                vpp = hashvar(name);
-                if ( (old=findvar(vpp, name)) != NULL ) {
+                if ((old = findvar(name)) != NULL) {
                         varinit[i] = **old;
                         *old = varinit+i;
                 }