From de3b68ad42b4c3850bef4356453fe8c1cbf0c41c Mon Sep 17 00:00:00 2001 From: shyouhei Date: Tue, 22 May 2007 21:16:20 +0000 Subject: merge -c 12293 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@12338 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ version.h | 2 +- win32/win32.c | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e4e437ca17..31e6fedbd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed May 23 06:14:15 2007 Nobuyoshi Nakada + + * win32/win32.c (move_to_next_entry): loc also must move forward. + [ruby-talk:251987] + Wed May 23 05:55:04 2007 NAKAMURA Usaku * win32/win32.c (init_stdhandle): stderr should be without buffering, diff --git a/version.h b/version.h index 94c15db609..7953832386 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 b88c136467..e10ece507a 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; -- cgit v1.2.3