diff options
| author | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-03-05 09:30:24 +0000 |
|---|---|---|
| committer | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-03-05 09:30:24 +0000 |
| commit | 4b0f7cecc41ec1ae015eed42bd0b82538e8b9408 (patch) | |
| tree | c182adeccb735ca3b281c9db1afd58b1ce38319d | |
| parent | 1ff45719130e7224b07e9625963248f9c408bdd7 (diff) | |
* dir.c (rb_glob): fixed mismatch of argument.
* dir.c (fnmatch): removed unnecessary code. (by string.c 1.219)
* win32/win32.c (NtInitialize): ditto. (by numeric.c 1.117)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8078 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | dir.c | 8 | ||||
| -rw-r--r-- | win32/win32.c | 4 |
3 files changed, 9 insertions, 11 deletions
@@ -1,3 +1,11 @@ +Sat Mar 5 17:48:31 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> + + * dir.c (rb_glob): fixed mismatch of argument. + + * dir.c (fnmatch): removed unnecessary code. (by string.c 1.219) + + * win32/win32.c (NtInitialize): ditto. (by numeric.c 1.117) + Sat Mar 5 16:50:00 2005 NARUSE, Yui <naruse@ruby-lang.org> * ext/nkf/nkf-utf8/nkf.c: follow nkf 1.65 @@ -303,8 +303,6 @@ fnmatch(p, s, flags) const char *ptmp = 0; const char *stmp = 0; - if (!p) p = ""; - if (!s) s = ""; if (pathname) { while (1) { if (p[0] == '*' && p[1] == '*' && p[2] == '/') { @@ -1407,7 +1405,7 @@ rb_glob(path, func, arg) args.func = func; args.arg = arg; - status = rb_glob2(rb_str_new2(path), 0, rb_glob_caller, &args); + status = rb_glob2(rb_str_new2(path), 0, 0, rb_glob_caller, &args); if (status) rb_jump_tag(status); } @@ -1574,10 +1572,6 @@ dir_s_aref(obj, str) * Dir.glob("*") #=> ["config.h", "main.rb"] * Dir.glob("*", File::FNM_DOTMATCH) #=> [".", "..", "config.h", "main.rb"] * - * Dir.glob("*", File::FNM_DOTMATCH) #=> [".", "..", "config.h", - * "main.rb"] - * Dir.glob("**.rb") #=> [] - * * rbfiles = File.join("**", "*.rb") * Dir.glob(rbfiles) #=> ["main.rb", * "lib/song.rb", diff --git a/win32/win32.c b/win32/win32.c index 98ce51b719..d8d5dae027 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -421,10 +421,6 @@ NtInitialize(int *argc, char ***argv) WORD version; int ret; -#ifdef __BORLANDC__ - _controlfp(0x5, 0x5); -#endif - // // Now set up the correct time stuff // |