Bugfixes

[oweals/busybox.git] / coreutils / dd.c

diff --git a/coreutils/dd.c b/coreutils/dd.c
index d6a4bb3aa3a31fdfce288b02089f4319058c8cec..9a149e24a8dd935f480d3e329013fc3435e182b4 100644 (file)
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -46,22 +46,35 @@ static const struct suffix_mult dd_suffixes[] = {
 
 int dd_main(int argc, char **argv)
 {
-       int i, ifd, ofd, oflag, sync_flag = FALSE, trunc = TRUE, noerror = FALSE;
-       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;
-       char *infile = NULL, *outfile = NULL, *buf;
+       off_t seek = 0;
+       off_t skip = 0;
+       int sync_flag = FALSE;
+       int noerror = FALSE;
+       int trunc_flag = 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)
@@ -70,7 +83,7 @@ int dd_main(int argc, char **argv)
                        buf = argv[i]+5;
                        while (1) {
                                if (strncmp("notrunc", buf, 7) == 0) {
-                                       trunc = FALSE;
+                                       trunc_flag = FALSE;
                                        buf += 7;
                                } else if (strncmp("sync", buf, 4) == 0) {
                                        sync_flag = TRUE;
@@ -79,7 +92,7 @@ int dd_main(int argc, char **argv)
                                        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;
@@ -87,50 +100,54 @@ int dd_main(int argc, char **argv)
                                        buf++;
                        }
                } else
-                       show_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_flag) {
                        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 (seek && trunc_flag) {
                        if (ftruncate(ofd, seek * bs) < 0) {
                                struct stat st;
 
                                if (fstat (ofd, &st) < 0 || S_ISREG (st.st_mode) ||
-                                               S_ISDIR (st.st_mode))
-                                       perror_msg_and_die("%s", outfile);
+                                               S_ISDIR (st.st_mode)) {
+                                       bb_perror_msg_and_die("%s", outfile);
+                               }
                        }
                }
        } else {
                ofd = STDOUT_FILENO;
-               outfile = "standard output";
+               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) {
@@ -142,38 +159,45 @@ int dd_main(int argc, char **argv)
                if (n < 0) {
                        if (noerror) {
                                n = bs;
-                               perror_msg("%s", infile);
+                               bb_perror_msg("%s", infile);
                        } else {
-                               perror_msg_and_die("%s", infile);
+                               bb_perror_msg_and_die("%s", infile);
                        }
                }
-               if (n == 0)
+               if (n == 0) {
                        break;
-               if (n == bs)
+               }
+               if (n == bs) {
                        in_full++;
-               else
+               } 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)
+               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)
-               perror_msg_and_die("%s", infile);
+       if (close (ifd) < 0) {
+               bb_perror_msg_and_die("%s", infile);
+       }
 
-       if (close (ofd) < 0)
-               perror_msg_and_die("%s", outfile);
+       if (close (ofd) < 0) {
+               bb_perror_msg_and_die("%s", outfile);
+       }
 
-       error_msg("%ld+%ld records in", (long)in_full, (long)in_part);
-       error_msg("%ld+%ld records out", (long)out_full, (long)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;
 }