diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-10 20:44:10 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-10 20:44:10 +0000 |
| commit | 9962aad7b0184e385b40c26c5a109bff7abbe43c (patch) | |
| tree | 32e8a5730367d8233aea18e43a0943a03701386b /dir.c | |
| parent | 06ed1c781a86f21a10780daf93a70bf830405f13 (diff) | |
* file.c (rb_str_normalize_ospath):
HFS Plus (Mac OS Extended) uses a variant of Normal Form D in which
U+2000 through U+2FFF, U+F900 through U+FAFF, and U+2F800 through
U+2FAFF are not decomposed (this avoids problems with round trip
conversions from old Mac text encodings).
http://developer.apple.com/library/mac/qa/qa1173/_index.html
Therefore fix r42457 to exclude the range.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42498 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'dir.c')
| -rw-r--r-- | dir.c | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -84,8 +84,6 @@ char *strchr(char*,char); #include <sys/param.h> #include <sys/mount.h> -VALUE rb_str_normalize_ospath(const char *ptr, long len); - static inline int is_hfs(DIR *dirp) { @@ -1420,7 +1418,7 @@ glob_helper( name = dp->d_name; namlen = NAMLEN(dp); # if HAVE_HFS - if (hfs_p && has_nonascii(name, namlen)) { + if (0&&hfs_p && has_nonascii(name, namlen)) { if (!NIL_P(utf8str = rb_str_normalize_ospath(name, namlen))) { RSTRING_GETMEM(utf8str, name, namlen); } |