1 files changed, 19 insertions, 14 deletions

diff --git a/coreutils/shred.c b/coreutils/shred.c
index 0b11b9491..794d7b815 100644
--- a/coreutils/shred.c
+++ b/coreutils/shred.c
@@ -15,14 +15,15 @@
 //kbuild:lib-$(CONFIG_SHRED) += shred.o
 
 //usage:#define shred_trivial_usage
-//usage:       "FILE..."
+//usage:       "[-fuz] [-n N] [-s SIZE] FILE..."
 //usage:#define shred_full_usage "\n\n"
 //usage:       "Overwrite/delete FILEs\n"
 //usage:     "\n        -f      Chmod to ensure writability"
+//usage:     "\n        -s SIZE Size to write"
 //usage:     "\n        -n N    Overwrite N times (default 3)"
 //usage:     "\n        -z      Final overwrite with zeros"
 //usage:     "\n        -u      Remove file"
-//-x and -v are accepted but have no effect
+//-x (exact: don't round up to 4k) and -v (verbose) are accepted but have no effect
 
 /* shred (GNU coreutils) 8.25:
 -f, --force             change permissions to allow writing if necessary
@@ -41,6 +42,7 @@
 int shred_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int shred_main(int argc UNUSED_PARAM, char **argv)
 {
+        char *opt_s;
         int rand_fd = rand_fd; /* for compiler */
         int zero_fd;
         unsigned num_iter = 3;
@@ -52,18 +54,16 @@ int shred_main(int argc UNUSED_PARAM, char **argv)
                 OPT_n = (1 << 3),
                 OPT_v = (1 << 4),
                 OPT_x = (1 << 5),
+                OPT_s = (1 << 6),
         };
 
-        opt = getopt32(argv, "fuzn:+vx", &num_iter);
+        opt = getopt32(argv, "^" "fuzn:+vxs:" "\0" "-1"/*min 1 arg*/, &num_iter, &opt_s);
         argv += optind;
 
         zero_fd = MINGW_SPECIAL(xopen)("/dev/zero", O_RDONLY);
         if (num_iter != 0)
                 rand_fd = MINGW_SPECIAL(xopen)("/dev/urandom", O_RDONLY);
 
-        if (!*argv)
-                bb_show_usage();
-
         for (;;) {
                 struct stat sb;
                 const char *fname;
@@ -85,6 +85,11 @@ int shred_main(int argc UNUSED_PARAM, char **argv)
                 if (fstat(fd, &sb) == 0 && sb.st_size > 0) {
                         off_t size = sb.st_size;
 
+                        if (opt & OPT_s) {
+                                size = BB_STRTOOFF(opt_s, NULL, 0); /* accepts oct/hex */
+                                if (errno || size < 0) bb_show_usage();
+                        }
+
                         for (i = 0; i < num_iter; i++) {
                                 bb_copyfd_size(rand_fd, fd, size);
                                 fdatasync(fd);
@@ -94,18 +99,18 @@ int shred_main(int argc UNUSED_PARAM, char **argv)
                                 bb_copyfd_size(zero_fd, fd, size);
                                 fdatasync(fd);
                         }
-                        if (opt & OPT_u) {
-                                ftruncate(fd, 0);
+                }
+                if (opt & OPT_u) {
+                        ftruncate(fd, 0);
 #if ENABLE_PLATFORM_MINGW32
-                                xclose(fd);
+                        xclose(fd);
 #endif
-                                xunlink(fname);
-                        }
+                        xunlink(fname);
+                }
 #if ENABLE_PLATFORM_MINGW32
-                        else
+                else
 #endif
-                        xclose(fd);
-                }
+                xclose(fd);
         }
 
         return EXIT_SUCCESS;