diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | file.c | 14 | ||||
| -rw-r--r-- | include/ruby/io.h | 5 | ||||
| -rw-r--r-- | test/-ext-/file/test_stat.rb | 14 |
4 files changed, 33 insertions, 7 deletions
@@ -1,3 +1,10 @@ +Tue Oct 1 20:54:33 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * file.c (stat_new_0): constify. + + * file.c (rb_stat_new): constify and export. based on a patch by + Hanmac (Hans Mackowiak) at [ruby-core:53225]. [Feature #8050] + Tue Oct 1 16:03:42 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * include/ruby/ruby.h (ruby_safe_level_4_warning): needed by extension @@ -365,7 +365,7 @@ static const rb_data_type_t stat_data_type = { }; static VALUE -stat_new_0(VALUE klass, struct stat *st) +stat_new_0(VALUE klass, const struct stat *st) { struct stat *nst = 0; @@ -376,8 +376,8 @@ stat_new_0(VALUE klass, struct stat *st) return TypedData_Wrap_Struct(klass, &stat_data_type, nst); } -static VALUE -stat_new(struct stat *st) +VALUE +rb_stat_new(const struct stat *st) { return stat_new_0(rb_cStat, st); } @@ -987,7 +987,7 @@ rb_file_s_stat(VALUE klass, VALUE fname) if (rb_stat(fname, &st) < 0) { rb_sys_fail_path(fname); } - return stat_new(&st); + return rb_stat_new(&st); } /* @@ -1015,7 +1015,7 @@ rb_io_stat(VALUE obj) if (fstat(fptr->fd, &st) == -1) { rb_sys_fail_path(fptr->pathv); } - return stat_new(&st); + return rb_stat_new(&st); } /* @@ -1044,7 +1044,7 @@ rb_file_s_lstat(VALUE klass, VALUE fname) if (lstat(StringValueCStr(fname), &st) == -1) { rb_sys_fail_path(fname); } - return stat_new(&st); + return rb_stat_new(&st); #else return rb_file_s_stat(klass, fname); #endif @@ -1079,7 +1079,7 @@ rb_file_lstat(VALUE obj) if (lstat(RSTRING_PTR(path), &st) == -1) { rb_sys_fail_path(fptr->pathv); } - return stat_new(&st); + return rb_stat_new(&st); #else return rb_io_stat(obj); #endif diff --git a/include/ruby/io.h b/include/ruby/io.h index bcdee3b0c0..23337679f0 100644 --- a/include/ruby/io.h +++ b/include/ruby/io.h @@ -197,6 +197,11 @@ void rb_io_read_check(rb_io_t*); int rb_io_read_pending(rb_io_t*); DEPRECATED(void rb_read_check(FILE*)); +struct stat; +VALUE rb_stat_new(const struct stat *); + +/* gc.c */ + RUBY_SYMBOL_EXPORT_END #if defined(__cplusplus) diff --git a/test/-ext-/file/test_stat.rb b/test/-ext-/file/test_stat.rb new file mode 100644 index 0000000000..b9aa132932 --- /dev/null +++ b/test/-ext-/file/test_stat.rb @@ -0,0 +1,14 @@ +require 'test/unit' +require "-test-/file" + +class Test_FileStat < Test::Unit::TestCase + def test_stat_for_fd + st = open(__FILE__) {|f| Bug::File::Stat.for_fd(f.fileno)} + assert_equal(File.stat(__FILE__), st) + end + + def test_stat_for_path + st = Bug::File::Stat.for_path(__FILE__) + assert_equal(File.stat(__FILE__), st) + end +end |