diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-05-15 06:38:46 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-05-15 06:38:46 +0000 |
commit | b2dc4932bf9b5b77a2def58c80ccd93396b28b13 (patch) | |
tree | ed340b138673ce7cdfbbec0ebe340a36fe1f48cd | |
parent | 693599714a16c085f912dcddde16f52a18d2858b (diff) |
2000-05-15
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@691 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 12 | ||||
-rw-r--r-- | dir.c | 2 | ||||
-rw-r--r-- | ext/Setup | 4 | ||||
-rw-r--r-- | ext/md5/extconf.rb | 3 | ||||
-rw-r--r-- | io.c | 7 | ||||
-rw-r--r-- | pack.c | 2 | ||||
-rw-r--r-- | version.h | 4 |
7 files changed, 26 insertions, 8 deletions
@@ -1,3 +1,11 @@ +Mon May 15 15:38:09 2000 Yukihiro Matsumoto <matz@netlab.co.jp> + + * dir.c (glob): trailing path may be null, e.g. glob("**"). + +Mon May 15 01:18:20 2000 Yukihiro Matsumoto <matz@netlab.co.jp> + + * io.c (rb_io_s_popen): _exit after Proc execution. + Sun May 14 18:05:59 2000 WATANABE Hirofumi <eban@os.rim.or.jp> * Makefile.in: missing/nt.c -> win32/win32.c @@ -32,6 +40,10 @@ Sun May 14 00:54:43 2000 WATANABE Hirofumi <eban@os.rim.or.jp> * io.c: should check _IOBIN, O_BINARY, not PLATFORMs. +Sat May 13 14:21:15 2000 Koji Arai <JCA02266@nifty.ne.jp> + + * io.c (rb_io_s_popen): should check whether a block is given. + Fri May 12 17:33:44 2000 Yukihiro Matsumoto <matz@netlab.co.jp> * regex.c (re_compile_pattern): charset_not should not exclude @@ -589,7 +589,7 @@ glob(path, func, arg) else dir = base; magic = extract_elem(p); - if (strcmp(magic, "**") == 0) { + if (m && strcmp(magic, "**") == 0) { recursive = 1; buf = ALLOC_N(char, strlen(base)+strlen(m)+3); sprintf(buf, "%s%s%s", base, (*base)?"":".", m); @@ -10,6 +10,6 @@ #pty #sdbm #socket -#tkutil -#tcltklib +tk +tcltklib #gtk diff --git a/ext/md5/extconf.rb b/ext/md5/extconf.rb new file mode 100644 index 0000000000..a57a976a39 --- /dev/null +++ b/ext/md5/extconf.rb @@ -0,0 +1,3 @@ +require 'mkmf' +$CFLAGS += " -DHAVE_CONFIG_H" +create_makefile('md5') @@ -1592,12 +1592,15 @@ rb_io_s_popen(argc, argv, self) Check_SafeStr(pname); port = pipe_open(RSTRING(pname)->ptr, mode); if (NIL_P(port)) { + /* child */ if (!NIL_P(proc)) { rb_eval_cmd(proc, rb_ary_new2(0)); + _exit(0); } - else { - rb_yield(port); + else if (rb_iterator_p()) { + rb_yield(Qnil); } + return Qnil; } else if (rb_iterator_p()) { return rb_ensure(rb_yield, port, rb_io_close, port); @@ -1623,7 +1623,7 @@ pack_unpack(str, fmt) case 'w': { unsigned long ul = 0; - unsigned long ulmask = 0xfe << ((sizeof(unsigned long) - 1) * 8); + unsigned long ulmask = 0xfeL << ((sizeof(unsigned long) - 1) * 8); while (len > 0 && s < send) { ul <<= 7; @@ -1,4 +1,4 @@ #define RUBY_VERSION "1.5.4" -#define RUBY_RELEASE_DATE "2000-05-14" +#define RUBY_RELEASE_DATE "2000-05-15" #define RUBY_VERSION_CODE 154 -#define RUBY_RELEASE_CODE 20000514 +#define RUBY_RELEASE_CODE 20000515 |