diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-10-26 08:22:31 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-10-26 08:22:31 +0000 |
commit | 43294dff520647db9901b46c89b223f8dfe07741 (patch) | |
tree | 8fd9feed5cfb6403513ffc3316b171fc3664f03d | |
parent | 48e95864987fe9aeda96899e7c9c2d7347818408 (diff) | |
download | ruby-43294dff520647db9901b46c89b223f8dfe07741.tar.gz |
merge revision(s) 34397: [Backport #6881]
* file.c (append_fspath): need to set the encoding to result always.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37334 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | file.c | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Fri Oct 26 17:22:18 2012 NAKAMURA Usaku <usa@ruby-lang.org> + + * file.c (append_fspath): need to set the encoding to result always. + Fri Oct 26 11:03:46 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * file.c (rb_enc_path_next, rb_enc_path_skip_prefix) @@ -2881,7 +2881,6 @@ append_fspath(VALUE result, VALUE fname, char *dir, rb_encoding **enc, rb_encodi RSTRING_GETMEM(dirname, cwdp, dirlen); } *enc = direnc; - rb_enc_associate(result, direnc); } do {buflen *= 2;} while (dirlen > buflen); rb_str_resize(result, buflen); @@ -2889,6 +2888,7 @@ append_fspath(VALUE result, VALUE fname, char *dir, rb_encoding **enc, rb_encodi memcpy(buf, cwdp, dirlen); xfree(dir); if (!NIL_P(dirname)) rb_str_resize(dirname, 0); + rb_enc_associate(result, *enc); return buf + dirlen; } @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 304 +#define RUBY_PATCHLEVEL 305 #define RUBY_RELEASE_DATE "2012-10-26" #define RUBY_RELEASE_YEAR 2012 |