Merge branch 'busybox'

7 files changed, 93 insertions, 34 deletions

diff --git a/coreutils/Config.src b/coreutils/Config.src
index 7a8a3a634..1bded03a6 100644
--- a/coreutils/Config.src
+++ b/coreutils/Config.src
@@ -1,6 +1,6 @@
 #
 # For a description of the syntax of this configuration file,
-# see scripts/kbuild/config-language.txt.
+# see docs/Kconfig-language.txt.
 #
 
 menu "Coreutils"
diff --git a/coreutils/cp.c b/coreutils/cp.c
index 455bffbba..ae60623d3 100644
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -24,6 +24,11 @@
 //config:       help
 //config:       Enable long options.
 //config:       Also add support for --parents option.
+//config:
+//config:config FEATURE_CP_REFLINK
+//config:       bool "Enable --reflink[=auto]"
+//config:       default y
+//config:       depends on FEATURE_CP_LONG_OPTIONS
 
 //applet:IF_CP(APPLET_NOEXEC(cp, cp, BB_DIR_BIN, BB_SUID_DROP, cp))
 /* NOEXEC despite cases when it can be a "runner" (cp -r LARGE_DIR NEW_DIR) */
@@ -72,10 +77,14 @@ int cp_main(int argc, char **argv)
 #if ENABLE_FEATURE_CP_LONG_OPTIONS
                 /*OPT_rmdest  = FILEUTILS_RMDEST = 1 << FILEUTILS_CP_OPTNUM */
                 OPT_parents = 1 << (FILEUTILS_CP_OPTNUM+1),
+                OPT_reflink = 1 << (FILEUTILS_CP_OPTNUM+2),
 #endif
         };
 
 #if ENABLE_FEATURE_CP_LONG_OPTIONS
+# if ENABLE_FEATURE_CP_REFLINK
+        char *reflink = NULL;
+# endif
         flags = getopt32long(argv, "^"
                 FILEUTILS_CP_OPTSTR
                 "\0"
@@ -99,7 +108,22 @@ int cp_main(int argc, char **argv)
                 "update\0"         No_argument "u"
                 "remove-destination\0" No_argument "\xff"
                 "parents\0"        No_argument "\xfe"
+# if ENABLE_FEATURE_CP_REFLINK
+                "reflink\0"        Optional_argument "\xfd"
+                , &reflink
+# endif
         );
