authorgravatar for michael.dusan@gmail.comMichael Dusan <michael.dusan@gmail.com> 2021-05-23 20:24:24-04:00
committergravatar for michael.dusan@gmail.comMichael Dusan <michael.dusan@gmail.com> 2021-05-24 10:24:41-04:00
log75cd37b8f7c88e87b889a30ce741a3c257002732
tree7eab2862cee64615e693814c49e87fbcfa5db12f
parent55811d8dac9109aa6357639908fb4f6c479480f9

dragonfly: pass `zig build test`

6 files changed, 293 insertions(+), 46 deletions(-)

lib/std/dynamic_library.zig+1-1
......@@ -19,7 +19,7 @@ const max = std.math.max;
1919pub const DynLib = switch (builtin.os.tag) {
2020 .linux => if (builtin.link_libc) DlDynlib else ElfDynLib,
2121 .windows => WindowsDynLib,
22 .macos, .tvos, .watchos, .ios, .freebsd, .openbsd => DlDynlib,
22 .macos, .tvos, .watchos, .ios, .freebsd, .openbsd, .dragonfly => DlDynlib,
2323 else => void,
2424};
2525
lib/std/fs/test.zig+16-10
......@@ -277,12 +277,15 @@ test "directory operations on files" {
277277 try testing.expectError(error.NotDir, tmp_dir.dir.openDir(test_file_name, .{}));
278278 try testing.expectError(error.NotDir, tmp_dir.dir.deleteDir(test_file_name));
279279
280 if (builtin.os.tag != .wasi and builtin.os.tag != .freebsd and builtin.os.tag != .openbsd) {
281 const absolute_path = try tmp_dir.dir.realpathAlloc(testing.allocator, test_file_name);
282 defer testing.allocator.free(absolute_path);
280 switch (builtin.os.tag) {
281 .wasi, .freebsd, .openbsd, .dragonfly => {},
282 else => {
283 const absolute_path = try tmp_dir.dir.realpathAlloc(testing.allocator, test_file_name);
284 defer testing.allocator.free(absolute_path);
283285
284 try testing.expectError(error.PathAlreadyExists, fs.makeDirAbsolute(absolute_path));
285 try testing.expectError(error.NotDir, fs.deleteDirAbsolute(absolute_path));
286 try testing.expectError(error.PathAlreadyExists, fs.makeDirAbsolute(absolute_path));
287 try testing.expectError(error.NotDir, fs.deleteDirAbsolute(absolute_path));
288 },
286289 }
287290
288291 // ensure the file still exists and is a file as a sanity check
......@@ -314,12 +317,15 @@ test "file operations on directories" {
314317 // TODO: Add a read-only test as well, see https://github.com/ziglang/zig/issues/5732
315318 try testing.expectError(error.IsDir, tmp_dir.dir.openFile(test_dir_name, .{ .write = true }));
316319
317 if (builtin.os.tag != .wasi and builtin.os.tag != .freebsd and builtin.os.tag != .openbsd) {
318 const absolute_path = try tmp_dir.dir.realpathAlloc(testing.allocator, test_dir_name);
319 defer testing.allocator.free(absolute_path);
320 switch (builtin.os.tag) {
321 .wasi, .freebsd, .openbsd, .dragonfly => {},
322 else => {
323 const absolute_path = try tmp_dir.dir.realpathAlloc(testing.allocator, test_dir_name);
324 defer testing.allocator.free(absolute_path);
320325
321 try testing.expectError(error.IsDir, fs.createFileAbsolute(absolute_path, .{}));
322 try testing.expectError(error.IsDir, fs.deleteFileAbsolute(absolute_path));
326 try testing.expectError(error.IsDir, fs.createFileAbsolute(absolute_path, .{}));
327 try testing.expectError(error.IsDir, fs.deleteFileAbsolute(absolute_path));
328 },
323329 }
324330
325331 // ensure the directory still exists as a sanity check
lib/std/os/bits/dragonfly.zig+273-32
......@@ -20,6 +20,7 @@ pub const off_t = c_long;
2020pub const mode_t = c_uint;
2121pub const uid_t = u32;
2222pub const gid_t = u32;
23pub const time_t = isize;
2324pub const suseconds_t = c_long;
2425
2526pub const ENOTSUP = EOPNOTSUPP;
......@@ -149,6 +150,21 @@ pub const MAP_TRYFIXED = 65536;
149150pub const MAP_NOCORE = 131072;
150151pub const MAP_SIZEALIGN = 262144;
151152
153pub const WNOHANG = 0x0001;
154pub const WUNTRACED = 0x0002;
155pub const WCONTINUED = 0x0004;
156pub const WSTOPPED = WUNTRACED;
157pub const WNOWAIT = 0x0008;
158pub const WEXITED = 0x0010;
159pub const WTRAPPED = 0x0020;
160
161pub const SA_ONSTACK = 0x0001;
162pub const SA_RESTART = 0x0002;
163pub const SA_RESETHAND = 0x0004;
164pub const SA_NODEFER = 0x0010;
165pub const SA_NOCLDWAIT = 0x0020;
166pub const SA_SIGINFO = 0x0040;
167
152168pub const PATH_MAX = 1024;
153169
154170pub const ino_t = c_ulong;
......@@ -375,17 +391,9 @@ pub const CLOCK_THREAD_CPUTIME_ID = 14;
375391pub const CLOCK_PROCESS_CPUTIME_ID = 15;
376392
377393pub const sockaddr = extern struct {
378 sa_len: u8,
379 sa_family: u8,
380 sa_data: [14]u8,
381};
382
383pub const sockaddr_storage = extern struct {
384394 len: u8,
385 family: sa_family_t,
386 __pad1: [5]u8,
387 __align: i64,
388 __pad2: [112]u8,
395 family: u8,
396 data: [14]u8,
389397};
390398
391399pub const Kevent = extern struct {
......@@ -486,10 +494,11 @@ pub const S_IFSOCK = 49152;
486494pub const S_IFWHT = 57344;
487495pub const S_IFMT = 61440;
488496
489pub const SIG_ERR = @intToPtr(fn (i32) callconv(.C) void, maxInt(usize));
490pub const SIG_DFL = @intToPtr(fn (i32) callconv(.C) void, 0);
491pub const SIG_IGN = @intToPtr(fn (i32) callconv(.C) void, 1);
497pub const SIG_DFL = @intToPtr(?Sigaction.sigaction_fn, 0);
498pub const SIG_IGN = @intToPtr(?Sigaction.sigaction_fn, 1);
499pub const SIG_ERR = @intToPtr(?Sigaction.sigaction_fn, maxInt(usize));
492500pub const BADSIG = SIG_ERR;
501
493502pub const SIG_BLOCK = 1;
494503pub const SIG_UNBLOCK = 2;
495504pub const SIG_SETMASK = 3;
......@@ -529,22 +538,35 @@ pub const SIGUSR2 = 31;
529538pub const SIGTHR = 32;
530539pub const SIGCKPT = 33;
531540pub const SIGCKPTEXIT = 34;
541
532542pub const siginfo_t = extern struct {
533 si_signo: c_int,
534 si_errno: c_int,
535 si_code: c_int,
536 si_pid: c_int,
537 si_uid: uid_t,
538 si_status: c_int,
539 si_addr: ?*c_void,
540 si_value: union_sigval,
541 si_band: c_long,
543 signo: c_int,
544 errno: c_int,
545 code: c_int,
546 pid: c_int,
547 uid: uid_t,
548 status: c_int,
549 addr: ?*c_void,
550 value: sigval,
551 band: c_long,
542552 __spare__: [7]c_int,
543553};
554
555pub const sigval = extern union {
556 sival_int: c_int,
557 sival_ptr: ?*c_void,
558};
559
560pub const _SIG_WORDS = 4;
561
544562pub const sigset_t = extern struct {
545 __bits: [4]c_uint,
563 __bits: [_SIG_WORDS]c_uint,
546564};
565
566pub const empty_sigset = sigset_t{ .__bits = [_]c_uint{0} ** _SIG_WORDS };
567
547568pub const sig_atomic_t = c_int;
569
548570pub const Sigaction = extern struct {
549571 pub const handler_fn = fn (c_int) callconv(.C) void;
550572 pub const sigaction_fn = fn (c_int, *const siginfo_t, ?*const c_void) callconv(.C) void;
......@@ -557,13 +579,8 @@ pub const Sigaction = extern struct {
557579 flags: c_uint,
558580 mask: sigset_t,
559581};
560pub const sig_t = [*c]fn (c_int) callconv(.C) void;
561582
562pub const sigvec = extern struct {
563 sv_handler: [*c]__sighandler_t,
564 sv_mask: c_int,
565 sv_flags: c_int,
566};
583pub const sig_t = [*c]fn (c_int) callconv(.C) void;
567584
568585pub const SOCK_STREAM = 1;
569586pub const SOCK_DGRAM = 2;
......@@ -571,8 +588,37 @@ pub const SOCK_RAW = 3;
571588pub const SOCK_RDM = 4;
572589pub const SOCK_SEQPACKET = 5;
573590pub const SOCK_MAXADDRLEN = 255;
574pub const SOCK_CLOEXEC = 268435456;
575pub const SOCK_NONBLOCK = 536870912;
591pub const SOCK_CLOEXEC = 0x10000000;
592pub const SOCK_NONBLOCK = 0x20000000;
593
594pub const SO_DEBUG = 0x0001;
595pub const SO_ACCEPTCONN = 0x0002;
596pub const SO_REUSEADDR = 0x0004;
597pub const SO_KEEPALIVE = 0x0008;
598pub const SO_DONTROUTE = 0x0010;
599pub const SO_BROADCAST = 0x0020;
600pub const SO_USELOOPBACK = 0x0040;
601pub const SO_LINGER = 0x0080;
602pub const SO_OOBINLINE = 0x0100;
603pub const SO_REUSEPORT = 0x0200;
604pub const SO_TIMESTAMP = 0x0400;
605pub const SO_NOSIGPIPE = 0x0800;
606pub const SO_ACCEPTFILTER = 0x1000;
607pub const SO_RERROR = 0x2000;
608pub const SO_PASSCRED = 0x4000;
609
610pub const SO_SNDBUF = 0x1001;
611pub const SO_RCVBUF = 0x1002;
612pub const SO_SNDLOWAT = 0x1003;
613pub const SO_RCVLOWAT = 0x1004;
614pub const SO_SNDTIMEO = 0x1005;
615pub const SO_RCVTIMEO = 0x1006;
616pub const SO_ERROR = 0x1007;
617pub const SO_TYPE = 0x1008;
618pub const SO_SNDSPACE = 0x100a;
619pub const SO_CPUHINT = 0x1030;
620
621pub const SOL_SOCKET = 0xffff;
576622
577623pub const PF_INET6 = AF_INET6;
578624pub const PF_IMPLINK = AF_IMPLINK;
......@@ -636,6 +682,7 @@ pub const AF_CNT = 21;
636682pub const AF_IPX = 23;
637683pub const AF_SIP = 24;
638684pub const AF_ISDN = 26;
685pub const AF_INET6 = 28;
639686pub const AF_NATM = 29;
640687pub const AF_ATM = 30;
641688pub const AF_NETGRAPH = 32;
......@@ -643,8 +690,78 @@ pub const AF_BLUETOOTH = 33;
643690pub const AF_MPLS = 34;
644691pub const AF_MAX = 36;
645692
693pub const in_port_t = u16;
646694pub const sa_family_t = u8;
647pub const socklen_t = c_uint;
695pub const socklen_t = u32;
696
697pub const sockaddr_storage = extern struct {
698 ss_len: u8,
699 ss_family: sa_family_t,
700 __ss_pad1: [5]u8,
701 __ss_align: i64,
702 __ss_pad2: [112]u8,
703};
704
705pub const sockaddr_in = extern struct {
706 len: u8 = @sizeOf(sockaddr_in),
707 family: sa_family_t = AF_INET,
708 port: in_port_t,
709 addr: u32,
710 zero: [8]u8 = [8]u8{ 0, 0, 0, 0, 0, 0, 0, 0 },
711};
712
713pub const sockaddr_in6 = extern struct {
714 len: u8 = @sizeOf(sockaddr_in6),
715 family: sa_family_t = AF_INET6,
716 port: in_port_t,
717 flowinfo: u32,
718 addr: [16]u8,
719 scope_id: u32,
720};
721
722pub const EAI = enum(c_int) {
723 ADDRFAMILY = 1,
724 AGAIN = 2,
725 BADFLAGS = 3,
726 FAIL = 4,
727 FAMILY = 5,
728 MEMORY = 6,
729 NODATA = 7,
730 NONAME = 8,
731 SERVICE = 9,
732 SOCKTYPE = 10,
733 SYSTEM = 11,
734 BADHINTS = 12,
735 PROTOCOL = 13,
736 OVERFLOW = 14,
737 _,
738};
739
740pub const AI_PASSIVE = 0x00000001;
741pub const AI_CANONNAME = 0x00000002;
742pub const AI_NUMERICHOST = 0x00000004;
743pub const AI_NUMERICSERV = 0x00000008;
744pub const AI_MASK = AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST | AI_NUMERICSERV | AI_ADDRCONFIG;
745pub const AI_ALL = 0x00000100;
746pub const AI_V4MAPPED_CFG = 0x00000200;
747pub const AI_ADDRCONFIG = 0x00000400;
748pub const AI_V4MAPPED = 0x00000800;
749pub const AI_DEFAULT = AI_V4MAPPED_CFG | AI_ADDRCONFIG;
750
751pub const RTLD_LAZY = 1;
752pub const RTLD_NOW = 2;
753pub const RTLD_MODEMASK = 0x3;
754pub const RTLD_GLOBAL = 0x100;
755pub const RTLD_LOCAL = 0;
756pub const RTLD_TRACE = 0x200;
757pub const RTLD_NODELETE = 0x01000;
758pub const RTLD_NOLOAD = 0x02000;
759
760pub const RTLD_NEXT = @intToPtr(*c_void, @bitCast(usize, @as(isize, -1)));
761pub const RTLD_DEFAULT = @intToPtr(*c_void, @bitCast(usize, @as(isize, -2)));
762pub const RTLD_SELF = @intToPtr(*c_void, @bitCast(usize, @as(isize, -3)));
763pub const RTLD_ALL = @intToPtr(*c_void, @bitCast(usize, @as(isize, -4)));
764
648765pub const dl_phdr_info = extern struct {
649766 dlpi_addr: usize,
650767 dlpi_name: ?[*:0]const u8,
......@@ -735,6 +852,130 @@ pub const Flock = extern struct {
735852 l_whence: c_short,
736853};
737854
855pub const addrinfo = extern struct {
856 flags: i32,
857 family: i32,
858 socktype: i32,
859 protocol: i32,
860 addrlen: socklen_t,
861 canonname: ?[*:0]u8,
862 addr: ?*sockaddr,
863 next: ?*addrinfo,
864};
865
866pub const IPPROTO_IP = 0;
867pub const IPPROTO_ICMP = 1;
868pub const IPPROTO_TCP = 6;
869pub const IPPROTO_UDP = 17;
870pub const IPPROTO_IPV6 = 41;
871pub const IPPROTO_RAW = 255;
872pub const IPPROTO_HOPOPTS = 0;
873pub const IPPROTO_IGMP = 2;
874pub const IPPROTO_GGP = 3;
875pub const IPPROTO_IPV4 = 4;
876pub const IPPROTO_IPIP = IPPROTO_IPV4;
877pub const IPPROTO_ST = 7;
878pub const IPPROTO_EGP = 8;
879pub const IPPROTO_PIGP = 9;
880pub const IPPROTO_RCCMON = 10;
881pub const IPPROTO_NVPII = 11;
882pub const IPPROTO_PUP = 12;
883pub const IPPROTO_ARGUS = 13;
884pub const IPPROTO_EMCON = 14;
885pub const IPPROTO_XNET = 15;
886pub const IPPROTO_CHAOS = 16;
887pub const IPPROTO_MUX = 18;
888pub const IPPROTO_MEAS = 19;
889pub const IPPROTO_HMP = 20;
890pub const IPPROTO_PRM = 21;
891pub const IPPROTO_IDP = 22;
892pub const IPPROTO_TRUNK1 = 23;
893pub const IPPROTO_TRUNK2 = 24;
894pub const IPPROTO_LEAF1 = 25;
895pub const IPPROTO_LEAF2 = 26;
896pub const IPPROTO_RDP = 27;
897pub const IPPROTO_IRTP = 28;
898pub const IPPROTO_TP = 29;
899pub const IPPROTO_BLT = 30;
900pub const IPPROTO_NSP = 31;
901pub const IPPROTO_INP = 32;
902pub const IPPROTO_SEP = 33;
903pub const IPPROTO_3PC = 34;
904pub const IPPROTO_IDPR = 35;
905pub const IPPROTO_XTP = 36;
906pub const IPPROTO_DDP = 37;
907pub const IPPROTO_CMTP = 38;
908pub const IPPROTO_TPXX = 39;
909pub const IPPROTO_IL = 40;
910pub const IPPROTO_SDRP = 42;
911pub const IPPROTO_ROUTING = 43;
912pub const IPPROTO_FRAGMENT = 44;
913pub const IPPROTO_IDRP = 45;
914pub const IPPROTO_RSVP = 46;
915pub const IPPROTO_GRE = 47;
916pub const IPPROTO_MHRP = 48;
917pub const IPPROTO_BHA = 49;
918pub const IPPROTO_ESP = 50;
919pub const IPPROTO_AH = 51;
920pub const IPPROTO_INLSP = 52;
921pub const IPPROTO_SWIPE = 53;
922pub const IPPROTO_NHRP = 54;
923pub const IPPROTO_MOBILE = 55;
924pub const IPPROTO_TLSP = 56;
925pub const IPPROTO_SKIP = 57;
926pub const IPPROTO_ICMPV6 = 58;
927pub const IPPROTO_NONE = 59;
928pub const IPPROTO_DSTOPTS = 60;
929pub const IPPROTO_AHIP = 61;
930pub const IPPROTO_CFTP = 62;
931pub const IPPROTO_HELLO = 63;
932pub const IPPROTO_SATEXPAK = 64;
933pub const IPPROTO_KRYPTOLAN = 65;
934pub const IPPROTO_RVD = 66;
935pub const IPPROTO_IPPC = 67;
936pub const IPPROTO_ADFS = 68;
937pub const IPPROTO_SATMON = 69;
938pub const IPPROTO_VISA = 70;
939pub const IPPROTO_IPCV = 71;
940pub const IPPROTO_CPNX = 72;
941pub const IPPROTO_CPHB = 73;
942pub const IPPROTO_WSN = 74;
943pub const IPPROTO_PVP = 75;
944pub const IPPROTO_BRSATMON = 76;
945pub const IPPROTO_ND = 77;
946pub const IPPROTO_WBMON = 78;
947pub const IPPROTO_WBEXPAK = 79;
948pub const IPPROTO_EON = 80;
949pub const IPPROTO_VMTP = 81;
950pub const IPPROTO_SVMTP = 82;
951pub const IPPROTO_VINES = 83;
952pub const IPPROTO_TTP = 84;
953pub const IPPROTO_IGP = 85;
954pub const IPPROTO_DGP = 86;
955pub const IPPROTO_TCF = 87;
956pub const IPPROTO_IGRP = 88;
957pub const IPPROTO_OSPFIGP = 89;
958pub const IPPROTO_SRPC = 90;
959pub const IPPROTO_LARP = 91;
960pub const IPPROTO_MTP = 92;
961pub const IPPROTO_AX25 = 93;
962pub const IPPROTO_IPEIP = 94;
963pub const IPPROTO_MICP = 95;
964pub const IPPROTO_SCCSP = 96;
965pub const IPPROTO_ETHERIP = 97;
966pub const IPPROTO_ENCAP = 98;
967pub const IPPROTO_APES = 99;
968pub const IPPROTO_GMTP = 100;
969pub const IPPROTO_IPCOMP = 108;
970pub const IPPROTO_PIM = 103;
971pub const IPPROTO_CARP = 112;
972pub const IPPROTO_PGM = 113;
973pub const IPPROTO_PFSYNC = 240;
974pub const IPPROTO_DIVERT = 254;
975pub const IPPROTO_MAX = 256;
976pub const IPPROTO_DONE = 257;
977pub const IPPROTO_UNKNOWN = 258;
978
738979pub const rlimit_resource = enum(c_int) {
739980 CPU = 0,
740981 FSIZE = 1,
lib/std/os/bits/freebsd.zig+1-1
......@@ -763,9 +763,9 @@ pub const winsize = extern struct {
763763
764764const NSIG = 32;
765765
766pub const SIG_ERR = @intToPtr(?Sigaction.sigaction_fn, maxInt(usize));
767766pub const SIG_DFL = @intToPtr(?Sigaction.sigaction_fn, 0);
768767pub const SIG_IGN = @intToPtr(?Sigaction.sigaction_fn, 1);
768pub const SIG_ERR = @intToPtr(?Sigaction.sigaction_fn, maxInt(usize));
769769
770770/// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.
771771pub const Sigaction = extern struct {
lib/std/os/bits/netbsd.zig+1-1
......@@ -726,9 +726,9 @@ pub const winsize = extern struct {
726726
727727const NSIG = 32;
728728
729pub const SIG_ERR = @intToPtr(?Sigaction.sigaction_fn, maxInt(usize));
730729pub const SIG_DFL = @intToPtr(?Sigaction.sigaction_fn, 0);
731730pub const SIG_IGN = @intToPtr(?Sigaction.sigaction_fn, 1);
731pub const SIG_ERR = @intToPtr(?Sigaction.sigaction_fn, maxInt(usize));
732732
733733/// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.
734734pub const Sigaction = extern struct {
lib/std/os/bits/openbsd.zig+1-1
......@@ -709,9 +709,9 @@ pub const winsize = extern struct {
709709
710710const NSIG = 33;
711711
712pub const SIG_ERR = @intToPtr(?Sigaction.sigaction_fn, maxInt(usize));
713712pub const SIG_DFL = @intToPtr(?Sigaction.sigaction_fn, 0);
714713pub const SIG_IGN = @intToPtr(?Sigaction.sigaction_fn, 1);
714pub const SIG_ERR = @intToPtr(?Sigaction.sigaction_fn, maxInt(usize));
715715pub const SIG_CATCH = @intToPtr(?Sigaction.sigaction_fn, 2);
716716pub const SIG_HOLD = @intToPtr(?Sigaction.sigaction_fn, 3);
717717