From f4d7f48ef56f3d096fcfb4f48829f022071acac3 Mon Sep 17 00:00:00 2001 From: matz Date: Fri, 25 Jan 2002 08:22:11 +0000 Subject: * class.c (rb_include_module): detect cyclic module inclusion. * eval.c (rb_thread_cleanup): need not to free thread stacks at process termination. * array.c (rb_ary_fetch): use the block to get the default value if the block is given. * eval.c (rb_thread_schedule): should check time only if BOTH WAIT_SELECT and WAIT_TIME. * eval.c (umethod_bind): should update rklass field. * hash.c (rb_hash_update): if a block is given, yields [key, value1, value2] to the block to resolve conflict. * string.c (rb_str_split_m): no need to consider KANJI characters, if the length of separator is 1 (byte). git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2015 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- dir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dir.c') diff --git a/dir.c b/dir.c index 4d4fc52d0..4f283fccf 100644 --- a/dir.c +++ b/dir.c @@ -734,7 +734,7 @@ glob_helper(path, sub, flags, func, arg) if (strcmp(".", dp->d_name) == 0 || strcmp("..", dp->d_name) == 0) continue; buf = ALLOC_N(char, strlen(base)+NAMLEN(dp)+strlen(m)+6); - sprintf(buf, "%s%s%s", base, (BASE)?"/":"", dp->d_name); + sprintf(buf, "%s%s%s", base, (BASE) ? "/" : "", dp->d_name); if (lstat(buf, &st) < 0) { if (errno != ENOENT) rb_sys_warning(buf); continue; @@ -750,7 +750,7 @@ glob_helper(path, sub, flags, func, arg) } if (fnmatch(magic, dp->d_name, flags) == 0) { 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) { (*func)(buf, arg); free(buf); -- cgit