summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-05-22 21:16:20 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-05-22 21:16:20 +0000
commitde3b68ad42b4c3850bef4356453fe8c1cbf0c41c (patch)
tree0ba65b66333d67030704d85ecd4544510dba9d5d
parent5da9f5252effa13f9351b7ef12e0e1f8c52c4243 (diff)
merge -c 12293
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@12338 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--version.h2
-rw-r--r--win32/win32.c1
3 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e4e437ca173..31e6fedbd5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 23 06:14:15 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * win32/win32.c (move_to_next_entry): loc also must move forward.
+ [ruby-talk:251987]
+
Wed May 23 05:55:04 2007 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (init_stdhandle): stderr should be without buffering,
diff --git a/version.h b/version.h
index 94c15db6091..79538323869 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2007-05-23"
#define RUBY_VERSION_CODE 185
#define RUBY_RELEASE_CODE 20070523
-#define RUBY_PATCHLEVEL 47
+#define RUBY_PATCHLEVEL 48
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
diff --git a/win32/win32.c b/win32/win32.c
index b88c136467c..e10ece507a2 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -1533,6 +1533,7 @@ static void
move_to_next_entry(DIR *dirp)
{
if (dirp->curr) {
+ dirp->loc++;
dirp->curr += strlen(dirp->curr) + 1;
if (dirp->curr >= (dirp->start + dirp->size)) {
dirp->curr = NULL;