summaryrefslogtreecommitdiffstats
path: root/hash.c
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-28 19:24:18 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-28 19:24:18 +0000
commit8176a62ff210dd83b4d2db4b173b7ac0ec392a92 (patch)
tree38fcb29c8741e53f7de7a44856814bb834a17692 /hash.c
parent10735fd63591cdd788fbcc6cfd5152c6d3e34baa (diff)
downloadruby-8176a62ff210dd83b4d2db4b173b7ac0ec392a92.tar.gz
ruby-8176a62ff210dd83b4d2db4b173b7ac0ec392a92.tar.xz
ruby-8176a62ff210dd83b4d2db4b173b7ac0ec392a92.zip
* hash.c (rb_f_getenv): use rb_filesystem_str_new_cstr
instead of rb_str_new2. ENV['PATH'].encoding should be Filesystem Encoding because its content is related to filesystem. see [ruby-dev:39393] * hash.c (env_fetch): ditto. * string.c (rb_filesystem_str_new): defined. * string.c (rb_filesystem_str_new_cstr): ditto. * include/ruby/intern.h (rb_filesystem_str_new): added. * include/ruby/intern.h (rb_filesystem_str_new_cstr): ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25139 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'hash.c')
-rw-r--r--hash.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hash.c b/hash.c
index 7ddba146f..3fab523ae 100644
--- a/hash.c
+++ b/hash.c
@@ -1931,7 +1931,7 @@ rb_f_getenv(VALUE obj, VALUE name)
env = getenv(nam);
if (env) {
if (ENVMATCH(nam, PATH_ENV) && !env_path_tainted(env)) {
- VALUE str = rb_str_new2(env);
+ VALUE str = rb_filesystem_str_new_cstr(env);
rb_obj_freeze(str);
return str;
@@ -1968,7 +1968,7 @@ env_fetch(int argc, VALUE *argv)
return if_none;
}
if (ENVMATCH(nam, PATH_ENV) && !env_path_tainted(env))
- return rb_str_new2(env);
+ return rb_filesystem_str_new_cstr(env);
return env_str_new2(env);
}