Commit 1d4e6e6c73

Andrew Kelley <andrew@ziglang.org>
2023-07-31 20:17:11
Revert "std.c: add essential freebsd's capsicum api subset."
This reverts commit 6ae19fa48d7853430ba45f2de90550cd48cf5b4c.
1 parent f96f579
Changed files (1)
lib
lib/std/c/freebsd.zig
@@ -476,43 +476,10 @@ pub const sockaddr = extern struct {
 
 pub const CAP_RIGHTS_VERSION = 0;
 
-pub const cap_rights_t = extern struct {
-    cr_rights: [CAP_RIGHTS_VERSION + 2]u64,
+pub const cap_rights = extern struct {
+    rights: [CAP_RIGHTS_VERSION + 2]u64,
 };
 
-pub const CAP = struct {
-    pub fn RIGHT(idx: u6, bit: u64) u64 {
-        return (@as(u64, @intCast(1)) << (57 + idx)) | bit;
-    }
-    pub const READ = CAP.RIGHT(0, 0x0000000000000001);
-    pub const WRITE = CAP.RIGHT(0, 0x0000000000000002);
-    pub const SEEK_TELL = CAP.RIGHT(0, 0x0000000000000004);
-    pub const SEEK = CAP.SEEK_TELL | 0x0000000000000008;
-    pub const PREAD = CAP.SEEK | CAP.READ;
-    pub const PWRITE = CAP.SEEK | CAP.WRITE;
-    pub const MMAP = CAP.RIGHT(0, 0x0000000000000010);
-    pub const MMAP_R = CAP.MMAP | CAP.SEEK | CAP.READ;
-    pub const MMAP_W = CAP.MMAP | CAP.SEEK | CAP.WRITE;
-    pub const MMAP_X = CAP.MMAP | CAP.SEEK | 0x0000000000000020;
-    pub const MMAP_RW = CAP.MMAP_R | CAP.MMAP_W;
-    pub const MMAP_RX = CAP.MMAP_R | CAP.MMAP_X;
-    pub const MMAP_WX = CAP.MMAP_W | CAP.MMAP_X;
-    pub const MMAP_RWX = CAP.MMAP_R | CAP.MMAP_W | CAP.MMAP_X;
-    pub const CREATE = CAP.RIGHT(0, 0x0000000000000040);
-    pub const FEXECVE = CAP.RIGHT(0, 0x0000000000000080);
-    pub const FSYNC = CAP.RIGHT(0, 0x0000000000000100);
-    pub const FTRUNCATE = CAP.RIGHT(0, 0x0000000000000200);
-};
-
-pub extern "c" fn __cap_rights_init(version: c_int, rights: ?*cap_rights_t, ...) ?*cap_rights_t;
-pub extern "c" fn __cap_rights_set(rights: ?*cap_rights_t, ...) ?*cap_rights_t;
-pub extern "c" fn __cap_rights_clear(rights: ?*cap_rights_t, ...) ?*cap_rights_t;
-pub extern "c" fn __cap_rights_merge(dst: ?*cap_rights_t, src: ?*const cap_rights_t) ?*cap_rights_t;
-pub extern "c" fn __cap_rights_remove(dst: ?*cap_rights_t, src: ?*const cap_rights_t) ?*cap_rights_t;
-pub extern "c" fn __cap_rights_contains(dst: ?*const cap_rights_t, src: ?*const cap_rights_t) bool;
-pub extern "c" fn __cap_rights_is_set(rights: ?*const cap_rights_t, ...) bool;
-pub extern "c" fn __cap_rights_is_valid(rights: ?*const cap_rights_t) bool;
-
 pub const kinfo_file = extern struct {
     /// Size of this record.
     /// A zero value is for the sentinel record at the end of an array.
@@ -614,7 +581,7 @@ pub const kinfo_file = extern struct {
     // Reserved for future use.
     _spare: c_int,
     /// Capability rights.
-    cap_rights: cap_rights_t,
+    cap_rights: cap_rights,
     /// Reserved for future cap_rights
     _cap_spare: u64,
     /// Path to file, if any.