aboutsummaryrefslogtreecommitdiffstats
path: root/dir.c
diff options
context:
space:
mode:
Diffstat (limited to 'dir.c')
-rw-r--r--dir.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/dir.c b/dir.c
index 17f0347bfe..b516ef2752 100644
--- a/dir.c
+++ b/dir.c
@@ -303,8 +303,6 @@ fnmatch(p, s, flags)
const char *ptmp = 0;
const char *stmp = 0;
- if (!p) p = "";
- if (!s) s = "";
if (pathname) {
while (1) {
if (p[0] == '*' && p[1] == '*' && p[2] == '/') {
@@ -1407,7 +1405,7 @@ rb_glob(path, func, arg)
args.func = func;
args.arg = arg;
- status = rb_glob2(rb_str_new2(path), 0, rb_glob_caller, &args);
+ status = rb_glob2(rb_str_new2(path), 0, 0, rb_glob_caller, &args);
if (status) rb_jump_tag(status);
}
@@ -1574,10 +1572,6 @@ dir_s_aref(obj, str)
* Dir.glob("*") #=> ["config.h", "main.rb"]
* Dir.glob("*", File::FNM_DOTMATCH) #=> [".", "..", "config.h", "main.rb"]
*
- * Dir.glob("*", File::FNM_DOTMATCH) #=> [".", "..", "config.h",
- * "main.rb"]
- * Dir.glob("**.rb") #=> []
- *
* rbfiles = File.join("**", "*.rb")
* Dir.glob(rbfiles) #=> ["main.rb",
* "lib/song.rb",