2 files changed, 83 insertions, 25 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;
+}