diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2013-05-08 18:18:49 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2013-05-08 18:18:49 +0000 |
| commit | 43840e901cacf50a9bb41148069e34ca307524e8 (patch) | |
| tree | 2836162f69bba2534e8b9acf9797e5892f103258 /usr/src/uts/common/sys | |
| parent | abd43b3991c3becf4fd3cc1a370aeafdc8749a30 (diff) | |
| parent | 5dbfd19ad5fcc2b779f40f80fa05c1bd28fd0b4e (diff) | |
| download | illumos-joyent-43840e901cacf50a9bb41148069e34ca307524e8.tar.gz | |
[illumos-gate merge]
commit 5dbfd19ad5fcc2b779f40f80fa05c1bd28fd0b4e
3713 Implement accept4()
3714 Implement pipe2()
3715 Implement dup3()
3716 Implement mkostemp() and mkostemps()
3719 so_socketpair syscall should preserve FD_CLOEXEC flag
commit 6136c589445a3ea081bd34ab72db1060875b6bcc
3722 link-editor is over restrictive of R_AMD64_32 addends
Conflicts:
usr/src/lib/libc/sparcv9/Makefile.com [copyright]
usr/src/lib/libc/sparc/Makefile.com [copyright]
usr/src/lib/libc/i386/Makefile.com [copyright]
Diffstat (limited to 'usr/src/uts/common/sys')
| -rw-r--r-- | usr/src/uts/common/sys/fcntl.h | 3 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/socket.h | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/usr/src/uts/common/sys/fcntl.h b/usr/src/uts/common/sys/fcntl.h index f3ca84fff1..aa74cab8b5 100644 --- a/usr/src/uts/common/sys/fcntl.h +++ b/usr/src/uts/common/sys/fcntl.h @@ -120,6 +120,9 @@ extern "C" { #define F_CHKFL 8 /* Unused */ #define F_DUP2FD 9 /* Duplicate fildes at third arg */ +#define F_DUP2FD_CLOEXEC 36 /* Like F_DUP2FD with O_CLOEXEC set */ + /* EINVAL is fildes matches arg1 */ +#define F_DUPFD_CLOEXEC 37 /* Like F_DUPFD with O_CLOEXEC set */ #define F_ISSTREAM 13 /* Is the file desc. a stream ? */ #define F_PRIV 15 /* Turn on private access to file */ diff --git a/usr/src/uts/common/sys/socket.h b/usr/src/uts/common/sys/socket.h index 0b91740d3a..2733c50faa 100644 --- a/usr/src/uts/common/sys/socket.h +++ b/usr/src/uts/common/sys/socket.h @@ -106,9 +106,11 @@ typedef void *_RESTRICT_KYWD Psocklen_t; #define SOCK_TYPE_MASK 0xffff /* type reside in these bits only */ /* - * Flags for socket() + * Flags for socket() and accept4() */ -#define SOCK_CLOEXEC 0x80000 /* like open(2) O_CLOEXEC for socket */ +#define SOCK_CLOEXEC 0x080000 /* like open(2) O_CLOEXEC for socket */ +#define SOCK_NONBLOCK 0x100000 /* like O_NONBLOCK */ +#define SOCK_NDELAY 0x200000 /* like O_NDELAY */ /* * Option flags per-socket. @@ -522,6 +524,7 @@ struct cmsghdr { #if !defined(_KERNEL) || defined(_BOOT) #ifdef __STDC__ extern int accept(int, struct sockaddr *_RESTRICT_KYWD, Psocklen_t); +extern int accept4(int, struct sockaddr *_RESTRICT_KYWD, Psocklen_t, int); extern int bind(int, const struct sockaddr *, socklen_t); extern int connect(int, const struct sockaddr *, socklen_t); extern int getpeername(int, struct sockaddr *_RESTRICT_KYWD, Psocklen_t); @@ -546,6 +549,7 @@ extern int sockatmark(int); #endif /* !defined(_XPG4_2) || defined(_XPG6) || defined(__EXTENSIONS__) */ #else /* __STDC__ */ extern int accept(); +extern int accept4(); extern int bind(); extern int connect(); extern int getpeername(); |