d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix lockf(3) cancellation behaviour.

Browse Source 
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
This commit is contained in:
kib 2015-12-20 11:55:39 +00:00
parent afbff2aff4
commit baa84555c9
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/libc/gen/lockf.c
View File

@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$");
#include <fcntl.h>
#include <unistd.h>
#include "un-namespace.h"
#include "libc_private.h"
int
lockf(int filedes, int function, off_t size)
@ -62,9 +63,12 @@ lockf(int filedes, int function, off_t size)
break;
case F_TEST:
fl.l_type = F_WRLCK;
if (_fcntl(filedes, F_GETLK, &fl) == -1)
if (((int (*)(int, int, ...))
__libc_interposing[INTERPOS_fcntl])(filedes, F_GETLK, &fl)
== -1)
return (-1);
if (fl.l_type == F_UNLCK || (fl.l_sysid == 0 && fl.l_pid == getpid()))
if (fl.l_type == F_UNLCK || (fl.l_sysid == 0 &&
fl.l_pid == getpid()))
return (0);
errno = EAGAIN;
return (-1);
@ -75,5 +79,6 @@ lockf(int filedes, int function, off_t size)
/* NOTREACHED */
}
return (_fcntl(filedes, cmd, &fl));
return (((int (*)(int, int, ...))
__libc_interposing[INTERPOS_fcntl])(filedes, cmd, &fl));
}