Merge branch 'busybox' into merge

5 files changed, 86 insertions, 3 deletions

diff --git a/libbb/copy_file.c b/libbb/copy_file.c
index 7cd9cd978..299cd7bea 100644
--- a/libbb/copy_file.c
+++ b/libbb/copy_file.c
@@ -391,14 +391,15 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
                 char *lpath = xmalloc_readlink_or_warn(source);
                 if (lpath) {
                         int r = symlink(lpath, dest);
-                        free(lpath);
                         if (r < 0) {
                                 /* shared message */
                                 bb_perror_msg("can't create %slink '%s' to '%s'",
                                         "sym", dest, lpath
                                 );
+                                free(lpath);
                                 return -1;
                         }
+                        free(lpath);
                         if (flags & FILEUTILS_PRESERVE_STATUS)
                                 if (lchown(dest, source_stat.st_uid, source_stat.st_gid) < 0)
                                         bb_perror_msg("can't preserve %s of '%s'", "ownership", dest);
diff --git a/libbb/duration.c b/libbb/duration.c
new file mode 100644
index 000000000..5acd0dba3
--- /dev/null
+++ b/libbb/duration.c
@@ -0,0 +1,78 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) 2018 Denys Vlasenko
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+//config:config FLOAT_DURATION
+//config:       bool "Enable fractional duration arguments"
+//config:       default y
+//config:       help
+//config:       Allow sleep N.NNN, top -d N.NNN etc.
+
+//kbuild:lib-$(CONFIG_SLEEP)   += duration.o
+//kbuild:lib-$(CONFIG_TOP)     += duration.o
+//kbuild:lib-$(CONFIG_TIMEOUT) += duration.o
+//kbuild:lib-$(CONFIG_PING)    += duration.o
+//kbuild:lib-$(CONFIG_PING6)   += duration.o
+
+#include "libbb.h"
+
+static const struct suffix_mult duration_suffixes[] = {
+        { "s", 1 },
+        { "m", 60 },
+        { "h", 60*60 },
+        { "d", 24*60*60 },
+        { "", 0 }
+};
+
+#if ENABLE_FLOAT_DURATION
+duration_t FAST_FUNC parse_duration_str(char *str)
+{
+        duration_t duration;
+
+        if (strchr(str, '.')) {
+                double d;
+                char *pp;
+                int len = strspn(str, "0123456789.");
+                char sv = str[len];
+                str[len] = '\0';
+                errno = 0;
+                d = strtod(str, &pp);
+                if (errno || *pp)
+                        bb_show_usage();
+                str += len;
+                *str-- = sv;
+                sv = *str;
+                *str = '1';
+                duration = d * xatoul_sfx(str, duration_suffixes);
+                *str = sv;
+        } else {
+                duration = xatoul_sfx(str, duration_suffixes);
+        }
+
+        return duration;
+}
+void FAST_FUNC sleep_for_duration(duration_t duration)
+{
+        struct timespec ts;
+
+        ts.tv_sec = MAXINT(typeof(ts.tv_sec));
+        ts.tv_nsec = 0;
+        if (duration >= 0 && duration < ts.tv_sec) {
+                ts.tv_sec = duration;
+                ts.tv_nsec = (duration - ts.tv_sec) * 1000000000;
+        }
+        do {
+                errno = 0;
+                nanosleep(&ts, &ts);
+        } while (errno == EINTR);
+}
+#else
+duration_t FAST_FUNC parse_duration_str(char *str)
+{
+        return xatou_range_sfx(str, 0, UINT_MAX, duration_suffixes);
+}
+#endif
diff --git a/libbb/get_line_from_file.c b/libbb/get_line_from_file.c
index 09ccfba67..929bab78a 100644
--- a/libbb/get_line_from_file.c
+++ b/libbb/get_line_from_file.c
@@ -47,7 +47,9 @@ char* FAST_FUNC bb_get_chunk_from_file(FILE *file, size_t *end)
 /* Get line, including trailing \n if any */
 char* FAST_FUNC xmalloc_fgets(FILE *file)
 {
-        return bb_get_chunk_from_file(file, NULL);
+        size_t i;
+
+        return bb_get_chunk_from_file(file, &i);
 }
 /* Get line.  Remove trailing \n */
 char* FAST_FUNC xmalloc_fgetline(FILE *file)
diff --git a/libbb/remove_file.c b/libbb/remove_file.c
index 86c9a5c56..cea5d47e6 100644
--- a/libbb/remove_file.c
+++ b/libbb/remove_file.c
@@ -73,7 +73,7 @@ int FAST_FUNC remove_file(const char *path, int flags)
                                 return status;
                 }
 
-                if (rmdir(path) < 0) {
+                if (status == 0 && rmdir(path) < 0) {
                         bb_perror_msg("can't remove '%s'", path);
                         return -1;
                 }
diff --git a/libbb/unicode.c b/libbb/unicode.c
index 9c4da50d3..d378175a4 100644
--- a/libbb/unicode.c
+++ b/libbb/unicode.c
@@ -1121,6 +1121,8 @@ static char* FAST_FUNC unicode_conv_to_printable2(uni_stat_t *stats, const char
                         dst[dst_len++] = ' ';
                 }
         }
+        if (!dst) /* for example, if input was "" */
+                dst = xzalloc(1);
         dst[dst_len] = '\0';
         if (stats) {
                 stats->byte_count = dst_len;