e70fdfb99f
(pipe2): Export. * dtable.cc (dtable::dup_worker): Take additional flags parameter. Handle O_CLOEXEC flag. (dtable::dup3): Rename from dup2. Take additional flags parameter. Check for valid flags. Drop check for newfd == oldfd. * dtable.h (dtable::dup_worker): Add flags parameter. (dtable::dup3): Rename from dup2. * fcntl.cc (fcntl64): Add F_DUPFD_CLOEXEC case. * fhandler.h (fhandler_mailslot::get_object_attr): Add flags parameter. * fhandler.cc (fhandler_base::open): Use security attribute with inheritance according to setting of O_CLOEXEC flag. * fhandler_console.cc (fhandler_console::open): Ditto. * fhandler_fifo.cc (sec_user_cloexec): New inline function to create security attribute with inheritance according to setting of O_CLOEXEC flag. (fhandler_fifo::open): Call sec_user_cloexec to fetch security attribute. (fhandler_fifo::wait): Ditto. * fhandler_mem.cc (fhandler_dev_mem::open): Ditto. * fhandler_mailslot.cc (fhandler_mailslot::get_object_attr): Take additional flags parameter. Use security attribute with inheritance according to setting of O_CLOEXEC flag. (fhandler_mailslot::open): Call get_object_attr with flags parameter. * fhandler_registry.cc (fhandler_registry::open): Call set_close_on_exec on real handles to accommodate O_CLOEXEC flag. * fhandler_tty.cc (fhandler_tty_slave::open): Ditto. * fhandler_tape.cc: Create mutex with inheritance according to setting of O_CLOEXEC flag. * pipe.cc: Replace usage of O_NOINHERIT with O_CLOEXEC. (fhandler_pipe::init): Simplify setting close_on_exec flag. (fhandler_pipe::open): Remove setting close_on_exec flag. (fhandler_pipe::create): Use security attribute with inheritance according to setting of O_CLOEXEC flag. (pipe2): New exported function. * posix_ipc.cc: Throughout, open backing files with O_CLOEXEC flag to follow POSIX semantics. * security.h (sec_none_cloexec): New define. * syscalls.cc (dup): Add missing extern "C" qualifier. Accommodate renaming of dtable::dup2 to dtable::dup3. (dup2): Ditto. Check newfd == oldfd here. (dup3): New function. Check newfd == oldfd here. (open): Set close_on_exec flag according to O_CLOEXEC flag before calling fhandler->open. * include/cygwin/version.h (CYGWIN_VERSION_API_MINOR): Bump.
108 lines
2.2 KiB
C++
108 lines
2.2 KiB
C++
/* fcntl.cc: fcntl syscall
|
|
|
|
Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2008,
|
|
2009, 2010 Red Hat, Inc.
|
|
|
|
This file is part of Cygwin.
|
|
|
|
This software is a copyrighted work licensed under the terms of the
|
|
Cygwin license. Please consult the file "CYGWIN_LICENSE" for
|
|
details. */
|
|
|
|
#include "winsup.h"
|
|
#include <unistd.h>
|
|
#include "cygerrno.h"
|
|
#include "security.h"
|
|
#include "path.h"
|
|
#include "fhandler.h"
|
|
#include "dtable.h"
|
|
#include "cygheap.h"
|
|
#include "cygtls.h"
|
|
|
|
extern "C" int
|
|
fcntl64 (int fd, int cmd, ...)
|
|
{
|
|
int res = -1;
|
|
void *arg = NULL;
|
|
va_list args;
|
|
|
|
myfault efault;
|
|
if (efault.faulted (EFAULT))
|
|
return -1;
|
|
|
|
cygheap_fdget cfd (fd, true);
|
|
if (cfd < 0)
|
|
goto done;
|
|
|
|
va_start (args, cmd);
|
|
arg = va_arg (args, void *);
|
|
va_end (args);
|
|
|
|
switch (cmd)
|
|
{
|
|
case F_DUPFD:
|
|
case F_DUPFD_CLOEXEC:
|
|
if ((int) arg >= 0 && (int) arg < OPEN_MAX_MAX)
|
|
res = dup3 (fd, cygheap_fdnew (((int) arg) - 1),
|
|
cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
|
|
else
|
|
{
|
|
set_errno (EINVAL);
|
|
res = -1;
|
|
}
|
|
break;
|
|
case F_GETLK:
|
|
case F_SETLK:
|
|
case F_SETLKW:
|
|
{
|
|
struct __flock64 *fl = (struct __flock64 *) arg;
|
|
fl->l_type &= F_RDLCK | F_WRLCK | F_UNLCK;
|
|
res = cfd->lock (cmd, fl);
|
|
}
|
|
break;
|
|
default:
|
|
res = cfd->fcntl (cmd, arg);
|
|
break;
|
|
}
|
|
done:
|
|
syscall_printf ("%d = fcntl (%d, %d, %p)", res, fd, cmd, arg);
|
|
return res;
|
|
}
|
|
|
|
extern "C" int
|
|
_fcntl (int fd, int cmd, ...)
|
|
{
|
|
void *arg = NULL;
|
|
va_list args;
|
|
struct __flock32 *src = NULL;
|
|
struct __flock64 dst;
|
|
|
|
myfault efault;
|
|
if (efault.faulted (EFAULT))
|
|
return -1;
|
|
|
|
va_start (args, cmd);
|
|
arg = va_arg (args, void *);
|
|
va_end (args);
|
|
if (cmd == F_GETLK || cmd == F_SETLK || cmd == F_SETLKW)
|
|
{
|
|
src = (struct __flock32 *) arg;
|
|
dst.l_type = src->l_type;
|
|
dst.l_whence = src->l_whence;
|
|
dst.l_start = src->l_start;
|
|
dst.l_len = src->l_len;
|
|
dst.l_pid = src->l_pid;
|
|
arg = &dst;
|
|
}
|
|
int res = fcntl64 (fd, cmd, arg);
|
|
if (cmd == F_GETLK)
|
|
{
|
|
src->l_type = dst.l_type;
|
|
src->l_whence = dst.l_whence;
|
|
src->l_start = dst.l_start;
|
|
src->l_len = dst.l_len;
|
|
src->l_pid = (short) dst.l_pid;
|
|
}
|
|
return res;
|
|
}
|