From fa0467b040ba9b25a8b6de03fef4635706f3e03b Mon Sep 17 00:00:00 2001 From: Paul Chaignon Date: Sun, 19 Nov 2023 21:53:54 +0100 Subject: sys/freebsd: use nested flag definitions where sensible These flags were identified using the same script as for sys/linux. Signed-off-by: Paul Chaignon --- sys/freebsd/ipc.txt | 6 +++--- sys/freebsd/socket_inet.txt | 2 +- sys/freebsd/socket_inet6.txt | 2 +- sys/freebsd/sys.txt | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/freebsd/ipc.txt b/sys/freebsd/ipc.txt index 5d7f8fadc..fc115f605 100644 --- a/sys/freebsd/ipc.txt +++ b/sys/freebsd/ipc.txt @@ -81,14 +81,14 @@ shmlgpgconf { pad array[const[0, int32], 10] } -msgget_flags = IPC_CREAT, IPC_EXCL, S_IRUSR, S_IWUSR, S_IXUSR, S_IRGRP, S_IWGRP, S_IXGRP, S_IROTH, S_IWOTH, S_IXOTH +msgget_flags = IPC_CREAT, IPC_EXCL, open_mode msgbuf_type = 0, 1, 2, 3 msgsnd_flags = IPC_NOWAIT msgrcv_flags = IPC_NOWAIT, MSG_NOERROR -semget_flags = IPC_CREAT, IPC_EXCL, S_IRUSR, S_IWUSR, S_IXUSR, S_IRGRP, S_IWGRP, S_IXGRP, S_IROTH, S_IWOTH, S_IXOTH +semget_flags = IPC_CREAT, IPC_EXCL, open_mode semop_flags = IPC_NOWAIT, SEM_UNDO sem_sem_id = 0, 1, 2, 3, 4 -shmget_flags = IPC_CREAT, IPC_EXCL, S_IRUSR, S_IWUSR, S_IXUSR, S_IRGRP, S_IWGRP, S_IXGRP, S_IROTH, S_IWOTH, S_IXOTH +shmget_flags = IPC_CREAT, IPC_EXCL, open_mode shmat_flags = SHM_RND, SHM_RDONLY shm_open_flags = O_RDONLY, O_RDWR, O_CREAT, O_EXCL, O_TRUNC shm_open2_flags = SHM_ALLOW_SEALING, SHM_GROW_ON_WRITE, SHM_LARGEPAGE diff --git a/sys/freebsd/socket_inet.txt b/sys/freebsd/socket_inet.txt index 92e9f417b..8c962e137 100644 --- a/sys/freebsd/socket_inet.txt +++ b/sys/freebsd/socket_inet.txt @@ -38,7 +38,7 @@ getpeername$inet(fd sock_in, peer ptr[out, sockaddr_in], peerlen ptr[inout, len[ inet_option_types_int = IP_TOS, IP_TTL, IP_HDRINCL, IP_RECVOPTS, IP_RETOPTS, IP_RECVTTL, IP_RECVTOS, IP_RECVORIGDSTADDR, IP_MINTTL -inet_option_types_buf = IP_OPTIONS, IP_IPSEC_POLICY, IP_MULTICAST_IF, IP_ADD_MEMBERSHIP, IP_DROP_MEMBERSHIP, IP_UNBLOCK_SOURCE, IP_BLOCK_SOURCE, IP_ADD_SOURCE_MEMBERSHIP, IP_DROP_SOURCE_MEMBERSHIP, IP_MSFILTER, MCAST_JOIN_GROUP, MCAST_BLOCK_SOURCE, MCAST_UNBLOCK_SOURCE, MCAST_LEAVE_GROUP, MCAST_JOIN_SOURCE_GROUP, MCAST_LEAVE_SOURCE_GROUP +inet_option_types_buf = IP_OPTIONS, IP_IPSEC_POLICY, IP_MSFILTER, MCAST_JOIN_GROUP, MCAST_LEAVE_GROUP, sockopt_opt_ip_mreq, sockopt_opt_ip_mreqsrc, sockopt_opt_group_source_req getsockopt$inet_int(fd sock_in, level const[IPPROTO_IP], optname flags[inet_option_types_int], optval ptr[out, int32], optlen ptr[inout, len[optval, int32]]) setsockopt$inet_int(fd sock_in, level const[IPPROTO_IP], optname flags[inet_option_types_int], optval ptr[in, int32], optlen len[optval]) diff --git a/sys/freebsd/socket_inet6.txt b/sys/freebsd/socket_inet6.txt index 4a271a5de..30907b9b6 100644 --- a/sys/freebsd/socket_inet6.txt +++ b/sys/freebsd/socket_inet6.txt @@ -41,7 +41,7 @@ getpeername$inet6(fd sock_in6, peer ptr[out, sockaddr_in6], peerlen ptr[inout, l inet6_option_types_int = IPV6_2292PKTINFO, IPV6_2292HOPOPTS, IPV6_2292DSTOPTS, IPV6_2292RTHDR, IPV6_CHECKSUM, IPV6_2292HOPLIMIT, IPV6_NEXTHOP, IPV6_UNICAST_HOPS, IPV6_MULTICAST_IF, IPV6_MULTICAST_HOPS, IPV6_MULTICAST_LOOP, IPV6_V6ONLY, IPV6_RECVPKTINFO, IPV6_RECVHOPLIMIT, IPV6_HOPLIMIT, IPV6_RECVHOPOPTS, IPV6_RECVRTHDR, IPV6_RECVDSTOPTS, IPV6_RECVPATHMTU, IPV6_DONTFRAG, IPV6_RECVTCLASS, IPV6_TCLASS, IPV6_AUTOFLOWLABEL, IPV6_RECVORIGDSTADDR -inet6_option_types_buf = IPV6_2292PKTOPTIONS, IPV6_IPSEC_POLICY, MCAST_JOIN_GROUP, MCAST_BLOCK_SOURCE, MCAST_UNBLOCK_SOURCE, MCAST_LEAVE_GROUP, MCAST_JOIN_SOURCE_GROUP, MCAST_LEAVE_SOURCE_GROUP, IPV6_PKTINFO, IPV6_HOPOPTS, IPV6_RTHDRDSTOPTS, IPV6_RTHDR, IPV6_DSTOPTS, IPV6_PATHMTU, MRT6_ADD_MIF, MRT6_ADD_MFC, MRT6_DEL_MFC +inet6_option_types_buf = IPV6_2292PKTOPTIONS, IPV6_IPSEC_POLICY, MCAST_JOIN_GROUP, MCAST_LEAVE_GROUP, IPV6_PKTINFO, IPV6_HOPOPTS, IPV6_RTHDRDSTOPTS, IPV6_RTHDR, IPV6_DSTOPTS, IPV6_PATHMTU, MRT6_ADD_MIF, MRT6_ADD_MFC, MRT6_DEL_MFC, sockopt_opt_group_source_req getsockopt$inet6_int(fd sock_in6, level const[IPPROTO_IPV6], optname flags[inet6_option_types_int], optval ptr[out, int32], optlen ptr[inout, len[optval, int32]]) setsockopt$inet6_int(fd sock_in6, level const[IPPROTO_IPV6], optname flags[inet6_option_types_int], optval ptr[in, int32], optlen len[optval]) diff --git a/sys/freebsd/sys.txt b/sys/freebsd/sys.txt index 49083fece..3b53a4985 100644 --- a/sys/freebsd/sys.txt +++ b/sys/freebsd/sys.txt @@ -333,7 +333,7 @@ eventfd { } pollfd_events = POLLIN, POLLPRI, POLLOUT, POLLERR, POLLHUP, POLLNVAL, POLLRDNORM, POLLRDBAND, POLLWRNORM, POLLWRBAND, POLLINIGNEOF -mknod_mode = S_IFREG, S_IFCHR, S_IFBLK, S_IFIFO, S_IFSOCK, S_IRUSR, S_IWUSR, S_IXUSR, S_IRGRP, S_IWGRP, S_IXGRP, S_IROTH, S_IWOTH, S_IXOTH +mknod_mode = S_IFREG, S_IFCHR, S_IFBLK, S_IFIFO, S_IFSOCK, open_mode at_flags = 0, AT_SYMLINK_NOFOLLOW, AT_SYMLINK_FOLLOW, AT_RESOLVE_BENEATH, AT_EMPTY_PATH linkat_flags = 0, AT_SYMLINK_FOLLOW, AT_RESOLVE_BENEATH, AT_EMPTY_PATH unlinkat_flags = 0, AT_REMOVEDIR, AT_RESOLVE_BENEATH -- cgit mrf-deployment