Changeset 347 for trunk/src

Timestamp:

Dec 11, 2005, 6:12:41 AM (20 years ago)

Author:

bird

Message:

Open files in binary mode before copying!

File:

• trunk/src/gmake/kmkbuiltin/cp_utils.c (modified) (3 diffs)

trunk/src/gmake/kmkbuiltin/cp_utils.c

@@ -59 +59 @@
 #define MAXBSIZE (128*1024)
 #endif
+#ifndef O_BINARY
+# define O_BINARY 0
+#endif
 
 int
@@ -74 +77 @@
 #endif
 
-        if ((from_fd = open(entp->fts_path, O_RDONLY, 0)) == -1) {
+        if ((from_fd = open(entp->fts_path, O_RDONLY | O_BINARY, 0)) == -1) {
                 fprintf(stderr, "%s: %s: %s\n", argv0, entp->fts_path, strerror(errno));
                 return (1);
@@ -112 +115 @@
                      * create a new file  */
                     (void)unlink(to.p_path);
-                    to_fd = open(to.p_path, O_WRONLY | O_TRUNC | O_CREAT,
+                    to_fd = open(to.p_path, O_WRONLY | O_TRUNC | O_CREAT | O_BINARY,
                                  fs->st_mode & ~(S_ISUID | S_ISGID));
                 } else
                     /* overwrite existing destination file name */
-                    to_fd = open(to.p_path, O_WRONLY | O_TRUNC, 0);
+                    to_fd = open(to.p_path, O_WRONLY | O_TRUNC | O_BINARY, 0);
         } else
-                to_fd = open(to.p_path, O_WRONLY | O_TRUNC | O_CREAT,
+                to_fd = open(to.p_path, O_WRONLY | O_TRUNC | O_CREAT | O_BINARY,
                     fs->st_mode & ~(S_ISUID | S_ISGID));