From 500a5c34acf968b390f17cb65024858c3930d0c6 Mon Sep 17 00:00:00 2001 From: matz Date: Mon, 25 Sep 2006 14:19:57 +0000 Subject: [PATCH] * dir.c (rb_push_glob): need not to check by FilePathValue(). [ruby-dev:29599] * dir.c (dir_globs): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11023 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ dir.c | 5 ++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 45690f0beb..dd29cf1761 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Mon Sep 25 23:10:46 2006 Yukihiro Matsumoto + + * dir.c (rb_push_glob): need not to check by FilePathValue(). + [ruby-dev:29599] + + * dir.c (dir_globs): ditto. + Mon Sep 25 22:26:26 2006 Nobuyoshi Nakada * file.c (rb_path_end): skip root directory. fixed: [ruby-core:08913] diff --git a/dir.c b/dir.c index be594b439b..a7d85f9f5a 100644 --- a/dir.c +++ b/dir.c @@ -1497,8 +1497,7 @@ rb_push_glob(VALUE str, int flags) /* '\0' is delimiter */ long offset = 0; VALUE ary; - FilePathValue(str); - + StringValue(str); ary = rb_ary_new(); while (offset < RSTRING_LEN(str)) { @@ -1526,7 +1525,7 @@ dir_globs(long argc, VALUE *argv, int flags) for (i = 0; i < argc; ++i) { int status; VALUE str = argv[i]; - FilePathValue(str); + StringValue(str); status = push_glob(ary, RSTRING_PTR(str), flags); if (status) rb_jump_tag(status); }