1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

file.c: export rb_stat_new

Browse Source 
* 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]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43107 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-10-01 11:54:53 +00:00
parent f09b772de6
commit c07c33b28a
4 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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> 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 * include/ruby/ruby.h (ruby_safe_level_4_warning): needed by extension

14
file.c
View File

@ -365,7 +365,7 @@ static const rb_data_type_t stat_data_type = {
}; };
static VALUE static VALUE
stat_new_0(VALUE klass, struct stat *st) stat_new_0(VALUE klass, const struct stat *st)
{ {
struct stat *nst = 0; 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); return TypedData_Wrap_Struct(klass, &stat_data_type, nst);
} }
static VALUE VALUE
stat_new(struct stat *st) rb_stat_new(const struct stat *st)
{ {
return stat_new_0(rb_cStat, 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) { if (rb_stat(fname, &st) < 0) {
rb_sys_fail_path(fname); 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) { if (fstat(fptr->fd, &st) == -1) {
rb_sys_fail_path(fptr->pathv); 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) { if (lstat(StringValueCStr(fname), &st) == -1) {
rb_sys_fail_path(fname); rb_sys_fail_path(fname);
} }
return stat_new(&st); return rb_stat_new(&st);
#else #else
return rb_file_s_stat(klass, fname); return rb_file_s_stat(klass, fname);
#endif #endif
@ -1079,7 +1079,7 @@ rb_file_lstat(VALUE obj)
if (lstat(RSTRING_PTR(path), &st) == -1) { if (lstat(RSTRING_PTR(path), &st) == -1) {
rb_sys_fail_path(fptr->pathv); rb_sys_fail_path(fptr->pathv);
} }
return stat_new(&st); return rb_stat_new(&st);
#else #else
return rb_io_stat(obj); return rb_io_stat(obj);
#endif #endif

5
include/ruby/io.h
View File

@ -197,6 +197,11 @@ void rb_io_read_check(rb_io_t*);
int rb_io_read_pending(rb_io_t*); int rb_io_read_pending(rb_io_t*);
DEPRECATED(void rb_read_check(FILE*)); DEPRECATED(void rb_read_check(FILE*));
struct stat;
VALUE rb_stat_new(const struct stat *);
/* gc.c */
RUBY_SYMBOL_EXPORT_END RUBY_SYMBOL_EXPORT_END
#if defined(__cplusplus) #if defined(__cplusplus)

14
test/-ext-/file/test_stat.rb Normal file
View File

@ -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