From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 19 Jan 2013 12:29:10 +0000 (-0800)
Subject: Fix size bug on DOS_NT introduced by CIFS workaround.
X-Git-Tag: emacs-24.3.90~173^2~7^2~265
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=21cd50b803cb63b66f81db0a18dbaac6d7269348;p=emacs.git

Fix size bug on DOS_NT introduced by CIFS workaround.

* fileio.c (Fwrite_region): Use O_BINARY in checking code, too.

Fixes: debbugs:13149
---

diff --git a/src/ChangeLog b/src/ChangeLog
index c6bd70e2a04..57b36782697 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2013-01-19  Paul Eggert  <eggert@cs.ucla.edu>
 
+	Fix size bug on DOS_NT introduced by CIFS workaround (Bug#13149).
+	* fileio.c (Fwrite_region): Use O_BINARY in checking code, too.
+
 	Allow floating-point file offsets.
 	Problem reported by Vitalie Spinu in
 	<http://lists.gnu.org/archive/html/emacs-devel/2013-01/msg00411.html>.
diff --git a/src/fileio.c b/src/fileio.c
index 24f4fa8c443..a2413c8a52f 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4989,7 +4989,7 @@ This calls `write-region-annotate-functions' at the start, and
   if (EMACS_TIME_VALID_P (modtime)
       && ! (valid_timestamp_file_system && st.st_dev == timestamp_file_system))
     {
-      int desc1 = emacs_open (fn, O_WRONLY, 0);
+      int desc1 = emacs_open (fn, O_WRONLY | O_BINARY, 0);
       if (0 <= desc1)
 	{
 	  struct stat st1;