From 1583efda69622b9c7809419a4320f4e8ea6fd4e3 Mon Sep 17 00:00:00 2001
From: Euan Torano <euantorano@gmail.com>
Date: Fri, 2 Aug 2019 15:44:58 +0100
Subject: [PATCH] Fix call to S_ISCHR and implement for Mac

---
 std/os.zig             |  4 ++--
 std/os/bits/darwin.zig | 50 ++++++++++++++++++++++++++++++++++++++++++
 std/os/darwin.zig      |  1 +
 3 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/std/os.zig b/std/os.zig
index da1d71d6fc..ce240bb956 100644
--- a/std/os.zig
+++ b/std/os.zig
@@ -134,8 +134,8 @@ fn getRandomBytesDevURandom(buf: []u8) !void {
     defer close(fd);
 
     const st = try fstat(fd);
-    if (!S_ISCHR(st.mode)) {
-        return OpenError.Unexpected;
+    if (!system.S_ISCHR(st.mode)) {
+        return error.Unexpected;
     }
 
     const stream = &std.fs.File.openHandle(fd).inStream().stream;
diff --git a/std/os/bits/darwin.zig b/std/os/bits/darwin.zig
index b8d229dbe9..dd4d46287e 100644
--- a/std/os/bits/darwin.zig
+++ b/std/os/bits/darwin.zig
@@ -1116,3 +1116,53 @@ pub const stack_t = extern struct {
     ss_size: isize,
     ss_flags: i32,
 };
+
+pub const S_IFMT = 0o170000;
+
+pub const S_IFIFO = 0o010000;
+pub const S_IFCHR = 0o020000;
+pub const S_IFDIR = 0o040000;
+pub const S_IFBLK = 0o060000;
+pub const S_IFREG = 0o100000;
+pub const S_IFLNK = 0o120000;
+pub const S_IFSOCK = 0o140000;
+pub const S_IFWHT = 0o160000;
+
+pub const S_ISUID = 0o4000;
+pub const S_ISGID = 0o2000;
+pub const S_ISVTX = 0o1000;
+pub const S_IRUSR = 0o400;
+pub const S_IWUSR = 0o200;
+pub const S_IXUSR = 0o100;
+
+pub fn S_ISFIFO(m: u32) bool {
+    return m & S_IFMT == S_IFIFO;
+}
+
+pub fn S_ISCHR(m: u32) bool {
+    return m & S_IFMT == S_IFCHR;
+}
+
+pub fn S_ISDIR(m: u32) bool {
+    return m & S_IFMT == S_IFDIR;
+}
+
+pub fn S_ISBLK(m: u32) bool {
+    return m & S_IFMT == S_IFBLK;
+}
+
+pub fn S_ISREG(m: u32) bool {
+    return m & S_IFMT == S_IFREG;
+}
+
+pub fn S_ISLNK(m: u32) bool {
+    return m & S_IFMT == S_IFLNK;
+}
+
+pub fn S_ISSOCK(m: u32) bool {
+    return m & S_IFMT == S_IFSOCK;
+}
+
+pub fn S_IWHT(m: u32) bool {
+    return m & S_IFMT == S_IFWHT;
+}
diff --git a/std/os/darwin.zig b/std/os/darwin.zig
index 67ce9a06cf..c2b6801e22 100644
--- a/std/os/darwin.zig
+++ b/std/os/darwin.zig
@@ -5,3 +5,4 @@ pub const is_the_target = switch (builtin.os) {
     else => false,
 };
 pub usingnamespace std.c;
+pub usingnamespace @import("bits.zig");
\ No newline at end of file