summaryrefslogtreecommitdiff
path: root/dir.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-02-20 04:04:59 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-02-20 04:04:59 (GMT)
commit4f969f6eeecf2b20424eae9bb2e2755c430e9a04 (patch)
treeff4700fa6d4ad8cdfb21f97f29dbcce013dd9c11 /dir.c
parent094cfc445bf459f6e1f0523af898a6deefc8bc5f (diff)
dir.c: paths as UTF-8
* dir.c (push_pattern, push_glob): deal with read paths as UTF-8 to stat later, on Windows as well as OS X. [ruby-core:73868] [Bug #12081] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53877 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'dir.c')
-rw-r--r--dir.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/dir.c b/dir.c
index e81f438..d00b13e 100644
--- a/dir.c
+++ b/dir.c
@@ -2050,7 +2050,7 @@ rb_glob(const char *path, void (*func)(const char *, VALUE, void *), VALUE arg)
static void
push_pattern(const char *path, VALUE ary, void *enc)
{
-#ifdef __APPLE__
+#if defined _WIN32 || defined __APPLE__
VALUE name = rb_utf8_str_new_cstr(path);
rb_encoding *eenc = rb_default_internal_encoding();
OBJ_TAINT(name);
@@ -2171,7 +2171,7 @@ push_glob(VALUE ary, VALUE str, int flags)
struct push_glob_args args;
rb_encoding *enc = rb_enc_get(str);
-#ifdef __APPLE__
+#if defined _WIN32 || defined __APPLE__
str = rb_str_encode_ospath(str);
#endif
if (rb_enc_to_index(enc) == ENCINDEX_US_ASCII)
@@ -2183,7 +2183,7 @@ push_glob(VALUE ary, VALUE str, int flags)
args.glob.value = ary;
args.glob.enc = enc;
args.flags = flags;
-#ifdef __APPLE__
+#if defined _WIN32 || defined __APPLE__
enc = rb_utf8_encoding();
#endif