mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
eban
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@967 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
aa806d7811
commit
75ddce9a5d
2 changed files with 11 additions and 5 deletions
|
@ -1,3 +1,7 @@
|
|||
Mon Sep 25 13:31:45 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
|
||||
|
||||
* dir.c (rb_glob): DOSISH support.
|
||||
|
||||
Mon Sep 25 00:35:01 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
|
||||
|
||||
* defines.h: #undef HAVE_SETITIMER on cygwin.
|
||||
|
|
12
dir.c
12
dir.c
|
@ -511,9 +511,11 @@ has_magic(s, send)
|
|||
return Qtrue;
|
||||
continue;
|
||||
|
||||
#if !defined DOSISH
|
||||
case '\\':
|
||||
if (*p++ == '\0')
|
||||
return Qfalse;
|
||||
#endif
|
||||
}
|
||||
|
||||
if (send && p >= send) break;
|
||||
|
@ -531,7 +533,7 @@ extract_path(p, pend)
|
|||
len = pend - p;
|
||||
alloc = ALLOC_N(char, len+1);
|
||||
memcpy(alloc, p, len);
|
||||
if (len > 1 && pend[-1] == '/') {
|
||||
if (len > 1 && isdirsep(pend[-1])) {
|
||||
alloc[len-1] = 0;
|
||||
}
|
||||
else {
|
||||
|
@ -547,7 +549,7 @@ extract_elem(path)
|
|||
{
|
||||
char *pend;
|
||||
|
||||
pend = strchr(path, '/');
|
||||
pend = find_dirsep(path);
|
||||
if (!pend) pend = path + strlen(path);
|
||||
|
||||
return extract_path(path, pend);
|
||||
|
@ -575,8 +577,8 @@ rb_glob(path, func, arg)
|
|||
|
||||
p = path;
|
||||
while (p) {
|
||||
if (*p == '/') p++;
|
||||
m = strchr(p, '/');
|
||||
if (isdirsep(*p)) p++;
|
||||
m = find_dirsep(p);
|
||||
if (has_magic(p, m)) {
|
||||
char *dir, *base, *magic, *buf;
|
||||
DIR *dirp;
|
||||
|
@ -605,7 +607,7 @@ rb_glob(path, func, arg)
|
|||
free(base);
|
||||
break;
|
||||
}
|
||||
#define BASE (*base && !(*base == '/' && !base[1]))
|
||||
#define BASE (*base && !(isdirsep(*base) && !base[1]))
|
||||
|
||||
for (dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) {
|
||||
if (recursive) {
|
||||
|
|
Loading…
Add table
Reference in a new issue