Change kqueue1() to be compatible with NetBSD

by making it accept some open(2) flags.  More precisely, only
O_CLOEXEC is supported, the flag is translated into the KQUEUE_CLOEXEC flag
for kqueuex(2), and O_NONBLOCK is silently ignored.

Reported and tested by:	vishwin
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
Differential revision:	https://reviews.freebsd.org/D39377
This commit is contained in:
Konstantin Belousov 2023-04-01 01:31:41 +03:00
parent 84b42df834
commit 54579376c0
5 changed files with 63 additions and 0 deletions

View file

@ -97,6 +97,7 @@ SRCS+= __getosreldate.c \
isinf.c \
isnan.c \
jrand48.c \
kqueue1.c \
lcong48.c \
libc_dlopen.c \
lockf.c \

View file

@ -436,6 +436,7 @@ FBSD_1.6 {
};
FBSD_1.7 {
kqueue1;
posix_spawn_file_actions_addchdir_np;
posix_spawn_file_actions_addclosefrom_np;
posix_spawn_file_actions_addfchdir_np;

52
lib/libc/gen/kqueue1.c Normal file
View file

@ -0,0 +1,52 @@
/*-
* Copyright (c) 2023 The FreeBSD Foundation
*
* This software were developed by Konstantin Belousov <kib@FreeBSD.org>
* under sponsorship from the FreeBSD Foundation.
*
* 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/param.h>
#include <sys/event.h>
#include <errno.h>
#include <fcntl.h>
/*
* Provide some NetBSD compatibility. They support a set of O_*
* flags, we only carry O_CLOEXEC, and accept but ignore O_NONBLOCK.
*/
int
kqueue1(int openflags)
{
u_int flags;
if ((openflags & ~(O_CLOEXEC | O_NONBLOCK)) != 0) {
errno = EINVAL;
return (-1);
}
flags = 0;
if ((openflags & O_CLOEXEC) != 0)
flags |= KQUEUE_CLOEXEC;
return (kqueuex(flags));
}

View file

@ -107,6 +107,14 @@ The
call is equivalent to
.Ql fd = kqueuex(0) .
.Pp
For compatibility with
.Nx ,
the
.Fn kqueue1
function is provided, which accepts the
.Dv O_CLOEXEC
flag with the expected semantic.
.Pp
The
.Fn kevent
system call

View file

@ -362,6 +362,7 @@ struct timespec;
__BEGIN_DECLS
int kqueue(void);
int kqueuex(unsigned flags);
int kqueue1(int flags);
int kevent(int kq, const struct kevent *changelist, int nchanges,
struct kevent *eventlist, int nevents,
const struct timespec *timeout);