X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fdd.c;h=cd97b24ee52ffd7613397a11fc3a4389d099f0d8;hb=96379b0d7da8800d248d58641923870781f1a6f9;hp=0d5b3e8ab9867bc7918208da17b763275e4b72de;hpb=e49d5ecbbe51718fa925b6890a735e5937cc2aa2;p=oweals%2Fbusybox.git diff --git a/coreutils/dd.c b/coreutils/dd.c index 0d5b3e8ab..cd97b24ee 100644 --- a/coreutils/dd.c +++ b/coreutils/dd.c @@ -2,15 +2,8 @@ /* * 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,2001 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 @@ -28,172 +21,183 @@ * */ - -#include "internal.h" -#include +#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] [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"; - - - -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; - 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; + size_t out_full = 0; + size_t out_part = 0; + size_t in_full = 0; + size_t in_part = 0; + size_t count = -1; + size_t bs = 512; + ssize_t n; + off_t seek = 0; + off_t skip = 0; + int sync_flag = FALSE; + int noerror = FALSE; + int trunc = TRUE; + int oflag; + int ifd; + int ofd; + int i; + const char *infile = NULL; + const char *outfile = NULL; + char *buf; + + for (i = 1; i < argc; i++) { + if (strncmp("bs=", argv[i], 3) == 0) + bs = bb_xparse_number(argv[i]+3, dd_suffixes); + else if (strncmp("count=", argv[i], 6) == 0) + count = bb_xparse_number(argv[i]+6, dd_suffixes); + else if (strncmp("seek=", argv[i], 5) == 0) + seek = bb_xparse_number(argv[i]+5, dd_suffixes); + else if (strncmp("skip=", argv[i], 5) == 0) + skip = bb_xparse_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 if (strncmp("noerror", buf, 7) == 0) { + noerror = TRUE; + buf += 7; + } else { + bb_error_msg_and_die("invalid conversion `%s'", argv[i]+5); + } + if (buf[0] == '\0') + break; + if (buf[0] == ',') + buf++; } + } else + bb_show_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; - } + buf = xmalloc(bs); - } else { - goto usage; - } - argc--; - argv++; + if (infile != NULL) { + ifd = bb_xopen(infile, O_RDONLY); + } else { + ifd = STDIN_FILENO; + infile = bb_msg_standard_input; } - buf = malloc(blockSize); - if (buf == NULL) { - fprintf(stderr, "Cannot allocate buffer\n"); - exit(FALSE); - } + if (outfile != NULL) { + oflag = O_WRONLY | O_CREAT; + + if (!seek && trunc) { + oflag |= O_TRUNC; + } - intotal = 0; - outTotal = 0; + if ((ofd = open(outfile, oflag, 0666)) < 0) { + bb_perror_msg_and_die("%s", outfile); + } - if (inFile == NULL) - inFd = fileno(stdin); - else - inFd = open(inFile, 0); + if (seek && trunc) { + if (ftruncate(ofd, seek * bs) < 0) { + struct stat st; - if (inFd < 0) { - perror(inFile); - free(buf); - exit(FALSE); + if (fstat (ofd, &st) < 0 || S_ISREG (st.st_mode) || + S_ISDIR (st.st_mode)) { + bb_perror_msg_and_die("%s", outfile); + } + } + } + } else { + ofd = STDOUT_FILENO; + outfile = bb_msg_standard_output; } - if (outFile == NULL) - outFd = fileno(stdout); - else - outFd = open(outFile, O_WRONLY | O_CREAT | O_TRUNC, 0666); + if (skip) { + if (lseek(ifd, skip * bs, SEEK_CUR) < 0) { + bb_perror_msg_and_die("%s", infile); + } + } - if (outFd < 0) { - perror(outFile); - close(inFd); - free(buf); - exit(FALSE); + if (seek) { + if (lseek(ofd, seek * bs, SEEK_CUR) < 0) { + bb_perror_msg_and_die("%s", outfile); + } } - 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; + while (in_full + in_part != count) { + if (noerror) { + /* Pre-zero the buffer when doing the noerror thing */ + memset(buf, '\0', bs); } - 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; + n = safe_read(ifd, buf, bs); + if (n < 0) { + if (noerror) { + n = bs; + bb_perror_msg("%s", infile); + } else { + bb_perror_msg_and_die("%s", infile); } - - inCc -= outCc; - cp += outCc; - outTotal += outCc; + } + if (n == 0) { + break; + } + if (n == bs) { + in_full++; + } else { + in_part++; + } + if (sync_flag) { + memset(buf + n, '\0', bs - n); + n = bs; + } + n = bb_full_write(ofd, buf, n); + if (n < 0) { + bb_perror_msg_and_die("%s", outfile); + } + if (n == bs) { + out_full++; + } else { + out_part++; } } - if (inCc < 0) - perror(inFile); + if (close (ifd) < 0) { + bb_perror_msg_and_die("%s", infile); + } - cleanup: - close(inFd); - close(outFd); - free(buf); + if (close (ofd) < 0) { + bb_perror_msg_and_die("%s", outfile); + } - 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, "%ld+%ld records in\n%ld+%ld records out\n", + (long)in_full, (long)in_part, + (long)out_full, (long)out_part); - usage(dd_usage); + return EXIT_SUCCESS; }