diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-08 08:50:56 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-08 08:50:56 +0000 |
commit | 88566f08b7f9294706b6ef786cd6d57bd6aa5e5c (patch) | |
tree | 1af1d0434b15cf77cab045e19f10eed5649df416 /file.c | |
parent | d8665830b746d0f1c4f622a9a90a0c6568e13e20 (diff) |
* file.c (append_fspath): filesystem encoding is prior to the encoding
of argument.
* file.c (rb_file_expand_path_internal, EXPAND_PATH_BUFFER): ignore
the encoding of the given path name, use filesystem encoding always
instead. [ruby-dev:39393] [Bug #2154]
* test/ruby/test_file_exhaustive.rb: removed 2.0 spec tests.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37562 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'file.c')
-rw-r--r-- | file.c | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -2875,7 +2875,7 @@ append_fspath(VALUE result, VALUE fname, char *dir, rb_encoding **enc, rb_encodi size_t dirlen = strlen(dir), buflen = rb_str_capacity(result); if (*enc != fsenc) { - rb_encoding *direnc = rb_enc_check(fname, dirname = rb_enc_str_new(dir, dirlen, fsenc)); + rb_encoding *direnc = rb_enc_check(dirname = rb_enc_str_new(dir, dirlen, fsenc), fname); if (direnc != fsenc) { dirname = rb_str_conv_enc(dirname, fsenc, direnc); RSTRING_GETMEM(dirname, cwdp, dirlen); @@ -2980,7 +2980,7 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na else if (!rb_is_absolute_path(s)) { if (!NIL_P(dname)) { rb_file_expand_path_internal(dname, Qnil, abs_mode, long_name, result); - rb_enc_associate(result, rb_enc_check(result, fname)); + rb_enc_check(result, fname); BUFINIT(); p = pend; } @@ -3009,7 +3009,7 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na BUFCHECK(bdiff >= buflen); memset(buf, '/', len); rb_str_set_len(result, len); - rb_enc_associate(result, rb_enc_check(result, fname)); + rb_enc_check(result, fname); } if (p > buf && p[-1] == '/') --p; @@ -3228,13 +3228,12 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na if (tainted) OBJ_TAINT(result); rb_str_set_len(result, p - buf); - rb_enc_check(fname, result); ENC_CODERANGE_CLEAR(result); return result; } #endif /* _WIN32 */ -#define EXPAND_PATH_BUFFER() rb_usascii_str_new(0, MAXPATHLEN + 2) +#define EXPAND_PATH_BUFFER() rb_enc_str_new(0, MAXPATHLEN + 2, rb_filesystem_encoding()) #define check_expand_path_args(fname, dname) \ (((fname) = rb_get_path(fname)), \ |