Skip to content

Commit 9105f6a

Browse files
anacrolixtgross35
authored andcommitted
Add fcntl OFD commands for macOS
Obey shellcheck ci/style.sh should be executable Require macos-14 (backport <#3563>) (cherry picked from commit 00163d2)
1 parent 38fd1c6 commit 9105f6a

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

libc-test/semver/apple.txt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,10 +256,10 @@ COPYFILE_STATE_SRC_FD
256256
COPYFILE_STATE_SRC_FILENAME
257257
COPYFILE_STATE_STATUS_CB
258258
COPYFILE_STATE_STATUS_CTX
259-
COPYFILE_STATE_XATTRNAME
260259
COPYFILE_STATE_WAS_CLONED
261-
COPYFILE_VERBOSE
260+
COPYFILE_STATE_XATTRNAME
262261
COPYFILE_UNLINK
262+
COPYFILE_VERBOSE
263263
COPYFILE_XATTR
264264
CR0
265265
CR1
@@ -441,6 +441,9 @@ F_LOG2PHYS
441441
F_LOG2PHYS_EXT
442442
F_NOCACHE
443443
F_NODIRECT
444+
F_OFD_GETLK
445+
F_OFD_SETLK
446+
F_OFD_SETLKW
444447
F_PEOFPOSMODE
445448
F_PREALLOCATE
446449
F_PUNCHHOLE
@@ -2093,19 +2096,19 @@ posix_spawn_file_actions_t
20932096
posix_spawnattr_destroy
20942097
posix_spawnattr_get_qos_class_np
20952098
posix_spawnattr_getarchpref_np
2099+
posix_spawnattr_getbinpref_np
20962100
posix_spawnattr_getflags
20972101
posix_spawnattr_getpgroup
20982102
posix_spawnattr_getsigdefault
20992103
posix_spawnattr_getsigmask
21002104
posix_spawnattr_init
21012105
posix_spawnattr_set_qos_class_np
21022106
posix_spawnattr_setarchpref_np
2107+
posix_spawnattr_setbinpref_np
21032108
posix_spawnattr_setflags
21042109
posix_spawnattr_setpgroup
21052110
posix_spawnattr_setsigdefault
21062111
posix_spawnattr_setsigmask
2107-
posix_spawnattr_getbinpref_np
2108-
posix_spawnattr_setbinpref_np
21092112
posix_spawnattr_t
21102113
posix_spawnp
21112114
preadv

src/unix/bsd/apple/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3609,6 +3609,10 @@ pub const F_GLOBAL_NOCACHE: ::c_int = 55;
36093609
pub const F_NODIRECT: ::c_int = 62;
36103610
pub const F_LOG2PHYS_EXT: ::c_int = 65;
36113611
pub const F_BARRIERFSYNC: ::c_int = 85;
3612+
// See https://github.com/apple/darwin-xnu/blob/main/bsd/sys/fcntl.h
3613+
pub const F_OFD_SETLK: ::c_int = 90; /* Acquire or release open file description lock */
3614+
pub const F_OFD_SETLKW: ::c_int = 91; /* (as F_OFD_SETLK but blocking if conflicting lock) */
3615+
pub const F_OFD_GETLK: ::c_int = 92; /* Examine OFD lock */
36123616
pub const F_PUNCHHOLE: ::c_int = 99;
36133617
pub const F_TRIM_ACTIVE_FILE: ::c_int = 100;
36143618
pub const F_SPECULATIVE_READ: ::c_int = 101;

0 commit comments

Comments
 (0)