kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* io.c (io_fwrite): adjust stdio file position after direct write on

Browse source 
BSDish platforms.   [ruby-core:26300]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@25485 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-10-26 03:06:29 +00:00
parent bc078709a5
commit ce4e9dff9b
4 changed files with 34 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Mon Oct 26 12:06:27 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (io_fwrite): adjust stdio file position after direct write on
BSDish platforms. [ruby-core:26300]
Sun Oct 25 20:04:35 2009 Akinori MUSHA <knu@iDaemons.org> Sun Oct 25 20:04:35 2009 Akinori MUSHA <knu@iDaemons.org>
* object.c (rb_class_initialize): The inherited hook should be run * object.c (rb_class_initialize): The inherited hook should be run

11
io.c
View file

@ -37,6 +37,14 @@
# define USE_SETVBUF # define USE_SETVBUF
#endif #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__ #ifdef __QNXNTO__
#include "unix.h" #include "unix.h"
#endif #endif
@ -481,6 +489,9 @@ io_fwrite(str, fptr)
TRAP_BEG; TRAP_BEG;
r = write(fileno(f), RSTRING(str)->ptr+offset, l); r = write(fileno(f), RSTRING(str)->ptr+offset, l);
TRAP_END; TRAP_END;
#if BSD_STDIO
fseeko(f, lseek(fileno(f), (off_t)0, SEEK_CUR), SEEK_SET);
#endif
if (r == n) return len; if (r == n) return len;
if (0 <= r) { if (0 <= r) {
offset += r; offset += r;

15
test/ruby/test_io.rb
View file

@ -34,4 +34,19 @@ class TestIO < Test::Unit::TestCase
t.close t.close
assert_raise(IOError) {t.binmode} assert_raise(IOError) {t.binmode}
end end
def test_pos
t = make_tempfile
open(t.path, IO::RDWR|IO::CREAT|IO::TRUNC, 0600) do |f|
f.write "Hello"
assert_equal(5, f.pos)
end
open(t.path, IO::RDWR|IO::CREAT|IO::TRUNC, 0600) do |f|
f.sync = true
f.read
f.write "Hello"
assert_equal(5, f.pos)
end
end
end end

6
version.h
View file

@ -1,7 +1,7 @@
#define RUBY_VERSION "1.8.8" #define RUBY_VERSION "1.8.8"
#define RUBY_RELEASE_DATE "2009-10-25" #define RUBY_RELEASE_DATE "2009-10-26"
#define RUBY_VERSION_CODE 188 #define RUBY_VERSION_CODE 188
#define RUBY_RELEASE_CODE 20091025 #define RUBY_RELEASE_CODE 20091026
#define RUBY_PATCHLEVEL -1 #define RUBY_PATCHLEVEL -1
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 8 #define RUBY_VERSION_TEENY 8
#define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 10 #define RUBY_RELEASE_MONTH 10
#define RUBY_RELEASE_DAY 25 #define RUBY_RELEASE_DAY 26
#ifdef RUBY_EXTERN #ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_version[];