diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-05-22 21:16:13 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-05-22 21:16:13 +0000 |
| commit | 0360556f069c79be632fc317fa776d8d49b5f282 (patch) | |
| tree | 3e1c7c8047866af7c9e87a32ea0b707f10f10631 | |
| parent | c3fe4f1e9b323c9805f0a093ab3763ba0000d8d9 (diff) | |
| download | ruby-0360556f069c79be632fc317fa776d8d49b5f282.tar.gz ruby-0360556f069c79be632fc317fa776d8d49b5f282.tar.xz ruby-0360556f069c79be632fc317fa776d8d49b5f282.zip | |
merge -c 12293
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@12337 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | version.h | 2 | ||||
| -rw-r--r-- | win32/win32.c | 1 |
3 files changed, 7 insertions, 1 deletions
@@ -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, @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2007-05-23" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20070523 -#define RUBY_PATCHLEVEL 23 +#define RUBY_PATCHLEVEL 24 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 diff --git a/win32/win32.c b/win32/win32.c index ba0a26b60..99cec1cc9 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -1541,6 +1541,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; |