mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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
This commit is contained in:
parent
1ff4571913
commit
4b0f7cecc4
3 changed files with 9 additions and 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>
|
Sat Mar 5 16:50:00 2005 NARUSE, Yui <naruse@ruby-lang.org>
|
||||||
|
|
||||||
* ext/nkf/nkf-utf8/nkf.c: follow nkf 1.65
|
* ext/nkf/nkf-utf8/nkf.c: follow nkf 1.65
|
||||||
|
|
8
dir.c
8
dir.c
|
@ -303,8 +303,6 @@ fnmatch(p, s, flags)
|
||||||
const char *ptmp = 0;
|
const char *ptmp = 0;
|
||||||
const char *stmp = 0;
|
const char *stmp = 0;
|
||||||
|
|
||||||
if (!p) p = "";
|
|
||||||
if (!s) s = "";
|
|
||||||
if (pathname) {
|
if (pathname) {
|
||||||
while (1) {
|
while (1) {
|
||||||
if (p[0] == '*' && p[1] == '*' && p[2] == '/') {
|
if (p[0] == '*' && p[1] == '*' && p[2] == '/') {
|
||||||
|
@ -1407,7 +1405,7 @@ rb_glob(path, func, arg)
|
||||||
|
|
||||||
args.func = func;
|
args.func = func;
|
||||||
args.arg = arg;
|
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);
|
if (status) rb_jump_tag(status);
|
||||||
}
|
}
|
||||||
|
@ -1574,10 +1572,6 @@ dir_s_aref(obj, str)
|
||||||
* Dir.glob("*") #=> ["config.h", "main.rb"]
|
* 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("*", File::FNM_DOTMATCH) #=> [".", "..", "config.h",
|
|
||||||
* "main.rb"]
|
|
||||||
* Dir.glob("**.rb") #=> []
|
|
||||||
*
|
|
||||||
* rbfiles = File.join("**", "*.rb")
|
* rbfiles = File.join("**", "*.rb")
|
||||||
* Dir.glob(rbfiles) #=> ["main.rb",
|
* Dir.glob(rbfiles) #=> ["main.rb",
|
||||||
* "lib/song.rb",
|
* "lib/song.rb",
|
||||||
|
|
|
@ -421,10 +421,6 @@ NtInitialize(int *argc, char ***argv)
|
||||||
WORD version;
|
WORD version;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
#ifdef __BORLANDC__
|
|
||||||
_controlfp(0x5, 0x5);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// Now set up the correct time stuff
|
// Now set up the correct time stuff
|
||||||
//
|
//
|
||||||
|
|
Loading…
Reference in a new issue