X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fdd.c;h=cd97b24ee52ffd7613397a11fc3a4389d099f0d8;hb=96379b0d7da8800d248d58641923870781f1a6f9;hp=75bbfbac2d4778db4d75fe3d6b47a2b14c1757c1;hpb=a164c647acc613fe199a646dc5075c097f51a4a4;p=oweals%2Fbusybox.git

diff --git a/coreutils/dd.c b/coreutils/dd.c
index 75bbfbac2..cd97b24ee 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -3,7 +3,7 @@
  * Mini dd implementation for busybox
  *
  *
- * Copyright (C) 2000 by Matt Kraai <kraai@alumni.carnegiemellon.edu>
+ * 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
@@ -21,14 +21,15 @@
  *
  */
 
-#include "busybox.h"
-
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
+#include "busybox.h"
+
 
 static const struct suffix_mult dd_suffixes[] = {
 	{ "c", 1 },
@@ -45,23 +46,35 @@ static const struct suffix_mult dd_suffixes[] = {
 
 int dd_main(int argc, char **argv)
 {
-	int i, ifd, ofd, oflag, sync = FALSE, trunc = TRUE;
-	size_t in_full = 0, in_part = 0, out_full = 0, out_part = 0;
-	size_t bs = 512, count = -1;
+	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, skip = 0;
-	FILE *statusfp;
-	char *infile = NULL, *outfile = NULL, *buf;
+	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 = parse_number(argv[i]+3, dd_suffixes);
+			bs = bb_xparse_number(argv[i]+3, dd_suffixes);
 		else if (strncmp("count=", argv[i], 6) == 0)
-			count = parse_number(argv[i]+6, dd_suffixes);
+			count = bb_xparse_number(argv[i]+6, dd_suffixes);
 		else if (strncmp("seek=", argv[i], 5) == 0)
-			seek = parse_number(argv[i]+5, dd_suffixes);
+			seek = bb_xparse_number(argv[i]+5, dd_suffixes);
 		else if (strncmp("skip=", argv[i], 5) == 0)
-			skip = parse_number(argv[i]+5, dd_suffixes);
+			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)
@@ -73,10 +86,13 @@ int dd_main(int argc, char **argv)
 					trunc = FALSE;
 					buf += 7;
 				} else if (strncmp("sync", buf, 4) == 0) {
-					sync = TRUE;
+					sync_flag = TRUE;
 					buf += 4;
+				} else if (strncmp("noerror", buf, 7) == 0) {
+					noerror = TRUE;
+					buf += 7;
 				} else {
-					error_msg_and_die("invalid conversion `%s'", argv[i]+5);
+					bb_error_msg_and_die("invalid conversion `%s'", argv[i]+5);
 				}
 				if (buf[0] == '\0')
 					break;
@@ -84,75 +100,104 @@ int dd_main(int argc, char **argv)
 					buf++;
 			}
 		} else
-			usage(dd_usage);
+			bb_show_usage();
 	}
 
 	buf = xmalloc(bs);
 
 	if (infile != NULL) {
-		if ((ifd = open(infile, O_RDONLY)) < 0)
-			perror_msg_and_die("%s", infile);
+		ifd = bb_xopen(infile, O_RDONLY);
 	} else {
 		ifd = STDIN_FILENO;
-		infile = "standard input";
+		infile = bb_msg_standard_input;
 	}
 
 	if (outfile != NULL) {
 		oflag = O_WRONLY | O_CREAT;
 
-		if (!seek && trunc)
+		if (!seek && trunc) {
 			oflag |= O_TRUNC;
+		}
 
-		if ((ofd = open(outfile, oflag, 0666)) < 0)
-			perror_msg_and_die("%s", outfile);
+		if ((ofd = open(outfile, oflag, 0666)) < 0) {
+			bb_perror_msg_and_die("%s", outfile);
+		}
 
 		if (seek && trunc) {
-			if (ftruncate(ofd, seek * bs) < 0)
-				perror_msg_and_die("%s", outfile);
-		}
+			if (ftruncate(ofd, seek * bs) < 0) {
+				struct stat st;
 
-		statusfp = stdout;
+				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 = "standard output";
-		statusfp = stderr;
+		outfile = bb_msg_standard_output;
 	}
 
 	if (skip) {
-		if (lseek(ifd, skip * bs, SEEK_CUR) < 0)
-			perror_msg_and_die("%s", infile);
+		if (lseek(ifd, skip * bs, SEEK_CUR) < 0) {
+			bb_perror_msg_and_die("%s", infile);
+		}
 	}
 
 	if (seek) {
-		if (lseek(ofd, seek * bs, SEEK_CUR) < 0)
-			perror_msg_and_die("%s", outfile);
+		if (lseek(ofd, seek * bs, SEEK_CUR) < 0) {
+			bb_perror_msg_and_die("%s", outfile);
+		}
 	}
 
 	while (in_full + in_part != count) {
+		if (noerror) {
+			/* Pre-zero the buffer when doing the noerror thing */
+			memset(buf, '\0', bs);
+		}
 		n = safe_read(ifd, buf, bs);
-		if (n < 0)
-			perror_msg_and_die("%s", infile);
-		if (n == 0)
+		if (n < 0) {
+			if (noerror) {
+				n = bs;
+				bb_perror_msg("%s", infile);
+			} else {
+				bb_perror_msg_and_die("%s", infile);
+			}
+		}
+		if (n == 0) {
 			break;
-		if (n == bs)
+		}
+		if (n == bs) {
 			in_full++;
-		else
+		} else {
 			in_part++;
-		if (sync) {
+		}
+		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)
+		n = bb_full_write(ofd, buf, n);
+		if (n < 0) {
+			bb_perror_msg_and_die("%s", outfile);
+		}
+		if (n == bs) {
 			out_full++;
-		else
+		} else {
 			out_part++;
+		}
+	}
+
+	if (close (ifd) < 0) {
+		bb_perror_msg_and_die("%s", infile);
+	}
+
+	if (close (ofd) < 0) {
+		bb_perror_msg_and_die("%s", outfile);
 	}
 
-	fprintf(statusfp, "%d+%d records in\n", in_full, in_part);
-	fprintf(statusfp, "%d+%d records out\n", out_full, out_part);
+	fprintf(stderr, "%ld+%ld records in\n%ld+%ld records out\n",
+			(long)in_full, (long)in_part,
+			(long)out_full, (long)out_part);
 
 	return EXIT_SUCCESS;
 }