+# if ENABLE_FEATURE_CP_REFLINK
+        BUILD_BUG_ON(OPT_reflink != FILEUTILS_REFLINK);
+        if (flags & FILEUTILS_REFLINK) {
+                if (!reflink)
+                        flags |= FILEUTILS_REFLINK_ALWAYS;
+                else if (strcmp(reflink, "always") == 0)
+                        flags |= FILEUTILS_REFLINK_ALWAYS;
+                else if (strcmp(reflink, "auto") != 0)
+                        bb_show_usage();
+        }
+# endif
 #else
         flags = getopt32(argv, "^"
                 FILEUTILS_CP_OPTSTR
diff --git a/coreutils/install.c b/coreutils/install.c
index 2e4dc257f..8270490bd 100644
--- a/coreutils/install.c
+++ b/coreutils/install.c
@@ -214,7 +214,11 @@ int install_main(int argc, char **argv)
                         dest = last;
                         if (opts & OPT_MKDIR_LEADING) {
                                 char *ddir = xstrdup(dest);
-                                bb_make_directory(dirname(ddir), 0755, mkdir_flags);
+                                /*
+                                 * -D -t DIR1/DIR2/F3 FILE: create DIR1/DIR2/F3, copy FILE there
+                                 * -D FILE DIR1/DIR2/F3: create DIR1/DIR2, copy FILE there as F3
+                                 */
+                                bb_make_directory((opts & OPT_TARGET) ? ddir : dirname(ddir), 0755, mkdir_flags);
                                 /* errors are not checked. copy_file
                                  * will fail if dir is not created.
                                  */
diff --git a/coreutils/nproc.c b/coreutils/nproc.c
index 336b176ca..0ea8d1001 100644
--- a/coreutils/nproc.c
+++ b/coreutils/nproc.c
@@ -14,10 +14,14 @@
 //kbuild:lib-$(CONFIG_NPROC) += nproc.o
 
 //usage:#define nproc_trivial_usage
-//usage:        ""
-//TODO: "[--all] [--ignore=N]"
+//usage:        ""IF_LONG_OPTS("--all --ignore=N")
 //usage:#define nproc_full_usage "\n\n"
-//usage:        "Print number of CPUs"
+//usage:        "Print number of available CPUs"
+//usage:        IF_LONG_OPTS(
+//usage:     "\n"
+//usage:     "\n        --all           Number of installed CPUs"
+//usage:     "\n        --ignore=N      Exclude N CPUs"
+//usage:        )
 
 #include <sched.h>
 #include "libbb.h"
@@ -26,13 +30,30 @@ int nproc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int nproc_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
         unsigned long mask[1024];
-        unsigned i, count = 0;
-
-        //getopt32(argv, "");
-
-        //if --all, count /sys/devices/system/cpu/cpuN dirs, else:
+        int count = 0;
+#if ENABLE_LONG_OPTS
+        int ignore = 0;
+        int opts = getopt32long(argv, "\xfe:+",
+                        "ignore\0" Required_argument "\xfe"
+                        "all\0"    No_argument       "\xff"
+                        , &ignore
+        );
 
+        if (opts & (1 << 1)) {
+                DIR *cpusd = opendir("/sys/devices/system/cpu");
+                if (cpusd) {
+                        struct dirent *de;
+                        while (NULL != (de = readdir(cpusd))) {
+                                char *cpuid = strstr(de->d_name, "cpu");
+                                if (cpuid && isdigit(cpuid[strlen(cpuid) - 1]))
+                                        count++;
+                        }
+                        closedir(cpusd);
+                }
+        } 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) {
@@ -42,8 +63,11 @@ int nproc_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                         }
                 }
         }
-        if (count == 0)
-                count++;
+
+        IF_LONG_OPTS(count -= ignore;)
+        if (count <= 0)
+                count = 1;
+
         printf("%u\n", count);
 
         return 0;
diff --git a/coreutils/readlink.c b/coreutils/readlink.c
index b8e327d11..49361cea0 100644
--- a/coreutils/readlink.c
+++ b/coreutils/readlink.c
@@ -86,7 +86,7 @@ int readlink_main(int argc UNUSED_PARAM, char **argv)
 
         /* NOFORK: only one alloc is allowed; must free */
         if (opt & 1) { /* -f */
-                buf = xmalloc_realpath(fname);
+                buf = xmalloc_realpath_coreutils(fname);
         } else {
                 buf = xmalloc_readlink_or_warn(fname);
         }
diff --git a/coreutils/realpath.c b/coreutils/realpath.c
index aa878fcd2..43923681c 100644
--- a/coreutils/realpath.c
+++ b/coreutils/realpath.c
@@ -38,7 +38,7 @@ int realpath_main(int argc UNUSED_PARAM, char **argv)
 
         do {
                 /* NOFORK: only one alloc is allowed; must free */
-                char *resolved_path = xmalloc_realpath(*argv);
+                char *resolved_path = xmalloc_realpath_coreutils(*argv);
                 if (resolved_path != NULL) {
                         puts(resolved_path);
                         free(resolved_path);
diff --git a/coreutils/sort.c b/coreutils/sort.c
index 4d741e76d..05e5c9071 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -60,6 +60,7 @@
 //usage:        IF_FEATURE_SORT_BIG(
 //usage:     "\n        -g      General numerical sort"
 //usage:     "\n        -M      Sort month"
+//usage:     "\n        -V      Sort version"
 //usage:     "\n        -t CHAR Field separator"
 //usage:     "\n        -k N[,M] Sort by Nth field"
 //usage:        )
@@ -91,32 +92,33 @@
 
 /* These are sort types */
 enum {
-        FLAG_n  = 1,            /* Numeric sort */
-        FLAG_g  = 2,            /* Sort using strtod() */
-        FLAG_M  = 4,            /* Sort date */
+        FLAG_n  = 1 << 0,       /* Numeric sort */
+        FLAG_g  = 1 << 1,       /* Sort using strtod() */
+        FLAG_M  = 1 << 2,       /* Sort date */
+        FLAG_V  = 1 << 3,       /* Sort version */
 /* ucsz apply to root level only, not keys.  b at root level implies bb */
-        FLAG_u  = 8,            /* Unique */
-        FLAG_c  = 0x10,         /* Check: no output, exit(!ordered) */
-        FLAG_s  = 0x20,         /* Stable sort, no ascii fallback at end */
-        FLAG_z  = 0x40,         /* Input and output is NUL terminated, not \n */
+        FLAG_u  = 1 << 4,       /* Unique */
+        FLAG_c  = 1 << 5,       /* Check: no output, exit(!ordered) */
+        FLAG_s  = 1 << 6,       /* Stable sort, no ascii fallback at end */
+        FLAG_z  = 1 << 7,       /* Input and output is NUL terminated, not \n */
 /* These can be applied to search keys, the previous four can't */
-        FLAG_b  = 0x80,         /* Ignore leading blanks */
-        FLAG_r  = 0x100,        /* Reverse */
-        FLAG_d  = 0x200,        /* Ignore !(isalnum()|isspace()) */
-        FLAG_f  = 0x400,        /* Force uppercase */
-        FLAG_i  = 0x800,        /* Ignore !isprint() */
-        FLAG_m  = 0x1000,       /* ignored: merge already sorted files; do not sort */
-        FLAG_S  = 0x2000,       /* ignored: -S, --buffer-size=SIZE */
-        FLAG_T  = 0x4000,       /* ignored: -T, --temporary-directory=DIR */
-        FLAG_o  = 0x8000,
-        FLAG_k  = 0x10000,
-        FLAG_t  = 0x20000,
+        FLAG_b  = 1 << 8,       /* Ignore leading blanks */
+        FLAG_r  = 1 << 9,       /* Reverse */
+        FLAG_d  = 1 << 10,      /* Ignore !(isalnum()|isspace()) */
+        FLAG_f  = 1 << 11,      /* Force uppercase */
+        FLAG_i  = 1 << 12,      /* Ignore !isprint() */
+        FLAG_m  = 1 << 13,      /* ignored: merge already sorted files; do not sort */
+        FLAG_S  = 1 << 14,      /* ignored: -S, --buffer-size=SIZE */
+        FLAG_T  = 1 << 15,      /* ignored: -T, --temporary-directory=DIR */
+        FLAG_o  = 1 << 16,
+        FLAG_k  = 1 << 17,
+        FLAG_t  = 1 << 18,
         FLAG_bb = 0x80000000,   /* Ignore trailing blanks  */
         FLAG_no_tie_break = 0x40000000,
 };
 
 static const char sort_opt_str[] ALIGN1 = "^"
-                        "ngMucszbrdfimS:T:o:k:*t:"
+                        "ngMVucszbrdfimS:T:o:k:*t:"
                         "\0" "o--o:t--t"/*-t, -o: at most one of each*/;
 /*
  * OPT_STR must not be string literal, needs to have stable address:
@@ -273,10 +275,15 @@ static int compare_keys(const void *xarg, const void *yarg)
                 y = *(char **)yarg;
 #endif
                 /* Perform actual comparison */
-                switch (flags & (FLAG_n | FLAG_M | FLAG_g)) {
+                switch (flags & (FLAG_n | FLAG_g | FLAG_M | FLAG_V)) {
                 default:
                         bb_error_msg_and_die("unknown sort type");
                         break;
+#if defined(HAVE_STRVERSCMP) && HAVE_STRVERSCMP == 1
+                case FLAG_V:
+                        retval = strverscmp(x, y);
+                        break;
+#endif
                 /* Ascii sort */
                 case 0:
 #if ENABLE_LOCALE_SUPPORT