diff options
| -rw-r--r-- | ext/etc/etc.c | 12 | ||||
| -rw-r--r-- | test/etc/test_etc.rb | 4 |
2 files changed, 16 insertions, 0 deletions
diff --git a/ext/etc/etc.c b/ext/etc/etc.c index fcbd1af1b5..6c08088710 100644 --- a/ext/etc/etc.c +++ b/ext/etc/etc.c @@ -691,6 +691,16 @@ etc_getgrent(VALUE obj) VALUE rb_w32_special_folder(int type); UINT rb_w32_system_tmpdir(WCHAR *path, UINT len); VALUE rb_w32_conv_from_wchar(const WCHAR *wstr, rb_encoding *enc); +#elif defined(LOAD_RELATIVE) +static inline VALUE +rbconfig(void) +{ + VALUE config; + rb_require("rbconfig"); + config = rb_const_get(rb_path2class("RbConfig"), rb_intern("CONFIG")); + Check_Type(config, T_HASH); + return config; +} #endif /* call-seq: @@ -710,6 +720,8 @@ etc_sysconfdir(VALUE obj) { #ifdef _WIN32 return rb_w32_special_folder(CSIDL_COMMON_APPDATA); +#elif defined(LOAD_RELATIVE) + return rb_hash_aref(rbconfig(), rb_str_new_lit("sysconfdir")); #else return rb_filesystem_str_new_cstr(SYSCONFDIR); #endif diff --git a/test/etc/test_etc.rb b/test/etc/test_etc.rb index 2eddcf49d7..c15c4f6e1e 100644 --- a/test/etc/test_etc.rb +++ b/test/etc/test_etc.rb @@ -169,6 +169,10 @@ class TestEtc < Test::Unit::TestCase assert_operator(1, :<=, n) end + def test_sysconfdir + assert_operator(File, :absolute_path?, Etc.sysconfdir) + end if File.method_defined?(:absolute_path?) + def test_ractor return unless Etc.passwd # => skip test if no platform support Etc.endpwent |