Skip to content

Commit 57f8648

Browse files
committed
Auto merge of #2601 - devnexen:bsd_fcntl_fgetpath, r=JohnTitor
fcntl updates for DragonFlyBSD and NetBSD
2 parents e7517e8 + f95befa commit 57f8648

File tree

6 files changed

+8
-2
lines changed

6 files changed

+8
-2
lines changed

libc-test/semver/dragonfly.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,10 @@ FIONREAD
297297
FIOSETOWN
298298
FLUSHO
299299
FOPEN_MAX
300+
F_DUP2FD
301+
F_DUP2FD_CLOEXEC
300302
F_GETOWN
303+
F_GETPATH
301304
F_LOCK
302305
F_RDLCK
303306
F_SETOWN

libc-test/semver/netbsd.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,7 @@ FOPEN_MAX
349349
F_CLOSEM
350350
F_GETNOSIGPIPE
351351
F_GETOWN
352+
F_GETPATH
352353
F_LOCK
353354
F_MAXFD
354355
F_RDLCK

src/unix/bsd/freebsdlike/dragonfly/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -760,6 +760,7 @@ pub const O_DIRECTORY: ::c_int = 0x08000000;
760760
pub const F_GETLK: ::c_int = 7;
761761
pub const F_SETLK: ::c_int = 8;
762762
pub const F_SETLKW: ::c_int = 9;
763+
pub const F_GETPATH: ::c_int = 19;
763764
pub const ENOMEDIUM: ::c_int = 93;
764765
pub const EASYNC: ::c_int = 99;
765766
pub const ELAST: ::c_int = 99;

src/unix/bsd/freebsdlike/freebsd/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2969,8 +2969,6 @@ pub const SF_SNAPSHOT: ::c_ulong = 0x00200000;
29692969

29702970
// fcntl commands
29712971
pub const F_ADD_SEALS: ::c_int = 19;
2972-
pub const F_DUP2FD: ::c_int = 10;
2973-
pub const F_DUP2FD_CLOEXEC: ::c_int = 18;
29742972
pub const F_GET_SEALS: ::c_int = 20;
29752973
pub const F_OGETLK: ::c_int = 7;
29762974
pub const F_OSETLK: ::c_int = 8;

src/unix/bsd/freebsdlike/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -573,6 +573,8 @@ pub const F_TEST: ::c_int = 3;
573573
pub const F_TLOCK: ::c_int = 2;
574574
pub const F_ULOCK: ::c_int = 0;
575575
pub const F_DUPFD_CLOEXEC: ::c_int = 17;
576+
pub const F_DUP2FD: ::c_int = 10;
577+
pub const F_DUP2FD_CLOEXEC: ::c_int = 18;
576578
pub const SIGHUP: ::c_int = 1;
577579
pub const SIGINT: ::c_int = 2;
578580
pub const SIGQUIT: ::c_int = 3;

src/unix/bsd/netbsdlike/netbsd/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1253,6 +1253,7 @@ pub const F_CLOSEM: ::c_int = 10;
12531253
pub const F_GETNOSIGPIPE: ::c_int = 13;
12541254
pub const F_SETNOSIGPIPE: ::c_int = 14;
12551255
pub const F_MAXFD: ::c_int = 11;
1256+
pub const F_GETPATH: ::c_int = 15;
12561257

12571258
pub const IP_RECVDSTADDR: ::c_int = 7;
12581259
pub const IP_SENDSRCADDR: ::c_int = IP_RECVDSTADDR;

0 commit comments

Comments
 (0)