summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-17 03:36:48 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-17 03:36:48 +0000
commit86a6bd638447e2684c0b177a1da7509fce1cce71 (patch)
tree4c193806a1e75b47c448d073e8e86b3bc49ebfa8
parent79b596841e0fdb69ca8b47166f31557a236d1d63 (diff)
* file.c (file_expand_path): rb_str_set_len is not backported.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@16443 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--file.c4
-rw-r--r--version.h2
3 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 18ecca0..7fc5dd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/file.c b/file.c
index 44a791e..7b46291 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 dca7d57..c60ab02 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