Merge branch 'busybox'

9 files changed, 72 insertions, 10 deletions

diff --git a/libbb/Config.src b/libbb/Config.src
index 16e16480b..312aa1831 100644
--- a/libbb/Config.src
+++ b/libbb/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.
 #
 
 comment "Library Tuning"
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index f250264d9..7df75c665 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -177,8 +177,11 @@ void FAST_FUNC bb_show_usage(void)
                 else {
                         full_write2_str("\nUsage: ");
                         full_write2_str(applet_name);
-                        full_write2_str(" ");
-                        full_write2_str(p);
+                        if (p[0]) {
+                                if (p[0] != '\n')
+                                        full_write2_str(" ");
+                                full_write2_str(p);
+                        }
                         full_write2_str("\n");
                 }
                 if (ENABLE_FEATURE_CLEAN_UP)
@@ -747,7 +750,7 @@ static void install_links(const char *busybox, int use_symbolic_links,
          * busybox.h::bb_install_loc_t, or else... */
         int (*lf)(const char *, const char *);
         char *fpc;
-        const char *appname = applet_names;
+        const char *appname = applet_names;
         unsigned i;
         int rc;
 
diff --git a/libbb/copy_file.c b/libbb/copy_file.c
index c60765d95..7cd9cd978 100644
--- a/libbb/copy_file.c
+++ b/libbb/copy_file.c
@@ -343,8 +343,27 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
                         }
                 }
 #endif
+#if ENABLE_FEATURE_CP_REFLINK
+# undef BTRFS_IOCTL_MAGIC
+# define BTRFS_IOCTL_MAGIC 0x94
+# undef BTRFS_IOC_CLONE
+# define BTRFS_IOC_CLONE _IOW (BTRFS_IOCTL_MAGIC, 9, int)
+                if (flags & FILEUTILS_REFLINK) {
+                        retval = ioctl(dst_fd, BTRFS_IOC_CLONE, src_fd);
+                        if (retval == 0)
+                                goto do_close;
+                        /* reflink did not work */
+                        if (flags & FILEUTILS_REFLINK_ALWAYS) {
+                                bb_perror_msg("failed to clone '%s' from '%s'", dest, source);
+                                goto do_close;
+                        }
+                        /* fall through to standard copy */
+                        retval = 0;
+                }
+#endif
                 if (bb_copyfd_eof(src_fd, dst_fd) == -1)
                         retval = -1;
