diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | file.c | 4 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Sat May 17 12:36:46 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * file.c (file_expand_path): rb_str_set_len is not backported. + Sat May 17 12:15:48 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * file.c (file_expand_path): support for alternative data stream @@ -2740,8 +2740,9 @@ file_expand_path(fname, dname, result) if (p == skiproot(buf) - 1) p++; buflen = p - buf; -#if USE_NTFS + RSTRING(result)->len = buflen; *p = '\0'; +#if USE_NTFS if (!strpbrk(b = buf, "*?")) { size_t len; WIN32_FIND_DATA wfd; @@ -2792,7 +2793,6 @@ file_expand_path(fname, dname, result) #endif if (tainted) OBJ_TAINT(result); - rb_str_set_len(result, buflen); return result; } @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-05-17" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080517 -#define RUBY_PATCHLEVEL 114 +#define RUBY_PATCHLEVEL 115 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |