OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hurd: Support lockf at offset 0 with size 0 or 1. 

* sysdeps/mach/hurd/f_setlk.c: Include <unistd.h>.
	(__f_setlk): When whence is SEEK_CUR, use __lseek64 to convert it to
	SEEK_SET.
This commit is contained in:
Samuel Thibault 2018-11-19 20:22:30 +01:00
parent 0c7f97aead
commit b15b1a9590
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2018-11-19 Samuel Thibault <samuel.thibault@ens-lyon.org>
* sysdeps/mach/hurd/f_setlk.c: Include <unistd.h>.
(__f_setlk): When whence is SEEK_CUR, use __lseek64 to convert it to
SEEK_SET.
2018-11-19 Mao Han <han_mao@c-sky.com>
* scripts/config.guess: Update to version 2018-08-29.

13
sysdeps/mach/hurd/f_setlk.c
View File

@ -19,6 +19,7 @@
#include <sys/types.h>
#include <sys/file.h>
#include <fcntl.h>
#include <unistd.h>
#include <errno.h>
/* XXX
@ -45,6 +46,18 @@ __f_setlk (int fd, int type, int whence, __off64_t start, __off64_t len, int wai
if (cmd != LOCK_UN && wait == 0)
cmd |= LOCK_NB;
if (whence == SEEK_CUR)
{
/* In case the target position is 0, we can support it below. */
__off64_t cur = __lseek64 (fd, 0, SEEK_CUR);
if (cur >= 0)
{
start = cur + start;
whence = SEEK_SET;
}
}
switch (whence)
{
case SEEK_SET: