X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fdd.c;h=0d5b3e8ab9867bc7918208da17b763275e4b72de;hb=13456d1fcd0122d8464c3c3e1c356d86a56e6c08;hp=800ed59f8ac31a766d0a673e5fe0521ef2e5f68d;hpb=d73dc5b07390fb90e7f605871c993a28eedf1d46;p=oweals%2Fbusybox.git diff --git a/coreutils/dd.c b/coreutils/dd.c index 800ed59f8..0d5b3e8ab 100644 --- a/coreutils/dd.c +++ b/coreutils/dd.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini dd implementation for busybox * @@ -29,205 +30,170 @@ #include "internal.h" +#include #include #include #include +#if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1) +#include +#else +typedef unsigned long long int uintmax_t; +#endif static const char dd_usage[] = -"dd [if=name] [of=name] [bs=n] [count=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 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"; + "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"; -/* - * Read a number with a possible multiplier. - * Returns -1 if the number format is illegal. - */ -static long getNum (const char *cp) +extern int dd_main(int argc, char **argv) { - long value; - - if (!isDecimal (*cp)) - return -1; - - value = 0; - - while (isDecimal (*cp)) - value = value * 10 + *cp++ - '0'; + const char *inFile = NULL; + const 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; - switch (*cp++) { - case 'k': - value *= 1024; - break; - - case 'b': - value *= 512; - break; + argc--; + argv++; - case 'w': - value *= 2; - 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 '\0': - return value; + buf = malloc(blockSize); + if (buf == NULL) { + fprintf(stderr, "Cannot allocate buffer\n"); + exit(FALSE); + } - default: - return -1; - } + intotal = 0; + outTotal = 0; - if (*cp) - return -1; + if (inFile == NULL) + inFd = fileno(stdin); + else + inFd = open(inFile, 0); - return value; -} + if (inFd < 0) { + perror(inFile); + free(buf); + exit(FALSE); + } + if (outFile == NULL) + outFd = fileno(stdout); + else + outFd = open(outFile, O_WRONLY | O_CREAT | O_TRUNC, 0666); -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(*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 %ld\n", count); - goto usage; - } - } - else if (strncmp(*argv, "bs", 2) == 0) { - blockSize = getNum ((strchr(*argv, '='))+1); - if (blockSize <= 0) { - fprintf (stderr, "Bad block size value %d\n", blockSize); - goto usage; - } + if (outFd < 0) { + perror(outFile); + close(inFd); + free(buf); + exit(FALSE); } -#if 0 - else if (strncmp(*argv, "skip", 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; + } } -#endif - else { - goto usage; - } - argc--; - argv++; - } - if ( inFile == NULL || outFile == NULL) - goto usage; - - buf = malloc (blockSize); - if (buf == NULL) { - fprintf (stderr, "Cannot allocate buffer\n"); - exit( FALSE); - } - - intotal = 0; - outTotal = 0; - - if (inFile == NULL) - inFd = STDIN; - else - inFd = open (inFile, 0); - - if (inFd < 0) { - perror (inFile); - free (buf); - exit( FALSE); - } - - if (outFile == NULL) - outFd = STDOUT; - else - outFd = creat (outFile, 0666); - - if (outFd < 0) { - perror (outFile); - close (inFd); - free (buf); - exit( 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); + close(inFd); + close(outFd); + free(buf); + + 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: - usage( dd_usage); + usage(dd_usage); } - -