diff options
author | wyhaines <wyhaines@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-22 20:10:13 +0000 |
---|---|---|
committer | wyhaines <wyhaines@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-22 20:10:13 +0000 |
commit | 2176130373f03ad76c814dd652044f23f9158a69 (patch) | |
tree | bc7722f9b8f380172ead89eb946ac4d406e9a7cc /io.c | |
parent | 2c0b73f16a997b6b957e435d808a0b60e6afd9d3 (diff) |
io.c: Backport #2267 [ruby-core:26300]; Fix problem with IO so that the file position is correct after a direct write on BSDish platforms like OS X.
test/ruby/test_io.rb: Added a test for the fix.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@28393 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 11 |
1 files changed, 11 insertions, 0 deletions
@@ -36,6 +36,14 @@ # define USE_SETVBUF #endif +#ifndef BSD_STDIO +# if defined(__MACH__) || defined(__DARWIN__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) +# define BSD_STDIO 1 +# else +# define BSD_STDIO 0 +# endif +#endif + #ifdef __QNXNTO__ #include "unix.h" #endif @@ -472,6 +480,9 @@ io_fwrite(str, fptr) TRAP_BEG; r = write(fileno(f), RSTRING(str)->ptr+offset, l); TRAP_END; +#if BSD_STDIO + fseeko(f, lseek(fileno(f), (off_t)0, SEEK_CUR), SEEK_SET); +#endif if (r == n) return len; if (0 <= r) { offset += r; |