archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-19 02:23:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) 18301:

Browse source 
* win32/win32.c (rb_w32_telldir): just returns loc.
	* win32/win32.c (rb_w32_rewinddir): needs to intialize loc.
	  [ruby-core:18041]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@21294 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2009-01-03 19:49:11 +00:00
parent c98501e706
commit 15f2a7e97c
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Sun Jan 4 04:49:01 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/win32.c (rb_w32_telldir): just returns loc.
* win32/win32.c (rb_w32_rewinddir): needs to intialize loc.
[ruby-core:18041]
Sun Jan 4 04:45:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Sun Jan 4 04:45:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/win32.c (rb_w32_select): recalc the rest of timeout for each * win32/win32.c (rb_w32_select): recalc the rest of timeout for each

2
version.h
View file

@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2009-01-04" #define RUBY_RELEASE_DATE "2009-01-04"
#define RUBY_VERSION_CODE 187 #define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20090104 #define RUBY_RELEASE_CODE 20090104
#define RUBY_PATCHLEVEL 75 #define RUBY_PATCHLEVEL 76
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_MINOR 8

11
win32/win32.c
View file

@ -1635,15 +1635,7 @@ rb_w32_readdir(DIR *dirp)
long long
rb_w32_telldir(DIR *dirp) rb_w32_telldir(DIR *dirp)
{ {
long loc = 0; char *p = dirp->curr; return dirp->loc;
rb_w32_rewinddir(dirp);
while (p != dirp->curr) {
move_to_next_entry(dirp); loc++;
}
return loc;
} }
// //
@ -1668,6 +1660,7 @@ void
rb_w32_rewinddir(DIR *dirp) rb_w32_rewinddir(DIR *dirp)
{ {
dirp->curr = dirp->start; dirp->curr = dirp->start;
dirp->loc = 0;
} }
// //