summaryrefslogtreecommitdiff
path: root/dir.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-10-19 10:25:23 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-10-19 10:25:23 +0000
commit860bdc3b61dbcacecd4a2fb2c40cf222e91b8fd5 (patch)
tree280c20d9eec8f2500428b71e7beeeff064ad5314 /dir.c
parentdd09dfe3f0bc975db4b84a0e563bcdf862a7063b (diff)
* io.c (read_all): block string buffer modification during
rb_io_fread() by freezing it temporarily. [ruby-dev:24479] * dir.c (rb_push_glob): block call at once the end of method. [ruby-dev:24487] * ext/enumerator/enumerator.c (enum_each_slice): remove rb_gc_force_recycle() to prevent potential SEGV. [ruby-dev:24499] * ext/zlib/zlib.c (zstream_expand_buffer): hide internal string buffer by clearing klass. [ruby-dev:24510] * ext/socket/socket.c (sock_s_getservbyaname): protocol string might be altered. [ruby-dev:24503] * string.c (rb_str_upto): check if return value from succ is a string. [ruby-dev:24504] * io.c (rb_io_popen): get mode string via rb_io_flags_mode() to avoid mode string modification. [ruby-dev:24454] * io.c (rb_io_getline_fast): should take delim as unsigned char to distinguish EOF and '\377'. [ruby-dev:24460] * io.c (rb_io_getline): add check for RS modification. [ruby-dev:24461] * enum.c (enum_sort_by): use qsort() directly instead using rb_iterate(). [ruby-dev:24462] * enum.c (enum_each_with_index): remove rb_gc_force_recycle() to prevent access to recycled object (via continuation for example). [ruby-dev:24463] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7071 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'dir.c')
-rw-r--r--dir.c19
1 files changed, 6 insertions, 13 deletions
diff --git a/dir.c b/dir.c
index 6448634..2de990a 100644
--- a/dir.c
+++ b/dir.c
@@ -1119,14 +1119,7 @@ push_pattern(path, ary)
const char *path;
VALUE ary;
{
- VALUE str = rb_tainted_str_new2(path);
-
- if (ary) {
- rb_ary_push(ary, str);
- }
- else {
- rb_yield(str);
- }
+ rb_ary_push(ary, rb_tainted_str_new2(path));
}
static int
@@ -1209,11 +1202,7 @@ rb_push_glob(str, flags)
int noescape = flags & FNM_NOESCAPE;
VALUE ary;
- if (rb_block_given_p())
- ary = 0;
- else
- ary = rb_ary_new();
-
+ ary = rb_ary_new();
SafeStringValue(str);
buf = xmalloc(RSTRING(str)->len + 1);
@@ -1248,6 +1237,10 @@ rb_push_glob(str, flags)
if (status) rb_jump_tag(status);
+ if (rb_block_given_p()) {
+ rb_ary_each(ary);
+ return Qnil;
+ }
return ary;
}