+ IF_FEATURE_CP_REFLINK(do_close:)
                 /* Careful with writing... */
                 if (close(dst_fd) < 0) {
                         bb_perror_msg("error writing to '%s'", dest);
diff --git a/libbb/dump.c b/libbb/dump.c
index 5941ef902..b4b49d709 100644
--- a/libbb/dump.c
+++ b/libbb/dump.c
@@ -387,7 +387,10 @@ static unsigned char *get(priv_dumper_t *dumper)
                         if (need == blocksize) {
                                 return NULL;
                         }
-                        if (dumper->pub.dump_vflag != ALL && !memcmp(dumper->get__curp, dumper->get__savp, nread)) {
+                        if (dumper->pub.dump_vflag != ALL   /* not "show all"? */
+                         && dumper->pub.dump_vflag != FIRST /* not first line? */
+                         && memcmp(dumper->get__curp, dumper->get__savp, nread) == 0 /* same data? */
+                        ) {
                                 if (dumper->pub.dump_vflag != DUP) {
                                         puts("*");
                                 }
@@ -399,7 +402,7 @@ static unsigned char *get(priv_dumper_t *dumper)
                 }
                 n = fread(dumper->get__curp + nread, sizeof(unsigned char),
                                 dumper->pub.dump_length == -1 ? need : MIN(dumper->pub.dump_length, need), stdin);
-                if (!n) {
+                if (n == 0) {
                         if (ferror(stdin)) {
                                 bb_simple_perror_msg(dumper->argv[-1]);
                         }
@@ -411,9 +414,10 @@ static unsigned char *get(priv_dumper_t *dumper)
                         dumper->pub.dump_length -= n;
                 }
                 need -= n;
-                if (!need) {
-                        if (dumper->pub.dump_vflag == ALL || dumper->pub.dump_vflag == FIRST
-                         || memcmp(dumper->get__curp, dumper->get__savp, blocksize)
+                if (need == 0) {
+                        if (dumper->pub.dump_vflag == ALL   /* "show all"? */
+                         || dumper->pub.dump_vflag == FIRST /* first line? */
+                         || memcmp(dumper->get__curp, dumper->get__savp, blocksize) != 0 /* not same data? */
                         ) {
                                 if (dumper->pub.dump_vflag == DUP || dumper->pub.dump_vflag == FIRST) {
                                         dumper->pub.dump_vflag = WAIT;
diff --git a/libbb/loop.c b/libbb/loop.c
index f0d4296ae..c78535a20 100644
--- a/libbb/loop.c
+++ b/libbb/loop.c
@@ -106,6 +106,10 @@ int FAST_FUNC set_loop(char **device, const char *file, unsigned long long offse
                 return -errno;
         }
 
+//TODO: use LOOP_CTL_GET_FREE instead of trying every loopN in sequence? a-la:
+// fd = open("/dev/loop-control", O_RDWR);
+// loopN = ioctl(fd, LOOP_CTL_GET_FREE);
+//
         /* Find a loop device.  */
         try = *device ? *device : dev;
         /* 1048575 (0xfffff) is a max possible minor number in Linux circa 2010 */
diff --git a/libbb/nuke_str.c b/libbb/nuke_str.c
index 240e68004..b5385e956 100644
--- a/libbb/nuke_str.c
+++ b/libbb/nuke_str.c
@@ -12,7 +12,7 @@
 
 void FAST_FUNC nuke_str(char *str)
 {
-        if (str) {
+        if (str) {
                 while (*str)
                         *str++ = 0;
                 /* or: memset(str, 0, strlen(str)); - not as small as above */
diff --git a/libbb/pw_encrypt.c b/libbb/pw_encrypt.c
index 1edf4b6f0..86455cd0d 100644
--- a/libbb/pw_encrypt.c
+++ b/libbb/pw_encrypt.c
@@ -6,6 +6,7 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+#include <crypt.h>
 #include "libbb.h"
 
 /* static const uint8_t ascii64[] ALIGN1 =
diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c
index 21263ccfe..a0db2b86e 100644
--- a/libbb/xfuncs_printf.c
+++ b/libbb/xfuncs_printf.c
@@ -222,6 +222,7 @@ void FAST_FUNC xdup2(int from, int to)
 {
         if (dup2(from, to) != to)
                 bb_perror_msg_and_die("can't duplicate file descriptor");
+                //              " %d to %d", from, to);
 }
 
 // "Renumber" opened fd
diff --git a/libbb/xreadlink.c b/libbb/xreadlink.c
index b3118b433..9ae70de99 100644
--- a/libbb/xreadlink.c
+++ b/libbb/xreadlink.c
@@ -122,3 +122,33 @@ char* FAST_FUNC xmalloc_realpath(const char *path)
         return xstrdup(realpath(path, buf));
 #endif
 }
+
+char* FAST_FUNC xmalloc_realpath_coreutils(const char *path)
+{
+        char *buf;
+
+        errno = 0;
+        buf = xmalloc_realpath(path);
+        /*
+         * There is one case when "readlink -f" and
+         * "realpath" from coreutils succeed,
+         * even though file does not exist, such as:
+         *     /tmp/file_does_not_exist
+         * (the directory must exist).
+         */
+        if (!buf && errno == ENOENT) {
+                char *last_slash = strrchr(path, '/');
+                if (last_slash) {
+                        *last_slash++ = '\0';
+                        buf = xmalloc_realpath(path);
+                        if (buf) {
+                                unsigned len = strlen(buf);
+                                buf = xrealloc(buf, len + strlen(last_slash) + 2);
+                                buf[len++] = '/';
+                                strcpy(buf + len, last_slash);
+                        }
+                }
+        }
+
+        return buf;
+}