Some changelog updates.

[oweals/busybox.git] / dd.c

diff --git a/dd.c b/dd.c
index d50cf746b9eb630c7794645d8b14604d72d3d5e6..5d9993d8b1ef644a51ff6f95d0b444ee1859303f 100644 (file)
--- a/dd.c
+++ b/dd.c
@@ -2,13 +2,13 @@
 /*
  * Mini dd implementation for busybox
  *
- * Copyright (C) 1999 by Lineo, inc.
+ * Copyright (C) 1999, 2000 by Lineo, inc.
  * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
- * based in part on code taken from sash. 
  *
- * Copyright (c) 1999 by David I. Bell
- * Permission is granted to use, distribute, or modify this source,
- * provided that this copyright notice remains intact.
+ * Based in part on code taken from sash. 
+ *   Copyright (c) 1999 by David I. Bell
+ *   Permission is granted to use, distribute, or modify this source,
+ *   provided that this copyright notice remains intact.
  *
  * Permission to distribute this code under the GPL has been granted.
  *
@@ -41,24 +41,26 @@ typedef unsigned long long int uintmax_t;
 #endif
 
 static const char dd_usage[] =
-       "dd [if=name] [of=name] [bs=n] [count=n] [skip=n] [seek=n]\n\n"
-       "Copy a file, converting and formatting according to options\n\n"
+       "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"
-
+       "\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";
+       "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)
 {
-       const char *inFile = NULL;
-       const char *outFile = NULL;
+       char *inFile = NULL;
+       char *outFile = NULL;
        char *cp;
        int inFd;
        int outFd;