1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* dir.c (Init_Dir): add a new method File::fnmatch? along with

Browse Source 
File::Constants::FNM_*.  While I am here, FNM_NOCASE is renamed
  to FNM_CASEFOLD which is commonly used by *BSD and GNU libc.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1525 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
knu 2001-06-13 10:51:39 +00:00
parent 68ebfef615
commit 6aa71d4c80
3 changed files with 51 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Wed Jun 13 19:34:59 2001 Akinori MUSHA <knu@iDaemons.org>
* dir.c (Init_Dir): add a new method File::fnmatch? along with
File::Constants::FNM_*. While I am here, FNM_NOCASE is renamed
to FNM_CASEFOLD which is commonly used by *BSD and GNU libc.
Tue Jun 12 14:21:28 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
* lib/mkmf.rb: target_prefix is only for installation, not for

40
dir.c
View File

@ -68,7 +68,7 @@ char *strchr _((char*,char));
#define FNM_NOESCAPE 0x01
#define FNM_PATHNAME 0x02
#define FNM_PERIOD 0x04
#define FNM_NOCASE 0x08
#define FNM_CASEFOLD 0x08
#define FNM_NOMATCH 1
#define FNM_ERROR 2
@ -100,7 +100,7 @@ range(pat, test, flags)
int flags;
{
int not, ok = 0;
int nocase = flags & FNM_NOCASE;
int nocase = flags & FNM_CASEFOLD;
int escape = !(flags & FNM_NOESCAPE);
not = *pat == '!' || *pat == '^';
@ -145,7 +145,7 @@ fnmatch(pat, string, flags)
int escape = !(flags & FNM_NOESCAPE);
int pathname = flags & FNM_PATHNAME;
int period = flags & FNM_PERIOD;
int nocase = flags & FNM_NOCASE;
int nocase = flags & FNM_CASEFOLD;
while (c = *pat++) {
switch (c) {
@ -764,7 +764,7 @@ rb_globi(path, func, arg)
void (*func)();
VALUE arg;
{
glob_helper(path, FNM_PERIOD|FNM_NOCASE, func, arg);
glob_helper(path, FNM_PERIOD|FNM_CASEFOLD, func, arg);
}
static void push_pattern _((const char *path, VALUE ary));
@ -921,6 +921,30 @@ dir_entries(io, dirname)
return rb_ensure(rb_Array, dir, dir_close, dir);
}
static VALUE
file_s_fnmatch(argc, argv, obj)
int argc;
VALUE *argv;
VALUE obj;
{
VALUE pattern, path;
VALUE rflags;
int flags;
if (rb_scan_args(argc, argv, "21", &pattern, &path, &rflags) == 3)
flags = NUM2INT(rflags);
else
flags = 0;
StringValue(pattern);
StringValue(path);
if (fnmatch(RSTRING(pattern)->ptr, RSTRING(path)->ptr, flags) == 0)
return Qtrue;
return Qfalse;
}
void
Init_Dir()
{
@ -954,4 +978,12 @@ Init_Dir()
rb_define_singleton_method(rb_cDir,"glob", dir_s_glob, 1);
rb_define_singleton_method(rb_cDir,"[]", dir_s_glob, 1);
rb_define_singleton_method(rb_cFile,"fnmatch", file_s_fnmatch, -1);
rb_define_singleton_method(rb_cFile,"fnmatch?", file_s_fnmatch, -1);
rb_file_const("FNM_NOESCAPE", INT2FIX(FNM_NOESCAPE));
rb_file_const("FNM_PATHNAME", INT2FIX(FNM_PATHNAME));
rb_file_const("FNM_PERIOD", INT2FIX(FNM_PERIOD));
rb_file_const("FNM_CASEFOLD", INT2FIX(FNM_CASEFOLD));
}

9
doc/NEWS
View File

@ -1,3 +1,12 @@
: File#fnmatch, File::Constants::FNM_*
Added. Refer to the fnmatch(3) manpage for details.
e.g.
# exclude files matching "*.bak".
files.reject! { |fn| File::fnmatch?("*.bak", fn) }
: Method#==
Added.