diff options
author | dfr <dfr@FreeBSD.org> | 2008-04-04 09:43:03 +0000 |
---|---|---|
committer | dfr <dfr@FreeBSD.org> | 2008-04-04 09:43:03 +0000 |
commit | fd80ed90567011195f4cda1a7de91e5a5ef490a7 (patch) | |
tree | a78227416470b24f41a3b298a4512ef5615197ab /lib | |
parent | dae02901d4b70eed4b1ba8f47235c1316e802c58 (diff) | |
download | FreeBSD-src-fd80ed90567011195f4cda1a7de91e5a5ef490a7.zip FreeBSD-src-fd80ed90567011195f4cda1a7de91e5a5ef490a7.tar.gz |
Add some compatibility code so that software which is built to use the new
struct flock with l_sysid member can work properly on an an old kernel which
doesn't support l_sysid.
Sponsored by: Isilon Systems
Diffstat (limited to 'lib')
-rw-r--r-- | lib/libc/include/libc_private.h | 3 | ||||
-rw-r--r-- | lib/libc/sys/Makefile.inc | 3 | ||||
-rw-r--r-- | lib/libc/sys/fcntl.c | 87 |
3 files changed, 92 insertions, 1 deletions
diff --git a/lib/libc/include/libc_private.h b/lib/libc/include/libc_private.h index de4bbe4..40a93bc 100644 --- a/lib/libc/include/libc_private.h +++ b/lib/libc/include/libc_private.h @@ -192,4 +192,7 @@ extern __ssize_t __sys_freebsd6_pread(int, void *, __size_t, int, __off_t); extern __ssize_t __sys_freebsd6_pwrite(int, const void *, __size_t, int, __off_t); extern void * __sys_freebsd6_mmap(void *, __size_t, int, int, int, int, __off_t); +/* Without back-compat translation */ +extern int __sys_fcntl(int, int, ...); + #endif /* _LIBC_PRIVATE_H_ */ diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc index 6673e88..c79b1c0 100644 --- a/lib/libc/sys/Makefile.inc +++ b/lib/libc/sys/Makefile.inc @@ -20,7 +20,8 @@ # Sources common to both syscall interfaces: SRCS+= stack_protector.c __error.c .if !defined(WITHOUT_SYSCALL_COMPAT) -SRCS+= ftruncate.c lseek.c mmap.c pread.c pwrite.c truncate.c +SRCS+= fcntl.c ftruncate.c lseek.c mmap.c pread.c pwrite.c truncate.c +PSEUDO+= _fcntl.o .endif # Add machine dependent asm sources: diff --git a/lib/libc/sys/fcntl.c b/lib/libc/sys/fcntl.c new file mode 100644 index 0000000..6c367ab --- /dev/null +++ b/lib/libc/sys/fcntl.c @@ -0,0 +1,87 @@ +/*- + * Copyright (c) 2008 Isilon Inc http://www.isilon.com/ + * Authors: Doug Rabson <dfr@rabson.org> + * Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org> + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +#include <fcntl.h> +#include <stdarg.h> +#include <sys/types.h> +#include <sys/syscall.h> +#include "libc_private.h" + +int +fcntl(int fd, int cmd, ...) +{ + va_list args; + long arg; + struct oflock ofl; + struct flock *flp; + int res; + + va_start(args, cmd); + arg = va_arg(args, long); + va_end(args); + + if (__getosreldate() >= 800028) { + return (__sys_fcntl(fd, cmd, arg)); + } else { + if (cmd == F_GETLK || cmd == F_SETLK || cmd == F_SETLKW) { + /* + * Convert new-style struct flock (which + * includes l_sysid) to old-style. + */ + flp = (struct flock *) (uintptr_t) arg; + ofl.l_start = flp->l_start; + ofl.l_len = flp->l_len; + ofl.l_pid = flp->l_pid; + ofl.l_type = flp->l_type; + ofl.l_whence = flp->l_whence; + + switch (cmd) { + case F_GETLK: + res = __sys_fcntl(fd, F_OGETLK, &ofl); + if (res >= 0) { + flp->l_start = ofl.l_start; + flp->l_len = ofl.l_len; + flp->l_pid = ofl.l_pid; + flp->l_type = ofl.l_type; + flp->l_whence = ofl.l_whence; + flp->l_sysid = 0; + } + return (res); + + case F_SETLK: + return (__sys_fcntl(fd, F_OSETLK, &ofl)); + + case F_SETLKW: + return (__sys_fcntl(fd, F_OSETLKW, &ofl)); + } + } + return (__sys_fcntl(fd, cmd, arg)); + } +} |