summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-18 14:59:29 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-18 14:59:29 +0000
commit06e52ba57b62d2661b4cab842b583fb4137e44de (patch)
treed51d003f5da74fd9cfd9983474ea93b788ec81cb
parent1aa21e630faab9d1d99f686d98e9b951c0b39488 (diff)
* dir.c (GlobPathValue): adjust return types. based on a patch
from Naohisa Goto at [ruby-dev:39350]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25002 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--dir.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7a4eeeb87ac..08b23546d74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep 18 23:59:27 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * dir.c (GlobPathValue): adjust return types. based on a patch
+ from Naohisa Goto at [ruby-dev:39350].
+
Fri Sep 18 23:51:17 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* marshal.c (r_object0): entry regexp object before its encoding
diff --git a/dir.c b/dir.c
index 55c1608c5e1..293386349eb 100644
--- a/dir.c
+++ b/dir.c
@@ -343,7 +343,7 @@ static VALUE dir_close(VALUE);
/* can contain null bytes as separators */ \
(!RB_TYPE_P(str, T_STRING) ? \
FilePathValue(str) : \
- (safe) ? rb_check_safe_obj(str) : (str))
+ (safe) ? (rb_check_safe_obj(str), (str)) : (str))
static VALUE
dir_s_alloc(VALUE klass)