* archival/bunzip2.c (bunzip2_main): Do not remove files if writing to standard

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

diff --git a/coreutils/dd.c b/coreutils/dd.c
index d46db82a03074c94e19359548b9d10ea4a091a4e..09e6cccc72ff9c7be988acc4d5869fc5e16aac55 100644 (file)
--- 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
@@ -22,6 +22,7 @@
  */
 
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -106,8 +107,13 @@ int dd_main(int argc, char **argv)
                        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;
+
+                               if (fstat (ofd, &st) < 0 || S_ISREG (st.st_mode) ||
+                                               S_ISDIR (st.st_mode))
+                                       perror_msg_and_die("%s", outfile);
+                       }
                }
        } else {
                ofd = STDOUT_FILENO;
@@ -147,6 +153,12 @@ int dd_main(int argc, char **argv)
                        out_part++;
        }
 
+       if (close (ifd) < 0)
+               perror_msg_and_die("%s", infile);
+
+       if (close (ofd) < 0)
+               perror_msg_and_die("%s", outfile);
+
        fprintf(stderr, "%ld+%ld records in\n", (long)in_full, (long)in_part);
        fprintf(stderr, "%ld+%ld records out\n", (long)out_full, (long)out_part);