[ruby-dev:12369] File::fnmatch? (was: Re: Dir::fnmatch?)

At Tue, 6 Mar 2001 01:01:01 +0900,
matz wrote:
> |　[ruby-dev:12229] の、 Dir::fnmatch? の追加には特に問題や反対
> |意見は出ませんでしたが、入れてしまってよいでしょうか？
> 
> 実は、Fileクラスに入るべきでは、という印象を持ってます。
> fnmatchって、たぶんfile name matchだし。

　なるほど。確かに、 basename や dirname も File に入っている
ことだし、File クラスが適当かもしれませんね。そうすると、添付の
パッチのように fnmatch() 絡みはまるごと file.c に移動した方が
よさそうです。

　また、 File クラスという分類を活かし、 File::namematch? でも
いけるようにしてみました。この方が意味明瞭ですね。


　これでどうでしょうか。

-- 
                     /
                    /__  __            Akinori.org / MUSHA.org
                   / )  )  ) )  /     FreeBSD.org / Ruby-lang.org
Akinori MUSHA aka / (_ /  ( (__(  @ iDaemons.org / and.or.jp

"We're only at home when we're on the run, on the wing, on the fly"

Index: dir.c
===================================================================
RCS file: /mirror/ruby/src/ruby/dir.c,v
retrieving revision 1.33
diff -u -r1.33 dir.c
--- dir.c	2001/02/28 06:30:03	1.33
+++ dir.c	2001/03/05 16:59:55
@@ -65,165 +65,6 @@
 #define lstat rb_sys_stat
 #endif
 
-#define FNM_NOESCAPE	0x01
-#define FNM_PATHNAME	0x02
-#define FNM_PERIOD	0x04
-#define FNM_NOCASE	0x08
-
-#define FNM_NOMATCH	1
-#define FNM_ERROR	2
-
-#define downcase(c) (nocase && ISUPPER(c) ? tolower(c) : (c))
-
-#if defined DOSISH
-#define isdirsep(c) ((c) == '/' || (c) == '\\')
-static char *
-find_dirsep(s)
-    char *s;
-{
-    while (*s) {
-	if (isdirsep(*s))
-	    return s;
-	s++;
-    }
-    return 0;
-}
-#else
-#define isdirsep(c) ((c) == '/')
-#define find_dirsep(s) strchr(s, '/')
-#endif
-
-static char *
-range(pat, test, flags)
-    char *pat;
-    char test;
-    int flags;
-{
-    int not, ok = 0;
-    int nocase = flags & FNM_NOCASE;
-    int escape = !(flags & FNM_NOESCAPE);
-
-    not = *pat == '!' || *pat == '^';
-    if (not)
-	pat++;
-
-    test = downcase(test);
-
-    while (*pat) {
-	int cstart, cend;
-	cstart = cend = *pat++;
-	if (cstart == ']')
-	    return ok == not ? 0 : pat;
-        else if (escape && cstart == '\\')
-	    cstart = cend = *pat++;
-	if (*pat == '-' && pat[1] != ']') {
-	    if (escape && pat[1] == '\\')
-		pat++;
-	    cend = pat[1];
-	    if (!cend)
-		return 0;
-	    pat += 2;
-	}
-	if (downcase(cstart) <= test && test <= downcase(cend))
-	    ok = 1;
-    }
-    return 0;
-}
-
-#define PERIOD(s) (period && *(s) == '.' && \
-		  ((s) == string || pathname && isdirsep(*(s))))
-static int
-fnmatch(pat, string, flags)
-    char *pat;
-    char *string;
-    int flags;
-{
-    int c;
-    int test;
-    char *s = string;
-    int escape = !(flags & FNM_NOESCAPE);
-    int pathname = flags & FNM_PATHNAME;
-    int period = flags & FNM_PERIOD;
-    int nocase = flags & FNM_NOCASE;
-
-    while (c = *pat++) {
-	switch (c) {
-	case '?':
-	    if (!*s || pathname && isdirsep(*s) || PERIOD(s))
-		return FNM_NOMATCH;
-	    s++;
-	    break;
-	case '*':
-	    while ((c = *pat++) == '*')
-		;
-
-	    if (PERIOD(s))
-		return FNM_NOMATCH;
-
-	    if (!c) {
-		if (pathname && find_dirsep(s))
-		    return FNM_NOMATCH;
-		else
-		    return 0;
-	    }
-	    else if (pathname && isdirsep(c)) {
-		s = find_dirsep(s);
-		if (s)
-		    break;
-		return FNM_NOMATCH;
-	    }
-
-	    test = escape && c == '\\' ? *pat : c;
-	    test = downcase(test);
-	    pat--;
-	    while (*s) {
-		if ((c == '[' || downcase(*s) == test) &&
-		    !fnmatch(pat, s, flags & ~FNM_PERIOD))
-		    return 0;
-		else if (pathname && isdirsep(*s))
-		    break;
-		s++;
-	    }
-	    return FNM_NOMATCH;
-      
-	case '[':
-	    if (!*s || pathname && isdirsep(*s) || PERIOD(s))
-		return FNM_NOMATCH;
-	    pat = range(pat, *s, flags);
-	    if (!pat)
-		return FNM_NOMATCH;
-	    s++;
-	    break;
-
-	case '\\':
-	    if (escape
-#if defined DOSISH
-		&& *pat && strchr("*?[\\", *pat)
-#endif
-		) {
-		c = *pat;
-		if (!c)
-		    c = '\\';
-		else
-		    pat++;
-	    }
-	    /* FALLTHROUGH */
-
-	default:
-#if defined DOSISH
-	    if (pathname && isdirsep(c) && isdirsep(*s))
-		;
-	    else
-#endif
-	    if(downcase(c) != downcase(*s))
-		return FNM_NOMATCH;
-	    s++;
-	    break;
-	}
-    }
-    return !*s ? 0 : FNM_NOMATCH;
-}
-
 VALUE rb_cDir;
 
 static void
@@ -666,7 +507,7 @@
 		    free(buf);
 		    continue;
 		}
-		if (fnmatch(magic, dp->d_name, flag) == 0) {
+		if (rb_fnmatch(magic, dp->d_name, flag) == 0) {
 		    buf = ALLOC_N(char, strlen(base)+NAMLEN(dp)+2);
 		    sprintf(buf, "%s%s%s", base, (BASE)?"/":"", dp->d_name);
 		    if (!m) {
Index: file.c
===================================================================
RCS file: /mirror/ruby/src/ruby/file.c,v
retrieving revision 1.48
diff -u -r1.48 file.c
--- file.c	2001/02/24 17:51:02	1.48
+++ file.c	2001/03/05 17:10:53
@@ -70,6 +70,63 @@
 #define lstat rb_sys_stat
 #endif
  
+#define downcase(c) (nocase && ISUPPER(c) ? tolower(c) : (c))
+
+#if defined DOSISH
+#define isdirsep(c) ((c) == '/' || (c) == '\\')
+static char *
+find_dirsep(s)
+    char *s;
+{
+    while (*s) {
+	if (isdirsep(*s))
+	    return s;
+	s++;
+    }
+    return 0;
+}
+#else
+#define isdirsep(c) ((c) == '/')
+#define find_dirsep(s) strchr(s, '/')
+#endif
+
+static char *
+range(pat, test, flags)
+    char *pat;
+    char test;
+    int flags;
+{
+    int not, ok = 0;
+    int nocase = flags & FNM_NOCASE;
+    int escape = !(flags & FNM_NOESCAPE);
+
+    not = *pat == '!' || *pat == '^';
+    if (not)
+	pat++;
+
+    test = downcase(test);
+
+    while (*pat) {
+	int cstart, cend;
+	cstart = cend = *pat++;
+	if (cstart == ']')
+	    return ok == not ? 0 : pat;
+        else if (escape && cstart == '\\')
+	    cstart = cend = *pat++;
+	if (*pat == '-' && pat[1] != ']') {
+	    if (escape && pat[1] == '\\')
+		pat++;
+	    cend = pat[1];
+	    if (!cend)
+		return 0;
+	    pat += 2;
+	}
+	if (downcase(cstart) <= test && test <= downcase(cend))
+	    ok = 1;
+    }
+    return 0;
+}
+
 VALUE rb_cFile;
 VALUE rb_mFileTest;
 static VALUE rb_cStat;
@@ -1493,6 +1550,123 @@
     return dirname;
 }
 
+#define PERIOD(s) (period && *(s) == '.' && \
+		  ((s) == string || pathname && isdirsep(*(s))))
+int
+rb_fnmatch(pat, string, flags)
+    char *pat;
+    char *string;
+    int flags;
+{
+    int c;
+    int test;
+    char *s = string;
+    int escape = !(flags & FNM_NOESCAPE);
+    int pathname = flags & FNM_PATHNAME;
+    int period = flags & FNM_PERIOD;
+    int nocase = flags & FNM_NOCASE;
+
+    while (c = *pat++) {
+	switch (c) {
+	case '?':
+	    if (!*s || pathname && isdirsep(*s) || PERIOD(s))
+		return FNM_NOMATCH;
+	    s++;
+	    break;
+	case '*':
+	    while ((c = *pat++) == '*')
+		;
+
+	    if (PERIOD(s))
+		return FNM_NOMATCH;
+
+	    if (!c) {
+		if (pathname && find_dirsep(s))
+		    return FNM_NOMATCH;
+		else
+		    return 0;
+	    }
+	    else if (pathname && isdirsep(c)) {
+		s = find_dirsep(s);
+		if (s)
+		    break;
+		return FNM_NOMATCH;
+	    }
+
+	    test = escape && c == '\\' ? *pat : c;
+	    test = downcase(test);
+	    pat--;
+	    while (*s) {
+		if ((c == '[' || downcase(*s) == test) &&
+		    !rb_fnmatch(pat, s, flags & ~FNM_PERIOD))
+		    return 0;
+		else if (pathname && isdirsep(*s))
+		    break;
+		s++;
+	    }
+	    return FNM_NOMATCH;
+      
+	case '[':
+	    if (!*s || pathname && isdirsep(*s) || PERIOD(s))
+		return FNM_NOMATCH;
+	    pat = range(pat, *s, flags);
+	    if (!pat)
+		return FNM_NOMATCH;
+	    s++;
+	    break;
+
+	case '\\':
+	    if (escape
+#if defined DOSISH
+		&& *pat && strchr("*?[\\", *pat)
+#endif
+		) {
+		c = *pat;
+		if (!c)
+		    c = '\\';
+		else
+		    pat++;
+	    }
+	    /* FALLTHROUGH */
+
+	default:
+#if defined DOSISH
+	    if (pathname && isdirsep(c) && isdirsep(*s))
+		;
+	    else
+#endif
+	    if(downcase(c) != downcase(*s))
+		return FNM_NOMATCH;
+	    s++;
+	    break;
+	}
+    }
+    return !*s ? 0 : FNM_NOMATCH;
+}
+
+static VALUE
+rb_file_s_fnmatch(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE pattern, string;
+    VALUE flags;
+    int f;
+
+    if (rb_scan_args(argc, argv, "21", &pattern, &string, &flags) == 3) {
+	f = NUM2INT(flags);
+    }
+    else {
+	f = 0;
+    }
+
+    if (rb_fnmatch(RSTRING(pattern)->ptr, RSTRING(string)->ptr, f) == 0)
+	return Qtrue;
+
+    return Qfalse;
+}
+
 static VALUE
 rb_file_s_split(obj, path)
     VALUE obj, path;
@@ -2309,6 +2483,8 @@
     rb_define_singleton_method(rb_cFile, "expand_path", rb_file_s_expand_path, -1);
     rb_define_singleton_method(rb_cFile, "basename", rb_file_s_basename, -1);
     rb_define_singleton_method(rb_cFile, "dirname", rb_file_s_dirname, 1);
+    rb_define_singleton_method(rb_cFile, "fnmatch?", rb_file_s_fnmatch, -1);
+    rb_define_singleton_method(rb_cFile, "namematch?", rb_file_s_fnmatch, -1);
 
     separator = rb_str_new2("/");
     rb_define_const(rb_cFile, "Separator", separator);
@@ -2338,6 +2514,10 @@
 
     rb_mFConst = rb_define_module_under(rb_cFile, "Constants");
     rb_include_module(rb_cFile, rb_mFConst);
+    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_NOCASE", INT2FIX(FNM_NOCASE));
     rb_file_const("LOCK_SH", INT2FIX(LOCK_SH));
     rb_file_const("LOCK_EX", INT2FIX(LOCK_EX));
     rb_file_const("LOCK_UN", INT2FIX(LOCK_UN));
Index: intern.h
===================================================================
RCS file: /mirror/ruby/src/ruby/intern.h,v
retrieving revision 1.41
diff -u -r1.41 intern.h
--- intern.h	2001/02/16 07:53:19	1.41
+++ intern.h	2001/03/05 16:57:08
@@ -173,8 +173,16 @@
 VALUE rb_thread_local_aset _((VALUE, ID, VALUE));
 void rb_thread_atfork _((void));
 /* file.c */
+#define FNM_NOESCAPE	0x01
+#define FNM_PATHNAME	0x02
+#define FNM_PERIOD	0x04
+#define FNM_NOCASE	0x08
+
+#define FNM_NOMATCH	1
+#define FNM_ERROR	2
 int eaccess _((const char*, int));
 VALUE rb_file_s_expand_path _((int, VALUE *));
+int rb_fnmatch _((char *, char *, int));
 void rb_file_const _((const char*, VALUE));
 char *rb_find_file _((char*));
 /* gc.c */