From 7b9d68b3e2e23f9e6d0bdfc02fb32c579a569f74 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 18 Dec 2003 07:38:48 +0000 Subject: * dir.c (fnmatch): unlike find_dirsep(), rb_path_next() never return NULL. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5211 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 ++++++- dir.c | 7 +++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f6c2a248e..0d2c1faac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Dec 18 16:38:44 2003 Nobuyoshi Nakada + + * dir.c (fnmatch): unlike find_dirsep(), rb_path_next() never + return NULL. + Thu Dec 18 15:27:59 2003 WATANABE Hirofumi * lib/ipaddr.rb (IPSocket::getaddress): merge usa's patch. @@ -44,7 +49,7 @@ Tue Dec 16 21:20:47 2003 Tanaka Akira Tue Dec 16 13:20:43 2003 Hidetoshi NAGAI - * ext/tk/lib/tk.rb: condition bug of if statement on + * ext/tk/lib/tk.rb: condition bug of if statement on {pack,grid}_propagate methods Tue Dec 16 03:17:29 2003 why the lucky stiff diff --git a/dir.c b/dir.c index 857244180..73c6238c7 100644 --- a/dir.c +++ b/dir.c @@ -90,7 +90,6 @@ char *strchr _((char*,char)); #else #define isdirsep(c) ((c) == '/') #endif -#define find_dirsep(s) rb_path_next(s) static char * range(pat, test, flags) @@ -161,14 +160,14 @@ fnmatch(pat, string, flags) return FNM_NOMATCH; if (!c) { - if (pathname && find_dirsep(s)) + if (pathname && *rb_path_next(s)) return FNM_NOMATCH; else return 0; } else if (ISDIRSEP(c)) { - s = find_dirsep(s); - if (s) { + s = rb_path_next(s); + if (*s) { s++; break; } -- cgit