diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-24 22:53:42 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-24 22:53:42 +0000 |
commit | 85738261a582ceef498b86b784171fba59bf60cc (patch) | |
tree | aa97e06f7c4474313689463864dcb672a3d93552 /dir.c | |
parent | cc07e34bfcc9675924fd0546b46eb53c3d972ab8 (diff) | |
download | ruby-85738261a582ceef498b86b784171fba59bf60cc.tar.gz |
* dir.c (dir_initialize): keep path in original encoding.
* error.c (syserr_initialize): prefer the encoding of message over
locale. [ruby-dev:45279][Bug #6071]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34794 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'dir.c')
-rw-r--r-- | dir.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -384,7 +384,7 @@ dir_initialize(int argc, VALUE *argv, VALUE dir) { struct dir_data *dp; rb_encoding *fsenc; - VALUE dirname, opt; + VALUE dirname, opt, orig; static VALUE sym_enc; if (!sym_enc) { @@ -402,7 +402,9 @@ dir_initialize(int argc, VALUE *argv, VALUE dir) } GlobPathValue(dirname, FALSE); + orig = rb_str_dup_frozen(dirname); dirname = rb_str_encode_ospath(dirname); + dirname = rb_str_dup_frozen(dirname); TypedData_Get_Struct(dir, struct dir_data, &dir_data_type, dp); if (dp->dir) closedir(dp->dir); @@ -416,10 +418,10 @@ dir_initialize(int argc, VALUE *argv, VALUE dir) dp->dir = opendir(RSTRING_PTR(dirname)); } if (dp->dir == NULL) { - rb_sys_fail_path(dirname); + rb_sys_fail_path(orig); } } - dp->path = rb_str_dup_frozen(dirname); + dp->path = orig; return dir; } |