2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7def108602..4aebf8bed2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon May 26 16:46:19 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* file.c (ntfs_tail): filename which starts with '.' is valid.
+
+	* file.c (file_expand_path): cygwin symlink support.
+
 Mon May 26 10:21:24 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* marshal.c (dump_ensure, load_ensure): should return values.
diff --git a/file.c b/file.c
index ba00e9d34a..94e421fc82 100644
--- a/file.c
+++ b/file.c
@@ -2474,6 +2474,7 @@ rb_path_end(path)
 static char *
 ntfs_tail(const char *path)
 {
+    while (*path == '.') path++;
     while (*path && *path != ':') {
 	if (istrailinggabage(*path)) {
 	    const char *last = path++;
@@ -2784,7 +2785,7 @@ file_expand_path(fname, dname, result)
 #ifdef __CYGWIN__
 	    if (lnk_added && len > 4 &&
 		strcasecmp(wfd.cFileName + len - 4, ".lnk") == 0) {
-		len -= 4;
+		wfd.cFileName[len -= 4] = '\0';
 	    }
 #endif
 	    if (!p) p = buf;