diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-04-11 18:12:18 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-04-11 18:12:18 +0000 |
commit | 604e88ec1582e3d8e1b547a99aea551276658f73 (patch) | |
tree | cd5b76fcb0188f9dc2d232f281a5642efe4a8cc1 | |
parent | 5da8584c52e843591f78d1d4e330a18b9b30b93d (diff) | |
download | ruby-604e88ec1582e3d8e1b547a99aea551276658f73.tar.gz ruby-604e88ec1582e3d8e1b547a99aea551276658f73.tar.xz ruby-604e88ec1582e3d8e1b547a99aea551276658f73.zip |
* file.c (rb_file_s_basename, rb_file_s_dirname, rb_file_s_extname):
copy encoding.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15978 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | file.c | 3 | ||||
-rw-r--r-- | version.h | 6 |
3 files changed, 11 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Sat Apr 12 03:12:16 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * file.c (rb_file_s_basename, rb_file_s_dirname, rb_file_s_extname): + copy encoding. + Fri Apr 11 17:35:06 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * enum.c (count_i): modified to shut warning up. @@ -2880,6 +2880,7 @@ rb_file_s_basename(int argc, VALUE *argv) } } basename = rb_str_new(p, f); + rb_enc_copy(basename, fname); OBJ_INFECT(basename, fname); return basename; } @@ -2931,6 +2932,7 @@ rb_file_s_dirname(VALUE klass, VALUE fname) if (has_drive_letter(name) && root == name + 2 && p - name == 2) rb_str_cat(dirname, ".", 1); #endif + rb_enc_copy(dirname, fname); OBJ_INFECT(dirname, fname); return dirname; } @@ -2967,6 +2969,7 @@ rb_file_s_extname(VALUE klass, VALUE fname) if (!e || e == p || !e[1]) /* no dot, or the only dot is first or end? */ return rb_str_new(0, 0); extname = rb_str_new(e, chompdirsep(e) - e); /* keep the dot, too! */ + rb_enc_copy(extname, fname); OBJ_INFECT(extname, fname); return extname; } @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2008-04-11" +#define RUBY_RELEASE_DATE "2008-04-12" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20080411 +#define RUBY_RELEASE_CODE 20080412 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 4 -#define RUBY_RELEASE_DAY 11 +#define RUBY_RELEASE_DAY 12 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |