Patch from Matt Kraai to enable proxy support.
[oweals/busybox.git] / dd.c
diff --git a/dd.c b/dd.c
index 07f092cc23c8d1e91053fefc5ba8bfc91352faee..626b54898404b2d478b8f782c772b023d4a29c02 100644 (file)
--- a/dd.c
+++ b/dd.c
+/* vi: set sw=4 ts=4: */
 /*
- * Copyright (c) 1999 by David I. Bell
- * Permission is granted to use, distribute, or modify this source,
- * provided that this copyright notice remains intact.
+ * Mini dd implementation for busybox
  *
- * The "dd" command, originally taken from sash.
+ * 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.
- * Majorly modified, and bugs fixed for busybox by Erik Andersen <andersee@debian.org> <andersen@lineo.com>
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
  */
 
-#include "internal.h"
-#ifdef BB_DD
-
-const char dd_usage[] = 
-"Copy a file, converting and formatting according to options\n\
-\n\
-usage: [if=name] [of=name] [bs=n] [count=n]\n\
-\tif=FILE\tread from FILE instead of stdin\n\
-\tof=FILE\twrite to FILE instead of stout\n\
-\tbs=n\tread and write N bytes at a time\n\
-\tcount=n\tcopy only n input blocks\n\
-\n\
-BYTES may be suffixed: by k for x1024, b for x512, and w for x2.\n";
-
 
+#include "busybox.h"
+#include <features.h>
 #include <stdio.h>
-#include <dirent.h>
-#include <errno.h>
 #include <fcntl.h>
-#include <signal.h>
-#include <time.h>
-
-
-#define        PAR_NONE        0
-#define        PAR_IF          1
-#define        PAR_OF          2
-#define        PAR_BS          3
-#define        PAR_COUNT       4
-
-
-typedef        struct
-{
-       const char *    name;
-       int             value;
-} PARAM;
-
-
-static const PARAM     params[] =
-{
-       {"if",          PAR_IF},
-       {"of",          PAR_OF},
-       {"bs",          PAR_BS},
-       {"count",       PAR_COUNT},
-       {NULL,          PAR_NONE}
-};
-
-
-static long    getNum(const char * cp);
+#include <errno.h>
+#if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)
+#include <inttypes.h>
+#else
+typedef unsigned long long int uintmax_t;
+#endif
 
