chroot can now call the builtin shell

[oweals/busybox.git] / coreutils / dd.c

diff --git a/coreutils/dd.c b/coreutils/dd.c
index 5d9993d8b1ef644a51ff6f95d0b444ee1859303f..86899194c2b8537636d4fbde089c0333249063f6 100644 (file)
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -40,23 +40,6 @@
 typedef unsigned long long int uintmax_t;
 #endif
 
-static const char dd_usage[] =
-       "dd [if=FILE] [of=FILE] [bs=N] [count=N] [skip=N] [seek=N]\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-       "\nCopy a file, converting and formatting according to options\n\n"
-       "\tif=FILE\tread from FILE instead of stdin\n"
-       "\tof=FILE\twrite to FILE instead of stdout\n"
-       "\tbs=N\tread and write N bytes at a time\n"
-       "\tcount=N\tcopy only N input blocks\n"
-       "\tskip=N\tskip N input blocks\n"
-       "\tseek=N\tskip N output blocks\n"
-       "\n"
-       "Numbers may be suffixed by w (x2), k (x1024), b (x512), or M (x1024^2)\n"
-#endif
-       ;
-
-
-
 extern int dd_main(int argc, char **argv)
 {
        char *inFile = NULL;
@@ -86,26 +69,26 @@ extern int dd_main(int argc, char **argv)
                else if (strncmp("count", *argv, 5) == 0) {
                        count = getNum((strchr(*argv, '=')) + 1);
                        if (count <= 0) {
-                               fprintf(stderr, "Bad count value %s\n", *argv);
+                               errorMsg("Bad count value %s\n", *argv);
                                goto usage;
                        }
                } else if (strncmp(*argv, "bs", 2) == 0) {
                        blockSize = getNum((strchr(*argv, '=')) + 1);
                        if (blockSize <= 0) {
-                               fprintf(stderr, "Bad block size value %s\n", *argv);
+                               errorMsg("Bad block size value %s\n", *argv);
                                goto usage;
                        }
                } else if (strncmp(*argv, "skip", 4) == 0) {
                        skipBlocks = getNum((strchr(*argv, '=')) + 1);
                        if (skipBlocks <= 0) {
-                               fprintf(stderr, "Bad skip value %s\n", *argv);
+                               errorMsg("Bad skip value %s\n", *argv);
                                goto usage;
                        }
 
                } else if (strncmp(*argv, "seek", 4) == 0) {
                        seekBlocks = getNum((strchr(*argv, '=')) + 1);
                        if (seekBlocks <= 0) {
-                               fprintf(stderr, "Bad seek value %s\n", *argv);
+                               errorMsg("Bad seek value %s\n", *argv);
                                goto usage;
                        }