diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-05-01 00:00:37 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-05-01 00:00:37 +0000 |
commit | 4bdf9a6c61bdbd3ff9402e7dd5626648532bd8d6 (patch) | |
tree | e34d1ee93d6bd077c7f36349561d8ae12d6c3967 | |
parent | d9d40c0d797ef6e94886c2dced746eeb7c335eb1 (diff) |
* regex.c (re_match_exec): $ _always_ matches at the end of string.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3739 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | file.c | 6 | ||||
-rw-r--r-- | regex.c | 3 |
3 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Thu May 1 08:24:00 2003 Yukihiro Matsumoto <matz@ruby-lang.org> + + * regex.c (re_match_exec): $ _always_ matches at the end of string. + Wed Apr 30 14:12:00 2003 wanowa.kimura@nifty.ne.jp (kimura wataru) * net/imap.rb: support THREAD extension. @@ -2045,6 +2045,7 @@ rb_file_flock(obj, operation) if (fptr->mode & FMODE_WRITABLE) { fflush(GetWriteFile(fptr)); } + retry: TRAP_BEG; ret = flock(fileno(fptr->f), NUM2INT(operation)); TRAP_END; @@ -2056,6 +2057,11 @@ rb_file_flock(obj, operation) case EWOULDBLOCK: #endif return Qfalse; + case EINTR: +#if defined(ERESTART) + case ERESTART: +#endif + goto retry; } rb_sys_fail(fptr->path); } @@ -3883,8 +3883,7 @@ re_match_exec(bufp, string_arg, size, pos, beg, regs) case endline: if (AT_STRINGS_END(d)) { - if (size == 0 || d[-1] != '\n') - break; + break; } else if (*d == '\n') break; |