-extern int
-dd_main (int argc, char **argv)
+extern int dd_main(int argc, char **argv)
 {
-       const char *    str;
-       const PARAM *   par;
-       const char *    inFile;
-       const char *    outFile;
-       char *          cp;
-       int             inFd;
-       int             outFd;
-       int             inCc=0;
-       int             outCc;
-       int             blockSize;
-       long            count;
-       long            intotal;
-       long            outTotal;
-       unsigned char*  buf;
-       unsigned char   localBuf[BUF_SIZE];
-
-       inFile = NULL;
-       outFile = NULL;
-       blockSize = 512;
-       count = 1;
-
-
-       while (--argc > 0)
-       {
-               str = *++argv;
-               cp = strchr(str, '=');
-
-               if (cp == NULL)
-               {
-                       fprintf(stderr, "Bad dd argument\n");
-                       goto usage;
-               }
-
-               *cp++ = '\0';
-
-               for (par = params; par->name; par++)
-               {
-                       if (strcmp(str, par->name) == 0)
-                               break;
-               }
-
-               switch (par->value)
-               {
-                       case PAR_IF:
-                               if (inFile)
-                               {
-                                       fprintf(stderr, "Multiple input files illegal\n");
-                                       goto usage;
-                               }
-       
-                               //fprintf(stderr, "if=%s\n", cp);
-                               inFile = cp;
-                               break;
-
-                       case PAR_OF:
-                               if (outFile)
-                               {
-                                       fprintf(stderr, "Multiple output files illegal\n");
-                                       goto usage;
-                               }
-
-                               //fprintf(stderr, "of=%s\n", cp);
-                               outFile = cp;
-                               break;
-
-                       case PAR_BS:
-                               blockSize = getNum(cp);
-                               //fprintf(stderr, "bs=%d\n", blockSize);
-
-                               if (blockSize <= 0)
-                               {
-                                       fprintf(stderr, "Bad block size value\n");
-                                       goto usage;
-                               }
-
-                               break;
-
-                       case PAR_COUNT:
-                               count = getNum(cp);
-                               //fprintf(stderr, "count=%ld\n", count);
-
-                               if (count < 0)
-                               {
-                                       fprintf(stderr, "Bad count value\n");
-                                       goto usage;
-                               }
-
-                               break;
-
-                       default:
+       char *inFile = NULL;
+       char *outFile = NULL;
+       int inFd;
+       int outFd;
+       int inCc = 0;
+       int outCc;
+       int trunc=TRUE;
+       int sync=FALSE;
+       long blockSize = 512,ibs;
+       uintmax_t skipBlocks = 0;
+       uintmax_t seekBlocks = 0;
+       uintmax_t count = (uintmax_t) - 1;
+       uintmax_t inTotal = 0;
+       uintmax_t outTotal = 0;
+       uintmax_t totalSize;
+
+       unsigned char buf[BUFSIZ];
+       char *keyword = NULL;
+
+       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 = atoi_w_units((strchr(*argv, '=')) + 1);
+                       if (count < 0) {
+                               error_msg("Bad count value %s\n", *argv);
                                goto usage;
-               }
-       }
-
-       buf = localBuf;
-
-       if (blockSize > sizeof(localBuf))
-       {
-               buf = malloc(blockSize);
+                       }
+               } else if (strncmp(*argv, "bs", 2) == 0) {
+                       blockSize = atoi_w_units((strchr(*argv, '=')) + 1);
+                       if (blockSize <= 0) {
+                               error_msg("Bad block size value %s\n", *argv);
+                               goto usage;
+                       }
+               } else if (strncmp(*argv, "skip", 4) == 0) {
+                       skipBlocks = atoi_w_units((strchr(*argv, '=')) + 1);
+                       if (skipBlocks <= 0) {
+                               error_msg("Bad skip value %s\n", *argv);
+                               goto usage;
+                       }
 
-               if (buf == NULL)
-               {
-                       fprintf(stderr, "Cannot allocate buffer\n");
-                       return 1;
+               } else if (strncmp(*argv, "seek", 4) == 0) {
+                       seekBlocks = atoi_w_units((strchr(*argv, '=')) + 1);
+                       if (seekBlocks <= 0) {
+                               error_msg("Bad seek value %s\n", *argv);
+                               goto usage;
+                       }
+               } else if (strncmp(*argv, "conv", 4) == 0) {
+                       keyword = (strchr(*argv, '=') + 1);
+                       if (strcmp(keyword, "notrunc") == 0) 
+                               trunc=FALSE;
+                       if (strcmp(keyword, "sync") == 0) 
+                               sync=TRUE;
+               } else {
+                       goto usage;
                }
+               argc--;
+               argv++;
        }
 
-       intotal = 0;
-       outTotal = 0;
-
        if (inFile == NULL)
-           inFd = STDIN;
+               inFd = fileno(stdin);
        else
-           inFd = open(inFile, 0);
-
-       if (inFd < 0)
-       {
-               perror(inFile);
+               inFd = open(inFile, 0);
 
-               if (buf != localBuf)
-                       free(buf);
+       if (inFd < 0) {
+               /* Note that we are not freeing buf or closing
+                * files here to save a few bytes. This exits
+                * here anyways... */
 
-               return 1;
+               /* free(buf); */
+               perror_msg_and_die("%s", inFile);
        }
 
        if (outFile == NULL)
-           outFd = STDOUT;
+               outFd = fileno(stdout);
        else
-           outFd = creat(outFile, 0666);
+               outFd = open(outFile, O_WRONLY | O_CREAT, 0666);
 
-       if (outFd < 0)
-       {
-               perror(outFile);
-               close(inFd);
+       if (outFd < 0) {
+               /* Note that we are not freeing buf or closing
+                * files here to save a few bytes. This exits
+                * here anyways... */
 
-               if (buf != localBuf)
-                       free(buf);
-
-               return 1;
+               /* close(inFd);
+                  free(buf); */
+               perror_msg_and_die("%s", outFile);
        }
 
-       while ( outTotal < count*blockSize )
-       {
-               inCc = read(inFd, buf, blockSize);
-               if (inCc < 0) {
-                   perror(inFile);
-                   goto cleanup;
-               }
-               //fprintf(stderr, "read in =%d\n", inCc);
-               intotal += inCc;
-               cp = buf;
-
-
-               while ( intotal > outTotal )
-               {
-                       if (outTotal+inCc > count*blockSize)
-                           inCc=count*blockSize-outTotal;
-                       outCc = write(outFd, cp, inCc);
-                       if (outCc < 0)
-                       {
-                               perror(outFile);
-                               goto cleanup;
+       lseek(inFd, (off_t) (skipBlocks * blockSize), SEEK_SET);
+       lseek(outFd, (off_t) (seekBlocks * blockSize), SEEK_SET);
+       totalSize=count*blockSize;
+
+       ibs=blockSize;
+       if (ibs > BUFSIZ)
+               ibs=BUFSIZ;
+                       
+       while (totalSize > outTotal) {
+               inCc = full_read(inFd, buf, ibs);
+               inTotal += inCc;
+               if ( (sync==TRUE) && (inCc>0) )
+                       while (inCc<ibs)
+                               buf[inCc++]='\0';
+
+               if ((outCc = full_write(outFd, buf, inCc)) < 1){
+                       if (outCc < 0 ){
+                               perror("Error during write");
                        }
-                       //fprintf(stderr, "wrote out =%d\n", outCc);
-
-                       inCc -= outCc;
-                       cp += outCc;
-                       outTotal += outCc;
-                       //fprintf(stderr, "outTotal=%ld\n", outTotal);
+                       break;
                }
+               outTotal += outCc;
+        }
+       if (trunc == TRUE) {
+               ftruncate(outFd, lseek(outFd, 0, SEEK_CUR));
        }
-
-       if (inCc < 0)
-               perror(inFile);
-
-cleanup:
+       /* Note that we are not freeing memory or closing
+        * files here, to save a few bytes. */
+#ifdef BB_FEATURE_CLEAN_UP
        close(inFd);
+       close(outFd);
+#endif
 
-       if (close(outFd) < 0)
-               perror(outFile);
-
-       if (buf != localBuf)
-               free(buf);
-
-       printf("%ld+%d records in\n", intotal / blockSize,
-               (intotal % blockSize) != 0);
-
-       printf("%ld+%d records out\n", outTotal / blockSize,
-               (outTotal % blockSize) != 0);
-       return 0;
-usage:
-       
-       fprintf(stderr, "%s", dd_usage);
-       return 1;
-}
-
-
-/*
- * Read a number with a possible multiplier.
- * Returns -1 if the number format is illegal.
- */
-static long
-getNum(const char * cp)
-{
-       long    value;
-
-       if (!isDecimal(*cp))
-               return -1;
-
-       value = 0;
-
-       while (isDecimal(*cp))
-               value = value * 10 + *cp++ - '0';
-
-       switch (*cp++)
-       {
-               case 'k':
-                       value *= 1024;
-                       break;
-
-               case 'b':
-                       value *= 512;
-                       break;
-
-               case 'w':
-                       value *= 2;
-                       break;
-
-               case '\0':
-                       return value;
-
-               default:
-                       return -1;
-       }
-
-       if (*cp)
-               return -1;
+       printf("%ld+%d records in\n", (long) (inTotal / blockSize),
+                  (inTotal % blockSize) != 0);
+       printf("%ld+%d records out\n", (long) (outTotal / blockSize),
+                  (outTotal % blockSize) != 0);
+       return EXIT_SUCCESS;
+  usage:
 
-       return value;
+       usage(dd_usage);
 }
-
-#endif
-/* END CODE */
-