Skip to content

Commit

Permalink
dir.c: match in UTF-8
Browse files Browse the repository at this point in the history
* dir.c (push_glob): match in UTF-8 on Mac OS X.
  [ruby-dev:48213] [Bug #9825]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45904 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
nobu committed May 10, 2014
1 parent 6add061 commit 1f30b74
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
@@ -1,3 +1,8 @@
Sat May 10 22:37:56 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>

* dir.c (push_glob): match in UTF-8 on Mac OS X.
[ruby-dev:48213] [Bug #9825]

Sat May 10 13:32:18 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>

* thread.c (thread_start_func_2): stop if forked in a sub-thread,
Expand Down
6 changes: 6 additions & 0 deletions dir.c
Expand Up @@ -1745,10 +1745,16 @@ static int
push_glob(VALUE ary, VALUE str, int flags)
{
struct glob_args args;
#ifdef __APPLE__
rb_encoding *enc = rb_utf8_encoding();

str = rb_str_encode_ospath(str);
#else
rb_encoding *enc = rb_enc_get(str);

if (enc == rb_usascii_encoding()) enc = rb_filesystem_encoding();
if (enc == rb_usascii_encoding()) enc = rb_ascii8bit_encoding();
#endif
args.func = push_pattern;
args.value = ary;
args.enc = enc;
Expand Down

0 comments on commit 1f30b74

Please sign in to comment.