diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-09-19 08:33:01 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-09-19 08:33:01 +0000 |
commit | a1485dbea0024a5a263b40843f7af95e9c72925c (patch) | |
tree | 41ff49eb0653e30f6bc38db85622553228faf8c0 /dir.c | |
parent | bdde51172cbf2754f6bbaa9e1678fbcc3d689dba (diff) | |
download | ruby-a1485dbea0024a5a263b40843f7af95e9c72925c.tar.gz |
* dir.c (GlobPathValue), file.c (rb_get_path_check): path names
must be ASCII compatible.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25007 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'dir.c')
-rw-r--r-- | dir.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -343,7 +343,10 @@ static VALUE dir_close(VALUE); /* can contain null bytes as separators */ \ (!RB_TYPE_P(str, T_STRING) ? \ FilePathValue(str) : \ - (safe) ? (rb_check_safe_obj(str), (str)) : (str)) + (check_safe_glob(str, safe), \ + check_glob_encoding(str), (str))) +#define check_safe_glob(str, safe) ((safe) ? rb_check_safe_obj(str) : (void)0) +#define check_glob_encoding(str) rb_enc_check((str), rb_enc_from_encoding(rb_usascii_encoding())) static VALUE dir_s_alloc(VALUE klass) |