Update to changelog -- mostly from Larry Doolittle.
[oweals/busybox.git] / dd.c
diff --git a/dd.c b/dd.c
index 303500008738d93306988f46c3f03ac81059e3d9..a0d2330ea6511d47f2c15f1bedc260299e93ed8b 100644 (file)
--- a/dd.c
+++ b/dd.c
@@ -2,15 +2,8 @@
 /*
  * Mini dd implementation for busybox
  *
- * 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.
- *
- * Permission to distribute this code under the GPL has been granted.
+ * Copyright (C) 2000 by Matt Kraai <kraai@alumni.carnegiemellon.edu>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  */
 
+#include "busybox.h"
 
-#include "internal.h"
-#include <features.h>
-#include <stdio.h>
+#include <sys/types.h>
 #include <fcntl.h>
-#include <errno.h>
-#if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)
-#include <inttypes.h>
-#else
-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"
-       "\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";
 
-
-
-extern int dd_main(int argc, char **argv)
+static struct suffix_mult dd_suffixes[] = {
+       { "c", 1 },
+       { "w", 2 },
+       { "b", 512 },
+       { "kD", 1000 },
+       { "k", 1024 },
+       { "MD", 1000000 },
+       { "M", 1048576 },
+       { "GD", 1000000000 },
+       { "G", 1073741824 },
+       { NULL, 0 }
+};
+
+int dd_main(int argc, char **argv)
 {
-       char *inFile = NULL;
-       char *outFile = NULL;
-       char *cp;
-       int inFd;
-       int outFd;
-       int inCc = 0;
-       int outCc;
-       long blockSize = 512;
-       uintmax_t skipBlocks = 0;
-       uintmax_t seekBlocks = 0;
-       uintmax_t count = (uintmax_t) - 1;
-       uintmax_t intotal;
-       uintmax_t outTotal;
-       unsigned char *buf;
-
-       argc--;
-       argv++;
-
-       /* Parse any options */
-       while (argc) {
-               if (inFile == NULL && (strncmp(*argv, "if", 2) == 0))
-                       inFile = ((strchr(*argv, '=')) + 1);
-               else if (outFile == NULL && (strncmp(*argv, "of", 2) == 0))
-                       outFile = ((strchr(*argv, '=')) + 1);
-               else if (strncmp("count", *argv, 5) == 0) {
-                       count = getNum((strchr(*argv, '=')) + 1);
-                       if (count <= 0) {
-                               fprintf(stderr, "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);
-                               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);
-                               goto usage;
+       int i, ifd, ofd, sync = FALSE, trunc = TRUE;
+       size_t in_full = 0, in_part = 0, out_full = 0, out_part = 0;
+       size_t bs = 512, count = -1;
+       ssize_t n;
+       off_t seek = 0, skip = 0;
+       FILE *statusfp;
+       char *infile = NULL, *outfile = NULL, *buf;
+
+       for (i = 1; i < argc; i++) {
+               if (strncmp("bs=", argv[i], 3) == 0)
+                       bs = parse_number(argv[i]+3, dd_suffixes);
+               else if (strncmp("count=", argv[i], 6) == 0)
+                       count = parse_number(argv[i]+6, dd_suffixes);
+               else if (strncmp("seek=", argv[i], 5) == 0)
+                       seek = parse_number(argv[i]+5, dd_suffixes);
+               else if (strncmp("skip=", argv[i], 5) == 0)
+                       skip = parse_number(argv[i]+5, dd_suffixes);
+               else if (strncmp("if=", argv[i], 3) == 0)
+                       infile = argv[i]+3;
+               else if (strncmp("of=", argv[i], 3) == 0)
+                       outfile = argv[i]+3;
+               else if (strncmp("conv=", argv[i], 5) == 0) {
+                       buf = argv[i]+5;
+                       while (1) {
+                               if (strncmp("notrunc", buf, 7) == 0) {
+                                       trunc = FALSE;
+                                       buf += 7;
+                               } else if (strncmp("sync", buf, 4) == 0) {
+                                       sync = TRUE;
+                                       buf += 4;
+                               } else {
+                                       error_msg_and_die("invalid conversion `%s'\n", argv[i]+5);
+                               }
+                               if (buf[0] == '\0')
+                                       break;
+                               if (buf[0] == ',')
+                                       buf++;
                        }
-
-               } else if (strncmp(*argv, "seek", 4) == 0) {
-                       seekBlocks = getNum((strchr(*argv, '=')) + 1);
-                       if (seekBlocks <= 0) {
-                               fprintf(stderr, "Bad seek value %s\n", *argv);
-                               goto usage;
-                       }
-
-               } else {
-                       goto usage;
-               }
-               argc--;
-               argv++;
+               } else
+                       usage(dd_usage);
        }
 
-       buf = xmalloc(blockSize);
-
-       intotal = 0;
-       outTotal = 0;
-
-       if (inFile == NULL)
-               inFd = fileno(stdin);
-       else
-               inFd = open(inFile, 0);
+       buf = xmalloc(bs);
 
-       if (inFd < 0) {
-               /* Note that we are not freeing buf or closing
-                * files here to save a few bytes. This exits
-                * here anyways... */
-
-               /* free(buf); */
-               fatalError( inFile);
+       if (infile != NULL) {
+               if ((ifd = open(infile, O_RDONLY)) < 0)
+                       perror_msg_and_die("%s", infile);
+       } else {
+               ifd = STDIN_FILENO;
+               infile = "standard input";
        }
 
-       if (outFile == NULL)
-               outFd = fileno(stdout);
-       else
-               outFd = open(outFile, O_WRONLY | O_CREAT | O_TRUNC, 0666);
-
-       if (outFd < 0) {
-               /* Note that we are not freeing buf or closing
-                * files here to save a few bytes. This exits
-                * here anyways... */
+       if (outfile != NULL) {
+               if ((ofd = open(outfile, O_WRONLY | O_CREAT, 0666)) < 0)
+                       perror_msg_and_die("%s", outfile);
+               statusfp = stdout;
+       } else {
+               ofd = STDOUT_FILENO;
+               outfile = "standard output";
+               statusfp = stderr;
+       }
 
-               /* close(inFd);
-                  free(buf); */
-               fatalError( outFile);
+       if (skip) {
+               if (lseek(ifd, skip * bs, SEEK_CUR) < 0)
+                       perror_msg_and_die("%s", infile);
        }
 
-       lseek(inFd, skipBlocks * blockSize, SEEK_SET);
-       lseek(outFd, seekBlocks * blockSize, SEEK_SET);
-       //
-       //TODO: Convert to using fullRead & fullWrite
-       // from utility.c
-       //  -Erik
-       while (outTotal < count * blockSize) {
-               inCc = read(inFd, buf, blockSize);
-               if (inCc < 0) {
-                       perror(inFile);
-                       goto cleanup;
-               } else if (inCc == 0) {
-                       goto cleanup;
-               }
-               intotal += inCc;
-               cp = buf;
+       if (seek) {
+               if (lseek(ofd, seek * bs, SEEK_CUR) < 0)
+                       perror_msg_and_die("%s", outfile);
+       }
 
-               while (intotal > outTotal) {
-                       if (outTotal + inCc > count * blockSize)
-                               inCc = count * blockSize - outTotal;
-                       outCc = write(outFd, cp, inCc);
-                       if (outCc < 0) {
-                               perror(outFile);
-                               goto cleanup;
-                       } else if (outCc == 0) {
-                               goto cleanup;
-                       }
+       if (trunc) {
+               if (ftruncate(ofd, seek * bs) < 0)
+                       perror_msg_and_die("%s", outfile);
+       }
 
-                       inCc -= outCc;
-                       cp += outCc;
-                       outTotal += outCc;
+       while (in_full + in_part != count) {
+               n = safe_read(ifd, buf, bs);
+               if (n < 0)
+                       perror_msg_and_die("%s", infile);
+               if (n == 0)
+                       break;
+               if (n == bs)
+                       in_full++;
+               else
+                       in_part++;
+               if (sync) {
+                       memset(buf + n, '\0', bs - n);
+                       n = bs;
                }
+               n = full_write(ofd, buf, n);
+               if (n < 0)
+                       perror_msg_and_die("%s", outfile);
+               if (n == bs)
+                       out_full++;
+               else
+                       out_part++;
        }
 
-       if (inCc < 0)
-               perror(inFile);
-
-  cleanup:
-       /* Note that we are not freeing memory or closing
-        * files here, to save a few bytes. */
-#if 0
-       close(inFd);
-       close(outFd);
-       free(buf);
-#endif
-
-       printf("%ld+%d records in\n", (long) (intotal / blockSize),
-                  (intotal % blockSize) != 0);
-       printf("%ld+%d records out\n", (long) (outTotal / blockSize),
-                  (outTotal % blockSize) != 0);
-       exit(TRUE);
-  usage:
+       fprintf(statusfp, "%d+%d records in\n", in_full, in_part);
+       fprintf(statusfp, "%d+%d records out\n", out_full, out_part);
 
-       usage(dd_usage);
+       return EXIT_SUCCESS;
 }