diff options
| author | Roland McGrath <roland@gnu.org> | 1999-03-19 15:32:17 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1999-03-19 15:32:17 +0000 |
| commit | 0702b5f4fb6041e8f753b871de8a7152d4103d66 (patch) | |
| tree | 738b90aa3a9c589d2ca130881f1ddb7ba1570b76 /sysdeps/mach/hurd/fcntl.c | |
| parent | 6b4bb8747ef7ff509c99635a93d3e1b78e88dc0e (diff) | |
| download | glibc-0702b5f4fb6041e8f753b871de8a7152d4103d66.tar glibc-0702b5f4fb6041e8f753b871de8a7152d4103d66.tar.gz glibc-0702b5f4fb6041e8f753b871de8a7152d4103d66.tar.bz2 glibc-0702b5f4fb6041e8f753b871de8a7152d4103d66.zip | |
1999-03-19 Roland McGrath <roland@baalperazim.frob.com>
* sysdeps/mach/hurd/fcntl.c (__fcntl: case F_GETLK,F_SETLK,F_SETLKW):
Support whole-file locking (only) by using the file_lock RPC. This
has very wrong semantics, but is better than nothing for the time
being. (Correct POSIX.1 locking will require new RPCs in the Hurd
protocols that will be somewhat hairy to specify.)
Diffstat (limited to 'sysdeps/mach/hurd/fcntl.c')
| -rw-r--r-- | sysdeps/mach/hurd/fcntl.c | 50 |
1 files changed, 46 insertions, 4 deletions
diff --git a/sysdeps/mach/hurd/fcntl.c b/sysdeps/mach/hurd/fcntl.c index b0349832a7..21ce766970 100644 --- a/sysdeps/mach/hurd/fcntl.c +++ b/sysdeps/mach/hurd/fcntl.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 93, 94, 95, 96, 97 Free Software Foundation, Inc. +/* Copyright (C) 1992,93,94,95,96,97,99 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -21,6 +21,7 @@ #include <hurd.h> #include <hurd/fd.h> #include <stdarg.h> +#include <sys/file.h> /* XXX for LOCK_* */ /* Perform file control operations on FD. */ @@ -123,10 +124,51 @@ __fcntl (int fd, int cmd, ...) case F_SETLK: case F_SETLKW: { + /* XXX + We need new RPCs to support POSIX.1 fcntl file locking!! + For the time being we support the whole-file case only, + with all kinds of WRONG WRONG WRONG semantics, + by using flock. This is definitely the Wrong Thing, + but it might be better than nothing (?). */ struct flock *fl = va_arg (ap, struct flock *); - errno = fl?ENOSYS:EINVAL; /* XXX mib needs to implement io rpcs. */ - result = -1; - break; + va_end (ap); + switch (cmd) + { + case F_GETLK: + errno = ENOSYS; + return -1; + case F_SETLK: + cmd = LOCK_NB; + break; + default: + cmd = 0; + break; + } + switch (fl->l_type) + { + case F_RDLCK: cmd |= LOCK_SH; break; + case F_WRLCK: cmd |= LOCK_EX; break; + case F_UNLCK: cmd |= LOCK_UN; break; + default: + errno = EINVAL; + return -1; + } + switch (fl->l_whence) + { + case SEEK_SET: + if (fl->l_start == 0 && fl->l_len == 0) + break; + /* FALLTHROUGH */ + case SEEK_CUR: + case SEEK_END: + errno = ENOTSUP; + return -1; + default: + errno = EINVAL; + return -1; + } + + return __flock (fd, cmd); } case F_GETFL: /* Get per-open flags. */ |