summaryrefslogtreecommitdiff
path: root/file.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-05-01 00:00:37 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-05-01 00:00:37 +0000
commit4bdf9a6c61bdbd3ff9402e7dd5626648532bd8d6 (patch)
treee34d1ee93d6bd077c7f36349561d8ae12d6c3967 /file.c
parentd9d40c0d797ef6e94886c2dced746eeb7c335eb1 (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
Diffstat (limited to 'file.c')
-rw-r--r--file.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/file.c b/file.c
index 079d8cc..ca677ef 100644
--- a/file.c
+++ b/file.c
@@ -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);
}