Merge branch 'busybox' into merge

2 files changed, 10 insertions, 11 deletions

diff --git a/coreutils/ls.c b/coreutils/ls.c
index 52c43c731..5d2e96a1e 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -540,10 +540,10 @@ static NOINLINE unsigned display_single(const struct dnode *dn)
 #if ENABLE_FEATURE_LS_USERNAME
                 else {
                         if (opt & OPT_g) {
-                                column += printf("%-8.8s ",
+                                column += printf("%-8s ",
                                         get_cached_groupname(dn->dn_gid));
                         } else {
-                                column += printf("%-8.8s %-8.8s ",
+                                column += printf("%-8s %-8s ",
                                         get_cached_username(dn->dn_uid),
                                         get_cached_groupname(dn->dn_gid));
                         }
diff --git a/coreutils/nproc.c b/coreutils/nproc.c
index 7c91a286f..5faa57a65 100644
--- a/coreutils/nproc.c
+++ b/coreutils/nproc.c
@@ -23,7 +23,6 @@
 //usage:     "\n        --ignore=N      Exclude N CPUs"
 //usage:        )
 
-#include <sched.h>
 #include "libbb.h"
 
 int nproc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -59,16 +58,16 @@ int nproc_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                 }
         } else
 #endif
-        if (sched_getaffinity(0, sizeof(mask), (void*)mask) == 0) {
+        {
                 int i;
-                for (i = 0; i < ARRAY_SIZE(mask); i++) {
-                        unsigned long m = mask[i];
-                        while (m) {
-                                if (m & 1)
-                                        count++;
-                                m >>= 1;
-                        }
+                unsigned sz = 2 * 1024;
+                unsigned long *mask = get_malloc_cpu_affinity(0, &sz);
+                sz /= sizeof(long);
+                for (i = 0; i < sz; i++) {
+                        if (mask[i] != 0) /* most mask[i] are usually 0 */
+                                count += bb_popcnt_long(mask[i]);
                 }
+                IF_FEATURE_CLEAN_UP(free(mask);)
         }
 #else /* ENABLE_PLATFORM_MINGW32 */
         if (GetProcessAffinityMask(GetCurrentProcess(), &process_affinity,