mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* dir.c (glob_helper): should pass matched path. (ruby-bugs-ja:PR#333)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2858 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
563885cad6
commit
66d9f5498b
2 changed files with 4 additions and 2 deletions
|
@ -1,7 +1,9 @@
|
||||||
Thu Sep 12 17:45:15 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
|
Thu Sep 12 18:10:03 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
|
||||||
|
|
||||||
* dir.c (glob_helper): fixed freeing buffer. (ruby-bugs-ja:PR#332)
|
* dir.c (glob_helper): fixed freeing buffer. (ruby-bugs-ja:PR#332)
|
||||||
|
|
||||||
|
* dir.c (glob_helper): should pass matched path. (ruby-bugs-ja:PR#333)
|
||||||
|
|
||||||
Thu Sep 12 00:09:32 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
|
Thu Sep 12 00:09:32 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
|
||||||
|
|
||||||
* eval.c (rb_trap_eval): preserve thread status and so on.
|
* eval.c (rb_trap_eval): preserve thread status and so on.
|
||||||
|
|
2
dir.c
2
dir.c
|
@ -796,7 +796,7 @@ glob_helper(path, sub, flags, func, arg)
|
||||||
buf = ALLOC_N(char, strlen(base)+NAMLEN(dp)+2);
|
buf = ALLOC_N(char, strlen(base)+NAMLEN(dp)+2);
|
||||||
sprintf(buf, "%s%s%s", base, (BASE) ? "/" : "", dp->d_name);
|
sprintf(buf, "%s%s%s", base, (BASE) ? "/" : "", dp->d_name);
|
||||||
if (!m) {
|
if (!m) {
|
||||||
status = glob_call_func(func, path, arg);
|
status = glob_call_func(func, buf, arg);
|
||||||
free(buf);
|
free(buf);
|
||||||
if (status) goto finalize;
|
if (status) goto finalize;
|
||||||
continue;
|
continue;
|
||||||
|
|
Loading…
Reference in a new issue