Merge branch 'busybox' into merge

9 files changed, 129 insertions, 44 deletions

diff --git a/coreutils/dd.c b/coreutils/dd.c
index a01722040..589547e77 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -99,25 +99,6 @@ enum {
         ofd = STDOUT_FILENO,
 };
 
-static const struct suffix_mult dd_suffixes[] = {
-        { "c", 1 },
-        { "w", 2 },
-        { "b", 512 },
-        { "kB", 1000 },
-        { "kD", 1000 },
-        { "k", 1024 },
-        { "K", 1024 },  /* compat with coreutils dd (it also accepts KB and KD, TODO?) */
-        { "MB", 1000000 },
-        { "MD", 1000000 },
-        { "M", 1024*1024 },
-        { "GB", 1000000000 },
-        { "GD", 1000000000 },
-        { "G", 1024*1024*1024 },
-        /* "D" suffix for decimal is not in coreutils manpage, looks like it's deprecated */
-        /* coreutils also understands TPEZY suffixes for tera- and so on, with B suffix for decimal */
-        { "", 0 }
-};
-
 struct globals {
         off_t out_full, out_part, in_full, in_part;
 #if ENABLE_FEATURE_DD_THIRD_STATUS_LINE
@@ -327,11 +308,11 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
 #if ENABLE_FEATURE_DD_IBS_OBS
                 if (what == OP_ibs) {
                         /* Must fit into positive ssize_t */
-                        ibs = xatoul_range_sfx(val, 1, ((size_t)-1L)/2, dd_suffixes);
+                        ibs = xatoul_range_sfx(val, 1, ((size_t)-1L)/2, cwbkMG_suffixes);
                         /*continue;*/
                 }
                 if (what == OP_obs) {
-                        obs = xatoul_range_sfx(val, 1, ((size_t)-1L)/2, dd_suffixes);
+                        obs = xatoul_range_sfx(val, 1, ((size_t)-1L)/2, cwbkMG_suffixes);
                         /*continue;*/
                 }
                 if (what == OP_conv) {
@@ -357,22 +338,22 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                 }
 #endif
                 if (what == OP_bs) {
-                        ibs = xatoul_range_sfx(val, 1, ((size_t)-1L)/2, dd_suffixes);
+                        ibs = xatoul_range_sfx(val, 1, ((size_t)-1L)/2, cwbkMG_suffixes);
                         obs = ibs;
                         /*continue;*/
                 }
                 /* These can be large: */
                 if (what == OP_count) {
                         G.flags |= FLAG_COUNT;
-                        count = XATOU_SFX(val, dd_suffixes);
+                        count = XATOU_SFX(val, cwbkMG_suffixes);
                         /*continue;*/
                 }
                 if (what == OP_seek) {
-                        seek = XATOU_SFX(val, dd_suffixes);
+                        seek = XATOU_SFX(val, cwbkMG_suffixes);
                         /*continue;*/
                 }
                 if (what == OP_skip) {
-                        skip = XATOU_SFX(val, dd_suffixes);
+                        skip = XATOU_SFX(val, cwbkMG_suffixes);
                         /*continue;*/
                 }
                 if (what == OP_if) {
diff --git a/coreutils/truncate.c b/coreutils/truncate.c
new file mode 100644
index 000000000..0e36daba3
--- /dev/null
+++ b/coreutils/truncate.c
@@ -0,0 +1,77 @@
+/*
+ * Mini truncate implementation for busybox
+ *
+ * Copyright (C) 2015 by Ari Sundholm <ari@tuxera.com>
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
+
+//config:config TRUNCATE
+//config:       bool "truncate"
+//config:       default y
+//config:       help
+//config:         truncate truncates files to a given size. If a file does
+//config:         not exist, it is created unless told otherwise.
+
+//kbuild:lib-$(CONFIG_TRUNCATE) += truncate.o
+//applet:IF_TRUNCATE(APPLET_NOFORK(truncate, truncate, BB_DIR_USR_BIN, BB_SUID_DROP, truncate))
+
+//usage:#define truncate_trivial_usage
+//usage:       "[-c] -s SIZE FILE..."
+//usage:#define truncate_full_usage "\n\n"
+//usage:        "Truncate FILEs to the given size\n"
+//usage:        "\n     -c      Do not create files"
+//usage:        "\n     -s SIZE Truncate to SIZE"
+//usage:
+//usage:#define truncate_example_usage
+//usage:        "$ truncate -s 1G foo"
+
+#include "libbb.h"
+
+#if ENABLE_LFS
+# define XATOU_SFX xatoull_sfx
+#else
+# define XATOU_SFX xatoul_sfx
+#endif
+
+/* This is a NOFORK applet. Be very careful! */
+
+int truncate_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int truncate_main(int argc UNUSED_PARAM, char **argv)
+{
+        unsigned opts;
+        int flags = O_RDWR;
+        int ret = EXIT_SUCCESS;
+        char *size_str;
+        off_t size;
+
+        enum {
+                OPT_NOCREATE  = (1 << 0),
+                OPT_SIZE = (1 << 1),
+        };
+
+        opt_complementary = "s:-1";
+        opts = getopt32(argv, "cs:", &size_str);
+
+        if (!(opts & OPT_NOCREATE))
+                flags |= O_CREAT;
+
+        // TODO: coreutils 8.17 also support "m" (lowercase) suffix
+        // with truncate, but not with dd!
+        // We share kMG_suffixes[], so we can't make both tools
+        // compatible at once...
+        size = XATOU_SFX(size_str, kMG_suffixes);
+
+        argv += optind;
+        while (*argv) {
+                int fd = xopen(*argv, flags);
+                if (ftruncate(fd, size) == -1) {
+                        bb_perror_msg("%s: ftruncate", *argv);
+                        ret = EXIT_FAILURE;
+                }
+                xclose(fd);
+                ++argv;
+        }
+
+        return ret;
+}
diff --git a/include/libbb.h b/include/libbb.h
index 1733e9a0f..28ac779c3 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -878,6 +878,8 @@ struct suffix_mult {
 };
 extern const struct suffix_mult bkm_suffixes[];
 #define km_suffixes (bkm_suffixes + 1)
+extern const struct suffix_mult cwbkMG_suffixes[];
+#define kMG_suffixes (cwbkMG_suffixes + 3)
 
 #include "xatonum.h"
 /* Specialized: */
diff --git a/libbb/xatonum.c b/libbb/xatonum.c
index 6f4e023bb..9dd5c3e7e 100644
--- a/libbb/xatonum.c
+++ b/libbb/xatonum.c
@@ -75,3 +75,24 @@ const struct suffix_mult bkm_suffixes[] = {
         { "m", 1024*1024 },
         { "", 0 }
 };
+
+const struct suffix_mult cwbkMG_suffixes[] = {
+        { "c", 1 },
+        { "w", 2 },
+        { "b", 512 },
+        { "kB", 1000 },
+        { "kD", 1000 },
+        { "k", 1024 },
+        { "KB", 1000 }, /* compat with coreutils dd */
+        { "KD", 1000 }, /* compat with coreutils dd */
+        { "K", 1024 },  /* compat with coreutils dd */
+        { "MB", 1000000 },
+        { "MD", 1000000 },
+        { "M", 1024*1024 },
+        { "GB", 1000000000 },
+        { "GD", 1000000000 },
+        { "G", 1024*1024*1024 },
+        /* "D" suffix for decimal is not in coreutils manpage, looks like it's deprecated */
+        /* coreutils also understands TPEZY suffixes for tera- and so on, with B suffix for decimal */
+        { "", 0 }
+};
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index daabeec0c..606fc049f 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -1239,6 +1239,7 @@ int ifupdown_main(int argc UNUSED_PARAM, char **argv)
                 char *pch;
                 bool okay = 0;
                 int cmds_ret;
+                bool curr_failure = 0;
 
                 iface = xstrdup(target_list->data);
                 target_list = target_list->link;
@@ -1304,11 +1305,11 @@ int ifupdown_main(int argc UNUSED_PARAM, char **argv)
                                 /* Call the cmds function pointer, does either iface_up() or iface_down() */
                                 cmds_ret = cmds(currif);
                                 if (cmds_ret == -1) {
-                                        bb_error_msg("don't seem to have all the variables for %s/%s",
+                                        bb_error_msg("don't have all variables for %s/%s",
                                                         liface, currif->address_family->name);
-                                        any_failures = 1;
+                                        any_failures = curr_failure = 1;
                                 } else if (cmds_ret == 0) {
-                                        any_failures = 1;
+                                        any_failures = curr_failure = 1;
                                 }
 
                                 currif->iface = oldiface;
@@ -1329,7 +1330,7 @@ int ifupdown_main(int argc UNUSED_PARAM, char **argv)
                         llist_t *state_list = read_iface_state();
                         llist_t *iface_state = find_iface_state(state_list, iface);
 
-                        if (cmds == iface_up && !any_failures) {
+                        if (cmds == iface_up && !curr_failure) {
                                 char *newiface = xasprintf("%s=%s", iface, liface);
                                 if (!iface_state) {
                                         llist_add_to_end(&state_list, newiface);
diff --git a/networking/zcip.c b/networking/zcip.c
index a3307c5c9..962ba2e60 100644
--- a/networking/zcip.c
+++ b/networking/zcip.c
@@ -521,7 +521,7 @@ int zcip_main(int argc UNUSED_PARAM, char **argv)
                         target_ip_conflict = 0;
 
                         if (memcmp(&p.arp.arp_sha, &eth_addr, ETH_ALEN) != 0) {
-                                if (memcmp(p.arp.arp_spa, &ip.s_addr, sizeof(struct in_addr))) {
+                                if (memcmp(p.arp.arp_spa, &ip.s_addr, sizeof(struct in_addr)) == 0) {
                                         /* A probe or reply with source_ip == chosen ip */
                                         source_ip_conflict = 1;
                                 }
diff --git a/scripts/trylink b/scripts/trylink
index 5da494fbb..48c487bcd 100755
--- a/scripts/trylink
+++ b/scripts/trylink
@@ -46,19 +46,19 @@ try() {
 }
 
 check_cc() {
-    local tempname="/tmp/temp.$$.$RANDOM"
+    local tempname="$(mktemp)"
     # Can use "-o /dev/null", but older gcc tend to *unlink it* on failure! :(
     # "-xc": C language. "/dev/null" is an empty source file.
-    if $CC $1 -shared -xc /dev/null -o "$tempname".o >/dev/null 2>&1; then
+    if $CC $CPPFLAGS $CFLAGS $1 -shared -xc /dev/null -o "$tempname".o >/dev/null 2>&1; then
         echo "$1";
     else
         echo "$2";
     fi
-    rm "$tempname".o 2>/dev/null
+    rm -f "$tempname" "$tempname".o
 }
 
 check_libc_is_glibc() {
-    local tempname="/tmp/temp.$$.$RANDOM"
+    local tempname="$(mktemp)"
     echo "\
         #include <stdlib.h>
         /* Apparently uclibc defines __GLIBC__ (compat trick?). Oh well. */
@@ -66,12 +66,12 @@ check_libc_is_glibc() {
         syntax error here
         #endif
         " >"$tempname".c
-    if $CC "$tempname".c -c -o "$tempname".o >/dev/null 2>&1; then
+    if $CC $CPPFLAGS $CFLAGS "$tempname".c -c -o "$tempname".o >/dev/null 2>&1; then
         echo "$2";
     else
         echo "$1";
     fi
-    rm "$tempname".c "$tempname".o 2>/dev/null
+    rm -f "$tempname" "$tempname".[co]
 }
 
 EXE="$1"
diff --git a/shell/ash.c b/shell/ash.c
index df7083370..8cc3f0872 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -6108,7 +6108,6 @@ exptilde(char *startp, char *p, int flags)
         struct passwd *pw;
         const char *home;
         int quotes = flags & (EXP_FULL | EXP_CASE | EXP_REDIR);
-        int startloc;
 
         name = p + 1;
 
@@ -6140,9 +6139,7 @@ exptilde(char *startp, char *p, int flags)
         if (!home || !*home)
                 goto lose;
         *p = c;
-        startloc = expdest - (char *)stackblock();
         strtodest(home, SQSYNTAX, quotes);
-        recordregion(startloc, expdest - (char *)stackblock(), 0);
         return p;
  lose:
         *p = c;
diff --git a/sysklogd/logread.c b/sysklogd/logread.c
index bea73d932..da4a4d4df 100644
--- a/sysklogd/logread.c
+++ b/sysklogd/logread.c
@@ -10,10 +10,11 @@
  */
 
 //usage:#define logread_trivial_usage
-//usage:       "[-f]"
+//usage:       "[-fF]"
 //usage:#define logread_full_usage "\n\n"
 //usage:       "Show messages in syslogd's circular buffer\n"
 //usage:     "\n        -f      Output data as log grows"
+//usage:     "\n        -F      Same as -f, but dump buffer first"
 
 #include "libbb.h"
 #include <sys/ipc.h>
@@ -83,7 +84,7 @@ int logread_main(int argc UNUSED_PARAM, char **argv)
         unsigned cur;
         int log_semid; /* ipc semaphore id */
         int log_shmid; /* ipc shared memory id */
-        smallint follow = getopt32(argv, "f");
+        int follow = getopt32(argv, "fF");
 
         INIT_G();
 
@@ -106,7 +107,7 @@ int logread_main(int argc UNUSED_PARAM, char **argv)
         /* Max possible value for tail is shbuf->size - 1 */
         cur = shbuf->tail;
 
-        /* Loop for logread -f, one pass if there was no -f */
+        /* Loop for -f or -F, one pass otherwise */
         do {
                 unsigned shbuf_size;
                 unsigned shbuf_tail;
@@ -129,7 +130,12 @@ int logread_main(int argc UNUSED_PARAM, char **argv)
                         printf("cur:%u tail:%u size:%u\n",
                                         cur, shbuf_tail, shbuf_size);
 
-                if (!follow) {
+                if (!(follow & 1)) { /* not -f */
+                        /* if -F, "convert" it to -f, so that we dont
+                         * dump the entire buffer on each iteration
+                         */
+                        follow >>= 1;
+
                         /* advance to oldest complete message */
                         /* find NUL */
                         cur += strlen(shbuf_data + cur);
@@ -142,7 +148,7 @@ int logread_main(int argc UNUSED_PARAM, char **argv)
                         cur++;
                         if (cur >= shbuf_size) /* last byte in buffer? */
                                 cur = 0;
-                } else { /* logread -f */
+                } else { /* -f */
                         if (cur == shbuf_tail) {
                                 sem_up(log_semid);
                                 fflush_all();