From ad116a92b0b20ec293ac41f56d6d9b82edee27e3 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 17 May 2008 03:36:48 +0000 Subject: * file.c (file_expand_path): rb_str_set_len is not backported. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@16443 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ file.c | 4 ++-- version.h | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 18ecca07b..7fc5dd588 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sat May 17 12:36:46 2008 Nobuyoshi Nakada + + * file.c (file_expand_path): rb_str_set_len is not backported. + Sat May 17 12:15:48 2008 Nobuyoshi Nakada * file.c (file_expand_path): support for alternative data stream diff --git a/file.c b/file.c index 44a791e9d..7b4629115 100644 --- a/file.c +++ b/file.c @@ -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; } diff --git a/version.h b/version.h index dca7d573b..c60ab020f 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit