diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-29 02:01:54 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-29 02:01:54 +0000 |
| commit | 6ec1af6ea54bedc617a3fceb0fdc344eadd9b9a3 (patch) | |
| tree | 0ad6ebb0a27a01887db82e2c980c287c9eb08d7c | |
| parent | 10c3eaf5dbaf255134db3610791178b6e2cc517c (diff) | |
| download | ruby-6ec1af6ea54bedc617a3fceb0fdc344eadd9b9a3.tar.gz ruby-6ec1af6ea54bedc617a3fceb0fdc344eadd9b9a3.tar.xz ruby-6ec1af6ea54bedc617a3fceb0fdc344eadd9b9a3.zip | |
* win32/win32.c (rb_w32_open): shouldn't seek here.
* win32/win32.c (rb_w32_write): write to the end of the file when
FAPPEND is specified.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20015 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | win32/win32.c | 8 |
2 files changed, 10 insertions, 5 deletions
@@ -1,3 +1,10 @@ +Wed Oct 29 11:01:46 2008 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/win32.c (rb_w32_open): shouldn't seek here. + + * win32/win32.c (rb_w32_write): write to the end of the file when + FAPPEND is specified. + Wed Oct 29 00:29:46 2008 NAKAMURA Usaku <usa@ruby-lang.org> * win32/win32.c (rb_w32_open): need to seek to the end of the file when diff --git a/win32/win32.c b/win32/win32.c index b70a6d7fa..50fd55d07 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -4129,10 +4129,8 @@ rb_w32_open(const char *file, int oflag, ...) fd = -1; goto quit; } - if (!(flags & (FDEV | FPIPE)) && (oflag & O_APPEND)) { + if (!(flags & (FDEV | FPIPE)) && (oflag & O_APPEND)) flags |= FAPPEND; - SetFilePointer(h, 0, NULL, FILE_END); - } _set_osfhnd(fd, (long)h); _osfile(fd) = flags | FOPEN; @@ -4431,8 +4429,8 @@ rb_w32_write(int fd, const void *buf, size_t size) memset(&ol, 0, sizeof(ol)); if (!(_osfile(fd) & (FDEV | FPIPE))) { LONG high = 0; - DWORD low = SetFilePointer((HANDLE)_osfhnd(fd), 0, &high, - FILE_CURRENT); + DWORD method = _osfile(fd) & FAPPEND ? FILE_END : FILE_CURRENT; + DWORD low = SetFilePointer((HANDLE)_osfhnd(fd), 0, &high, method); #ifndef INVALID_SET_FILE_POINTER #define INVALID_SET_FILE_POINTER ((DWORD)-1) #endif |