summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-11-10 10:48:01 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-11-10 10:48:01 +0000
commitb9d454b52c729cd1f475923bf27b116c3edf0044 (patch)
tree68cbc031177c64bc4ec5c22f866ff03b0372eb3c
parentdf6547cb7f160eaa3bc69d41a055b2c33ffc0e93 (diff)
downloadruby-b9d454b52c729cd1f475923bf27b116c3edf0044.tar.gz
ruby-b9d454b52c729cd1f475923bf27b116c3edf0044.tar.xz
ruby-b9d454b52c729cd1f475923bf27b116c3edf0044.zip
* dir.c (glob_helper): path is a string object now.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7243 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--dir.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d4f2a68d3..b8d4a1c06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Nov 10 19:47:55 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * dir.c (glob_helper): path is a string object now.
+
Wed Nov 10 12:31:21 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* README.EXT (Example): extconf.rb is indispensable now.
diff --git a/dir.c b/dir.c
index 0c2252237..1e03d412f 100644
--- a/dir.c
+++ b/dir.c
@@ -1233,7 +1233,7 @@ glob_helper(path, dirsep, exist, isdir, beg, end, flags, func, arg)
if (RSTRING(path)->len > 0) {
if (match_all && exist == UNKNOWN) {
- if (do_lstat(path, &st) == 0) {
+ if (do_lstat(RSTRING(path)->ptr, &st) == 0) {
exist = YES;
isdir = S_ISDIR(st.st_mode) ? YES : S_ISLNK(st.st_mode) ? UNKNOWN : NO;
}
@@ -1244,7 +1244,7 @@ glob_helper(path, dirsep, exist, isdir, beg, end, flags, func, arg)
}
if (match_dir && isdir == UNKNOWN) {
- if (do_stat(path, &st) == 0) {
+ if (do_stat(RSTRING(path)->ptr, &st) == 0) {
exist = YES;
isdir = S_ISDIR(st.st_mode) ? YES : NO;
}