diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-11-14 18:15:22 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-11-14 18:15:22 +0000 |
| commit | 6b24178534c6c321134246d864c1bdde55800fa5 (patch) | |
| tree | df50e5396a900f6e0f8255e1b1c6bdca6406dd24 /ext | |
| parent | 49b15b2161874e8c7cbb42a1d05619ce98fb4a92 (diff) | |
merge revision(s) 56559,56582,56584,56585: [Backport #12903]
* test/ruby/test_file.rb (TestFile#test_stat): fix noatime case.
[ruby-core:77943] [Bug #12903]
* ext/-test/file/fs.c (get_atime_p): Updating of file access times
is enabled or not.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@56785 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/-test-/file/extconf.rb | 1 | ||||
| -rw-r--r-- | ext/-test-/file/fs.c | 28 |
2 files changed, 29 insertions, 0 deletions
diff --git a/ext/-test-/file/extconf.rb b/ext/-test-/file/extconf.rb index c4cfdadcaf..c1c26f215d 100644 --- a/ext/-test-/file/extconf.rb +++ b/ext/-test-/file/extconf.rb @@ -5,6 +5,7 @@ headers = %w[sys/param.h sys/mount.h sys/vfs.h].select {|h| have_header(h)} if have_type("struct statfs", headers) have_struct_member("struct statfs", "f_fstypename", headers) have_struct_member("struct statfs", "f_type", headers) + have_struct_member("struct statfs", "f_flags", headers) end headers = %w[sys/statvfs.h].select {|h| have_header(h)} diff --git a/ext/-test-/file/fs.c b/ext/-test-/file/fs.c index d3fa5350e5..c9c3473257 100644 --- a/ext/-test-/file/fs.c +++ b/ext/-test-/file/fs.c @@ -36,6 +36,12 @@ typedef struct statvfs statfs_t; # if defined HAVE_STRUCT_STATVFS_F_TYPE # define HAVE_STRUCT_STATFS_T_F_TYPE 1 # endif +#elif defined(HAVE_STRUCT_STATFS_F_TYPE) /* Linux */ +typedef struct statfs statfs_t; +# define STATFS(f, s) statfs((f), (s)) +# if defined HAVE_STRUCT_STATFS_F_TYPE +# define HAVE_STRUCT_STATFS_T_F_TYPE 1 +# endif #endif VALUE @@ -72,9 +78,31 @@ get_fsname(VALUE self, VALUE str) return Qnil; } +VALUE +get_noatime_p(VALUE self, VALUE str) +{ +#ifdef STATFS + statfs_t st; + FilePathValue(str); + str = rb_str_encode_ospath(str); + if (STATFS(StringValueCStr(str), &st) == -1) { + rb_sys_fail_str(str); + } +# ifdef HAVE_STRUCT_STATFS_F_FLAGS +# ifdef MNT_NOATIME + return st.f_flags & MNT_NOATIME ? Qtrue : Qfalse; +# elif defined(ST_NOATIME) + return st.f_flags & ST_NOATIME ? Qtrue : Qfalse; +# endif +# endif +#endif + return Qnil; +} + void Init_fs(VALUE module) { VALUE fs = rb_define_module_under(module, "Fs"); rb_define_module_function(fs, "fsname", get_fsname, 1); + rb_define_module_function(fs, "noatime?", get_noatime_p, 1); } |