From 66d9f5498b4da0febfc251ae8f1915a6f9df124f Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 12 Sep 2002 09:11:12 +0000 Subject: [PATCH] * 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 --- ChangeLog | 4 +++- dir.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ebd2bf88e..eae6b822d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,9 @@ -Thu Sep 12 17:45:15 2002 Nobuyoshi Nakada +Thu Sep 12 18:10:03 2002 Nobuyoshi Nakada * 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 * eval.c (rb_trap_eval): preserve thread status and so on. diff --git a/dir.c b/dir.c index 72f5fd3cd1..1886877ebe 100644 --- a/dir.c +++ b/dir.c @@ -796,7 +796,7 @@ glob_helper(path, sub, flags, func, arg) buf = ALLOC_N(char, strlen(base)+NAMLEN(dp)+2); sprintf(buf, "%s%s%s", base, (BASE) ? "/" : "", dp->d_name); if (!m) { - status = glob_call_func(func, path, arg); + status = glob_call_func(func, buf, arg); free(buf); if (status) goto finalize; continue;