X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=dd.c;h=626b54898404b2d478b8f782c772b023d4a29c02;hb=f3b2b52b589bccae28b1740c155733028f2b8fd5;hp=84f3211fb0c5c5c19305827d29b06cc1c36d2df6;hpb=729216cb11f263d16bc7322788842234642ab6ab;p=oweals%2Fbusybox.git

diff --git a/dd.c b/dd.c
index 84f3211fb..626b54898 100644
--- a/dd.c
+++ b/dd.c
@@ -29,7 +29,7 @@
  */
 
 
-#include "internal.h"
+#include "busybox.h"
 #include <features.h>
 #include <stdio.h>
 #include <fcntl.h>
@@ -48,15 +48,18 @@ extern int dd_main(int argc, char **argv)
 	int outFd;
 	int inCc = 0;
 	int outCc;
-	long blockSize = 512;
+	int trunc=TRUE;
+	int sync=FALSE;
+	long blockSize = 512,ibs;
 	uintmax_t skipBlocks = 0;
 	uintmax_t seekBlocks = 0;
 	uintmax_t count = (uintmax_t) - 1;
 	uintmax_t inTotal = 0;
 	uintmax_t outTotal = 0;
 	uintmax_t totalSize;
-	uintmax_t readSize;
+
 	unsigned char buf[BUFSIZ];
+	char *keyword = NULL;
 
 	argc--;
 	argv++;
@@ -68,31 +71,36 @@ extern int dd_main(int argc, char **argv)
 		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) {
-				errorMsg("Bad count value %s\n", *argv);
+			count = atoi_w_units((strchr(*argv, '=')) + 1);
+			if (count < 0) {
+				error_msg("Bad count value %s\n", *argv);
 				goto usage;
 			}
 		} else if (strncmp(*argv, "bs", 2) == 0) {
-			blockSize = getNum((strchr(*argv, '=')) + 1);
+			blockSize = atoi_w_units((strchr(*argv, '=')) + 1);
 			if (blockSize <= 0) {
-				errorMsg("Bad block size value %s\n", *argv);
+				error_msg("Bad block size value %s\n", *argv);
 				goto usage;
 			}
 		} else if (strncmp(*argv, "skip", 4) == 0) {
-			skipBlocks = getNum((strchr(*argv, '=')) + 1);
+			skipBlocks = atoi_w_units((strchr(*argv, '=')) + 1);
 			if (skipBlocks <= 0) {
-				errorMsg("Bad skip value %s\n", *argv);
+				error_msg("Bad skip value %s\n", *argv);
 				goto usage;
 			}
 
 		} else if (strncmp(*argv, "seek", 4) == 0) {
-			seekBlocks = getNum((strchr(*argv, '=')) + 1);
+			seekBlocks = atoi_w_units((strchr(*argv, '=')) + 1);
 			if (seekBlocks <= 0) {
-				errorMsg("Bad seek value %s\n", *argv);
+				error_msg("Bad seek value %s\n", *argv);
 				goto usage;
 			}
-
+		} else if (strncmp(*argv, "conv", 4) == 0) {
+			keyword = (strchr(*argv, '=') + 1);
+                	if (strcmp(keyword, "notrunc") == 0) 
+				trunc=FALSE;
+			if (strcmp(keyword, "sync") == 0) 
+				sync=TRUE;
 		} else {
 			goto usage;
 		}
@@ -111,7 +119,7 @@ extern int dd_main(int argc, char **argv)
 		 * here anyways... */
 
 		/* free(buf); */
-		fatalError( inFile);
+		perror_msg_and_die("%s", inFile);
 	}
 
 	if (outFile == NULL)
@@ -126,22 +134,35 @@ extern int dd_main(int argc, char **argv)
 
 		/* close(inFd);
 		   free(buf); */
-		fatalError( outFile);
+		perror_msg_and_die("%s", outFile);
 	}
 
 	lseek(inFd, (off_t) (skipBlocks * blockSize), SEEK_SET);
 	lseek(outFd, (off_t) (seekBlocks * blockSize), SEEK_SET);
 	totalSize=count*blockSize;
-	while ((readSize = totalSize - inTotal) > 0) {
-		if (readSize > BUFSIZ)
-			readSize=BUFSIZ;
-		inCc = read(inFd, buf, readSize);
+
+	ibs=blockSize;
+	if (ibs > BUFSIZ)
+		ibs=BUFSIZ;
+			
+	while (totalSize > outTotal) {
+		inCc = full_read(inFd, buf, ibs);
 		inTotal += inCc;
-		if ((outCc = fullWrite(outFd, buf, inCc)) < 0)
+		if ( (sync==TRUE) && (inCc>0) )
+			while (inCc<ibs)
+				buf[inCc++]='\0';
+
+		if ((outCc = full_write(outFd, buf, inCc)) < 1){
+			if (outCc < 0 ){
+				perror("Error during write");
+			}
 			break;
+		}
 		outTotal += outCc;
         }
-
+	if (trunc == TRUE) {
+		ftruncate(outFd, lseek(outFd, 0, SEEK_CUR));
+	}
 	/* Note that we are not freeing memory or closing
 	 * files here, to save a few bytes. */
 #ifdef BB_FEATURE_CLEAN_UP
@@ -153,7 +174,7 @@ extern int dd_main(int argc, char **argv)
 		   (inTotal % blockSize) != 0);
 	printf("%ld+%d records out\n", (long) (outTotal / blockSize),
 		   (outTotal % blockSize) != 0);
-	exit(TRUE);
+	return EXIT_SUCCESS;
   usage:
 
 	usage(dd_usage);