X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fdd.c;h=5d9993d8b1ef644a51ff6f95d0b444ee1859303f;hb=0b4551faf520e44a9a0bf2ac72b3dcd6a145a0a1;hp=07f092cc23c8d1e91053fefc5ba8bfc91352faee;hpb=9d3aba7b37b275350a9fe0887871da9ba73dcbd7;p=oweals%2Fbusybox.git diff --git a/coreutils/dd.c b/coreutils/dd.c index 07f092cc2..5d9993d8b 100644 --- a/coreutils/dd.c +++ b/coreutils/dd.c @@ -1,307 +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. - * Majorly modified, 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" -#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 "internal.h" +#include #include -#include -#include #include -#include -#include - - -#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; - +#include +#if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1) +#include +#else +typedef unsigned long long int uintmax_t; +#endif -static const PARAM params[] = -{ - {"if", PAR_IF}, - {"of", PAR_OF}, - {"bs", PAR_BS}, - {"count", PAR_COUNT}, - {NULL, PAR_NONE} -}; +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 + ; -static long getNum(const char * cp); -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; - + 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; + } - while (--argc > 0) - { - str = *++argv; - cp = strchr(str, '='); + } 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; + } - if (cp == NULL) - { - fprintf(stderr, "Bad dd argument\n"); + } else { 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: - goto usage; - } + argc--; + argv++; } - buf = localBuf; - - if (blockSize > sizeof(localBuf)) - { - buf = malloc(blockSize); - - if (buf == NULL) - { - fprintf(stderr, "Cannot allocate buffer\n"); - return 1; - } - } + buf = xmalloc(blockSize); intotal = 0; outTotal = 0; if (inFile == NULL) - inFd = STDIN; + inFd = fileno(stdin); else - inFd = open(inFile, 0); + inFd = open(inFile, 0); - if (inFd < 0) - { - perror(inFile); - - 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); */ + fatalError( inFile); } if (outFile == NULL) - outFd = STDOUT; + outFd = fileno(stdout); else - outFd = creat(outFile, 0666); - - if (outFd < 0) - { - perror(outFile); - close(inFd); + outFd = open(outFile, O_WRONLY | O_CREAT | O_TRUNC, 0666); - if (buf != localBuf) - free(buf); + if (outFd < 0) { + /* Note that we are not freeing buf or closing + * files here to save a few bytes. This exits + * here anyways... */ - return 1; + /* close(inFd); + free(buf); */ + fatalError( outFile); } - while ( outTotal < count*blockSize ) - { + 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; + perror(inFile); + goto cleanup; + } else if (inCc == 0) { + 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; + while (intotal > outTotal) { + if (outTotal + inCc > count * blockSize) + inCc = count * blockSize - outTotal; outCc = write(outFd, cp, inCc); - if (outCc < 0) - { + if (outCc < 0) { perror(outFile); goto cleanup; + } else if (outCc == 0) { + goto cleanup; } - //fprintf(stderr, "wrote out =%d\n", outCc); inCc -= outCc; cp += outCc; outTotal += outCc; - //fprintf(stderr, "outTotal=%ld\n", outTotal); } } if (inCc < 0) perror(inFile); -cleanup: + 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 - 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); + exit(TRUE); + usage: - return value; + usage(dd_usage); } - -#endif -/* END CODE */ -