summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-04-10 09:58:39 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-04-10 09:58:39 +0000
commitb010cccc900a12160fc6aa95c80259d6622af8fe (patch)
tree9ac8522146a943d34bce710c803519215b336805
parent19c42c0740145dec1be93c332647f4310ea19918 (diff)
* dir.c (glob_helper): should have proceed link when link->path
was non existing symbolic link. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2350 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--dir.c8
2 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 766c64a8394..72c7f3743f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-<<<<<<< ChangeLog
+Wed Apr 10 18:42:23 2002 Tachino Nobuhiro <tachino@jp.fujitsu.com>
+
+ * dir.c (glob_helper): should have proceed link when link->path
+ was non existing symbolic link.
+
Wed Apr 10 17:30:19 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
* variable.c (rb_obj_remove_instance_variable): raise NameError if
diff --git a/dir.c b/dir.c
index fcb4be7d070..6814e4a36f0 100644
--- a/dir.c
+++ b/dir.c
@@ -779,14 +779,14 @@ glob_helper(path, sub, flags, func, arg)
glob_helper(t, t+len, flags, func, arg);
free(t);
}
- tmp = link;
- link = link->next;
- free(tmp->path);
- free(tmp);
}
else {
rb_sys_warning(link->path);
}
+ tmp = link;
+ link = link->next;
+ free(tmp->path);
+ free(tmp);
}
break;
}