kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* dir.c (fnmatch_helper): File.fnmatch('\.', '.') should return true.

Browse source 
(Rev1.112 lost compatiblity)

* dir.c (fnmatch_helper): File.fnmatch('\/', '/', File::FNM_PATHNAME)
  should return true. (Rev1.112 lost compatiblity)

* dir.c (fnmatch): '**/' shouldn't match leading period unless
  File::FNM_DOTMATCH is set.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5955 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ocean 2004-03-16 02:24:47 +00:00
parent d641a10d27
commit 7307c01906
2 changed files with 37 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
Tue Mar 16 11:14:17 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* dir.c (fnmatch_helper): File.fnmatch('\.', '.') should return true.
(Rev1.112 lost compatiblity)
* dir.c (fnmatch_helper): File.fnmatch('\/', '/', File::FNM_PATHNAME)
should return true. (Rev1.112 lost compatiblity)
* dir.c (fnmatch): '**/' shouldn't match leading period unless
File::FNM_DOTMATCH is set.
Mon Mar 15 10:14:51 2004 GOTOU Yuuzou <gotoyuzo@notwork.org> Mon Mar 15 10:14:51 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SocketForwarder): * ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SocketForwarder):

49
dir.c
View file

@ -210,7 +210,8 @@ bracket(p, s, flags)
End marker itself won't be compared. End marker itself won't be compared.
And if function succeeds, *pcur reaches end marker. And if function succeeds, *pcur reaches end marker.
*/ */
#define ISEND(c) (!(c) || (pathname && (c) == '/')) #define UNESCAPE(p) (escape && *(p) == '\\' && (p)[1] ? (p) + 1 : (p))
#define ISEND(p) (!*(p) || (pathname && *(p) == '/'))
#define RETURN(val) return *pcur = p, *scur = s, (val); #define RETURN(val) return *pcur = p, *scur = s, (val);
static int static int
@ -220,9 +221,9 @@ fnmatch_helper(pcur, scur, flags)
int flags; int flags;
{ {
const int period = !(flags & FNM_DOTMATCH); const int period = !(flags & FNM_DOTMATCH);
const int pathname = flags & FNM_PATHNAME;
const int escape = !(flags & FNM_NOESCAPE); const int escape = !(flags & FNM_NOESCAPE);
const int nocase = flags & FNM_CASEFOLD; const int nocase = flags & FNM_CASEFOLD;
const int pathname = flags & FNM_PATHNAME;
const char *ptmp = 0; const char *ptmp = 0;
const char *stmp = 0; const char *stmp = 0;
@ -230,49 +231,51 @@ fnmatch_helper(pcur, scur, flags)
const char *p = *pcur; const char *p = *pcur;
const char *s = *scur; const char *s = *scur;
if (period && *s == '.' && *p != '.') /* leading period */ if (period && *s == '.' && *UNESCAPE(p) != '.') /* leading period */
RETURN(FNM_NOMATCH); RETURN(FNM_NOMATCH);
while (1) { while (1) {
if (*p == '*') { switch (*p) {
case '*':
do { p++; } while (*p == '*'); do { p++; } while (*p == '*');
if (ISEND(*p)) if (ISEND(UNESCAPE(p))) {
p = UNESCAPE(p);
RETURN(0); RETURN(0);
}
if (ISEND(s))
RETURN(FNM_NOMATCH);
ptmp = p; ptmp = p;
stmp = s; stmp = s;
} continue;
if (ISEND(*s)) {
RETURN(ISEND(*p) ? 0 : FNM_NOMATCH);
}
if (ISEND(*p)) {
goto failed;
}
switch (*p) {
case '?': case '?':
if (ISEND(s))
RETURN(FNM_NOMATCH);
p++; p++;
Inc(s); Inc(s);
continue; continue;
case '[': { case '[': {
const char *t = bracket(p + 1, s, flags); const char *t;
if (t) { if (ISEND(s))
RETURN(FNM_NOMATCH);
if (t = bracket(p + 1, s, flags)) {
p = t; p = t;
Inc(s); Inc(s);
continue; continue;
} }
goto failed; goto failed;
} }
case '\\':
if (escape && p[1])
p++;
break; /* goto ordinary */
} }
/* ordinary */ /* ordinary */
if (Compare(p, s) != 0) { p = UNESCAPE(p);
if (ISEND(s))
RETURN(ISEND(p) ? 0 : FNM_NOMATCH);
if (ISEND(p))
goto failed;
if (Compare(p, s) != 0)
goto failed; goto failed;
}
Inc(p); Inc(p);
Inc(s); Inc(s);
continue; continue;
@ -318,7 +321,7 @@ fnmatch(p, s, flags)
return 0; return 0;
} }
/* failed : try next recursion */ /* failed : try next recursion */
if (ptmp && stmp && !(period && *stmp == '.' && *ptmp != '.')) { if (ptmp && stmp && !(period && *stmp == '.')) {
while (*stmp && *stmp != '/') Inc(stmp); while (*stmp && *stmp != '/') Inc(stmp);
if (*stmp) { if (*stmp) {
p = ptmp; p = ptmp;