summaryrefslogtreecommitdiff
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
commite0af046ad04127f419b2b9696694eb2efca130fc (patch)
tree38fcb29c8741e53f7de7a44856814bb834a17692
parentff504d3cc96bf315b06c988c080ab47121ce3c41 (diff)
* 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@25139 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog18
-rw-r--r--hash.c4
-rw-r--r--include/ruby/intern.h2
-rw-r--r--string.c12
4 files changed, 34 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a9a62ad2fb..f8ace75b2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+Tue Sep 29 04:07:58 2009 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * 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.
+
Tue Sep 29 04:06:18 2009 NARUSE, Yui <naruse@ruby-lang.org>
* include/ruby/st.h: include inttypes.h and stdint.h.
diff --git a/hash.c b/hash.c
index 7ddba146fa..3fab523ae5 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);
}
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
index b829c2741b..9a5a9d8a46 100644
--- a/include/ruby/intern.h
+++ b/include/ruby/intern.h
@@ -601,6 +601,8 @@ VALUE rb_external_str_new(const char*, long);
VALUE rb_external_str_new_cstr(const char*);
VALUE rb_locale_str_new(const char*, long);
VALUE rb_locale_str_new_cstr(const char*);
+VALUE rb_filesystem_str_new(const char*, long);
+VALUE rb_filesystem_str_new_cstr(const char*);
VALUE rb_str_buf_new(long);
VALUE rb_str_buf_new_cstr(const char*);
VALUE rb_str_buf_new2(const char*);
diff --git a/string.c b/string.c
index a70bbaab5e..35a4253d2b 100644
--- a/string.c
+++ b/string.c
@@ -575,6 +575,18 @@ rb_locale_str_new_cstr(const char *ptr)
}
VALUE
+rb_filesystem_str_new(const char *ptr, long len)
+{
+ return rb_external_str_new_with_enc(ptr, len, rb_filesystem_encoding());
+}
+
+VALUE
+rb_filesystem_str_new_cstr(const char *ptr)
+{
+ return rb_external_str_new_with_enc(ptr, strlen(ptr), rb_filesystem_encoding());
+}
+
+VALUE
rb_str_export(VALUE str)
{
return rb_str_conv_enc(str, STR_ENC_GET(str), rb_default_external_encoding());