X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=dd.c;h=5d9993d8b1ef644a51ff6f95d0b444ee1859303f;hb=680d65a646feaea3c3440ca81732c3c09ae95d15;hp=40288fd4ddf6aae575949b2585a94cc596e192b6;hpb=3cf52d19581b2077480e7d2e63010baa1f5399c1;p=oweals%2Fbusybox.git diff --git a/dd.c b/dd.c index 40288fd4d..5d9993d8b 100644 --- a/dd.c +++ b/dd.c @@ -1,216 +1,207 @@ +/* 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 , + * + * 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. - * Mostly rewritten and bugs fixed for busybox by Erik Andersen + * + * 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" +#include #include #include #include - -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\ -\tskip=n\tskip n input blocks\n\ -\n\ -BYTES may be suffixed: by k for x1024, b for x512, and w for x2.\n"; - - - - -/* - * Read a number with a possible multiplier. - * Returns -1 if the number format is illegal. - */ -static long getNum (const char *cp) +#if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1) +#include +#else +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) { - long value; - - if (!isDecimal (*cp)) - return -1; - - value = 0; + 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; - while (isDecimal (*cp)) - value = value * 10 + *cp++ - '0'; + argc--; + argv++; - switch (*cp++) { - case 'k': - value *= 1024; - break; + /* 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; + } + + } 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++; + } - case 'b': - value *= 512; - break; + buf = xmalloc(blockSize); - case 'w': - value *= 2; - break; + intotal = 0; + outTotal = 0; - case '\0': - return value; + if (inFile == NULL) + inFd = fileno(stdin); + else + inFd = open(inFile, 0); - default: - return -1; - } + if (inFd < 0) { + /* Note that we are not freeing buf or closing + * files here to save a few bytes. This exits + * here anyways... */ - if (*cp) - return -1; + /* free(buf); */ + fatalError( inFile); + } - return value; -} + 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... */ -extern int dd_main (int argc, char **argv) -{ - const char *inFile; - const char *outFile; - char *cp; - int inFd; - int outFd; - int inCc = 0; - int outCc; - int skipBlocks; - int blockSize; - long count; - long intotal; - long outTotal; - unsigned char *buf; - - inFile = NULL; - outFile = NULL; - blockSize = 512; - skipBlocks = 0; - count = 1; - - - argc--; - argv++; - - /* Parse any options */ - while (argc) { - if (inFile == NULL && (strncmp("if", *argv, 2) == 0)) - inFile=*argv; - else if (outFile == NULL && (strncmp("of", *argv, 2) == 0)) - outFile=*argv; - else if (strncmp("count", *argv, 5) == 0) { - count = getNum (*argv); - if (count <= 0) { - fprintf (stderr, "Bad count value %ld\n", count); - goto usage; - } + /* close(inFd); + free(buf); */ + fatalError( outFile); } - else if (strncmp("bs", *argv, 2) == 0) { - blockSize = getNum(*argv); - if (blockSize <= 0) { - fprintf (stderr, "Bad block size value %d\n", blockSize); - goto usage; - } - } - else if (strncmp("skip", *argv, 4) == 0) { - skipBlocks = atoi( *argv); - if (skipBlocks <= 0) { - fprintf (stderr, "Bad skip value %d\n", skipBlocks); - goto usage; - } + 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; + + 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; + } + + inCc -= outCc; + cp += outCc; + outTotal += outCc; + } } - else { - fprintf (stderr, "Got here. argv=%s\n", *argv); - goto usage; - argc--; - argv++; - } - } - if ( inFile == NULL || outFile == NULL) - goto usage; - - buf = malloc (blockSize); - if (buf == NULL) { - fprintf (stderr, "Cannot allocate buffer\n"); - return( FALSE); - } - - intotal = 0; - outTotal = 0; - - if (!inFile) - inFd = STDIN; - else - inFd = open (inFile, 0); - - if (inFd < 0) { - perror (inFile); - free (buf); - return( FALSE); - } - - if (!outFile) - outFd = STDOUT; - else - outFd = creat (outFile, 0666); - - if (outFd < 0) { - perror (outFile); - close (inFd); - free (buf); - return( FALSE); - } - - lseek(inFd, skipBlocks*blockSize, SEEK_SET); - while (outTotal < count * blockSize) { - inCc = read (inFd, buf, blockSize); - if (inCc < 0) { - perror (inFile); - goto cleanup; - } - 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; - } - - inCc -= outCc; - cp += outCc; - outTotal += outCc; - } - } - - if (inCc < 0) - perror (inFile); + if (inCc < 0) + perror(inFile); cleanup: - close (inFd); - close (outFd); - free (buf); - - printf ("%ld+%d records in\n", intotal / blockSize, - (intotal % blockSize) != 0); - printf ("%ld+%d records out\n", outTotal / blockSize, - (outTotal % blockSize) != 0); - exit( TRUE); + /* 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 (stderr, "%s", dd_usage); - exit( FALSE); + usage(dd_usage); } - -