diff options
| author | Paul Eggert | 2013-01-19 04:29:10 -0800 |
|---|---|---|
| committer | Paul Eggert | 2013-01-19 04:29:10 -0800 |
| commit | 21cd50b803cb63b66f81db0a18dbaac6d7269348 (patch) | |
| tree | 152c1e7f60b699d96a4fff886d2e837eafd9c0b5 /src | |
| parent | 3908c57608307b139dd65fc51731f92436d6bd55 (diff) | |
| download | emacs-21cd50b803cb63b66f81db0a18dbaac6d7269348.tar.gz emacs-21cd50b803cb63b66f81db0a18dbaac6d7269348.zip | |
Fix size bug on DOS_NT introduced by CIFS workaround.
* fileio.c (Fwrite_region): Use O_BINARY in checking code, too.
Fixes: debbugs:13149
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/fileio.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c6bd70e2a04..57b36782697 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2013-01-19 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2013-01-19 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | Fix size bug on DOS_NT introduced by CIFS workaround (Bug#13149). | ||
| 4 | * fileio.c (Fwrite_region): Use O_BINARY in checking code, too. | ||
| 5 | |||
| 3 | Allow floating-point file offsets. | 6 | Allow floating-point file offsets. |
| 4 | Problem reported by Vitalie Spinu in | 7 | Problem reported by Vitalie Spinu in |
| 5 | <http://lists.gnu.org/archive/html/emacs-devel/2013-01/msg00411.html>. | 8 | <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 | |||
| 4989 | if (EMACS_TIME_VALID_P (modtime) | 4989 | if (EMACS_TIME_VALID_P (modtime) |
| 4990 | && ! (valid_timestamp_file_system && st.st_dev == timestamp_file_system)) | 4990 | && ! (valid_timestamp_file_system && st.st_dev == timestamp_file_system)) |
| 4991 | { | 4991 | { |
| 4992 | int desc1 = emacs_open (fn, O_WRONLY, 0); | 4992 | int desc1 = emacs_open (fn, O_WRONLY | O_BINARY, 0); |
| 4993 | if (0 <= desc1) | 4993 | if (0 <= desc1) |
| 4994 | { | 4994 | { |
| 4995 | struct stat st1; | 4995 | struct stat st1; |