X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fdd.c;h=297d0ab51a056245ab91627c51d96a9a13af8d57;hb=6aabfd5e30087bb0ffdb6404aa6d650014de2dc0;hp=bc01eedbfaab9e4dfc5df26387ac05ae3dcdc3b9;hpb=4d1d0113fd3309aac30b2dd1d443bf7c7d5f0a3d;p=oweals%2Fbusybox.git diff --git a/coreutils/dd.c b/coreutils/dd.c index bc01eedbf..297d0ab51 100644 --- a/coreutils/dd.c +++ b/coreutils/dd.c @@ -1,15 +1,9 @@ +/* vi: set sw=4 ts=4: */ /* * Mini dd implementation for busybox * - * Copyright (C) 1999 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. + * Copyright (C) 2000 by Matt Kraai * * 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 @@ -27,168 +21,138 @@ * */ - -#include "internal.h" -#include +#include +#include #include +#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 w (x2), k (x1024), b (x512), or m (x1024^2).\n"; - - - -extern int dd_main (int argc, char **argv) +#include "busybox.h" + + +static const 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) { - const char *inFile = NULL; - const char *outFile = NULL; - char *cp; - int inFd; - int outFd; - int inCc = 0; - int outCc; - size_t blockSize = 512; - //uintmax_t skipBlocks = 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; - } + int i, ifd, ofd, oflag, sync_flag = 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_flag = TRUE; + buf += 4; + } else { + error_msg_and_die("invalid conversion `%s'", argv[i]+5); + } + if (buf[0] == '\0') + break; + if (buf[0] == ',') + buf++; + } + } else + show_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; - } - } -#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; - } + buf = xmalloc(bs); + + if (infile != NULL) { + if ((ifd = open(infile, O_RDONLY)) < 0) + perror_msg_and_die("%s", infile); + } else { + ifd = STDIN_FILENO; + infile = "standard input"; } -#endif - else { - goto usage; - } - argc--; - argv++; - } - - buf = malloc (blockSize); - if (buf == NULL) { - fprintf (stderr, "Cannot allocate buffer\n"); - exit( FALSE); - } - - intotal = 0; - outTotal = 0; - - if (inFile == NULL) - inFd = fileno(stdin); - else - inFd = open (inFile, 0); - - if (inFd < 0) { - perror (inFile); - free (buf); - exit( FALSE); - } - - if (outFile == NULL) - outFd = fileno(stdout); - else - outFd = creat (outFile, 0666); - - if (outFd < 0) { - perror (outFile); - close (inFd); - free (buf); - exit( FALSE); - } - - //lseek(inFd, skipBlocks*blockSize, SEEK_SET); - // - //TODO: Convert to using fullRead & fullWrite - // from utilitity.c - // -Erik - while (outTotal < count * blockSize) { - inCc = read (inFd, buf, blockSize); - if (inCc < 0) { - perror (inFile); - goto cleanup; - } else if (inCc == 0) { - goto cleanup; + + if (outfile != NULL) { + oflag = O_WRONLY | O_CREAT; + + if (!seek && trunc) + oflag |= O_TRUNC; + + if ((ofd = open(outfile, oflag, 0666)) < 0) + perror_msg_and_die("%s", outfile); + + if (seek && trunc) { + if (ftruncate(ofd, seek * bs) < 0) + perror_msg_and_die("%s", outfile); + } + + statusfp = stdout; + } else { + ofd = STDOUT_FILENO; + outfile = "standard output"; + statusfp = stderr; } - 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; + + if (skip) { + if (lseek(ifd, skip * bs, SEEK_CUR) < 0) + perror_msg_and_die("%s", infile); } - } - if (inCc < 0) - perror (inFile); + if (seek) { + if (lseek(ofd, seek * bs, SEEK_CUR) < 0) + perror_msg_and_die("%s", outfile); + } - cleanup: - close (inFd); - close (outFd); - free (buf); + 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_flag) { + 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++; + } - 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, "%ld+%ld records in\n", (long)in_full, (long)in_part); + fprintf(statusfp, "%ld+%ld records out\n", (long)out_full, (long)out_part); - usage( dd_usage); + return EXIT_SUCCESS; } - -