From e63daca92e959495be347525415ef1e520b01f44 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Wed, 11 Sep 2019 21:21:00 -0400
Subject: linux implementation of std.net.getHostName

---
 std/os.zig | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'std/os.zig')

diff --git a/std/os.zig b/std/os.zig
index b32c8a0b7e..63e6338f81 100644
--- a/std/os.zig
+++ b/std/os.zig
@@ -2688,6 +2688,28 @@ pub fn futimens(fd: fd_t, times: *const [2]timespec) FutimensError!void {
     }
 }
 
+pub const GetHostNameError = error{Unexpected};
+
+pub fn gethostname(name_buffer: *[HOST_NAME_MAX]u8) GetHostNameError![]u8 {
+    if (builtin.link_libc) {
+        @compileError("TODO implement gethostname when linking libc");
+    }
+    if (linux.is_the_target) {
+        var uts: utsname = undefined;
+        switch (errno(system.uname(&uts))) {
+            0 => {
+                const hostname = mem.toSlice(u8, &uts.nodename);
+                mem.copy(u8, name_buffer, hostname);
+                return name_buffer[0..hostname.len];
+            },
+            EFAULT => unreachable,
+            else => |err| return unexpectedErrno(err),
+        }
+    }
+
+    @compileError("TODO implement gethostname for this OS");
+}
+
 test "" {
     _ = @import("os/darwin.zig");
     _ = @import("os/freebsd.zig");
-- 
cgit v1.2.3


From 028011e59a486bf39db8c97e44a1bd79e09082ef Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Sun, 22 Sep 2019 15:36:11 -0400
Subject: libc implementation of gethostname

---
 std/c.zig               |  1 +
 std/net.zig             |  8 --------
 std/os.zig              | 14 ++++++++++++--
 std/os/bits/darwin.zig  |  1 +
 std/os/bits/freebsd.zig |  2 ++
 std/os/bits/netbsd.zig  |  2 ++
 std/os/test.zig         |  9 +++++++++
 7 files changed, 27 insertions(+), 10 deletions(-)

(limited to 'std/os.zig')

diff --git a/std/c.zig b/std/c.zig
index 45d93bfd9f..dcde3b8ebb 100644
--- a/std/c.zig
+++ b/std/c.zig
@@ -107,6 +107,7 @@ pub extern "c" fn sysctl(name: [*]const c_int, namelen: c_uint, oldp: ?*c_void,
 pub extern "c" fn sysctlbyname(name: [*]const u8, oldp: ?*c_void, oldlenp: ?*usize, newp: ?*c_void, newlen: usize) c_int;
 pub extern "c" fn sysctlnametomib(name: [*]const u8, mibp: ?*c_int, sizep: ?*usize) c_int;
 
+pub extern "c" fn gethostname(name: [*]u8, len: usize) c_int;
 pub extern "c" fn bind(socket: fd_t, address: ?*const sockaddr, address_len: socklen_t) c_int;
 pub extern "c" fn socket(domain: c_uint, sock_type: c_uint, protocol: c_uint) c_int;
 pub extern "c" fn listen(sockfd: fd_t, backlog: c_uint) c_int;
diff --git a/std/net.zig b/std/net.zig
index 3a1656d14d..be9d18056c 100644
--- a/std/net.zig
+++ b/std/net.zig
@@ -245,11 +245,3 @@ pub fn connectUnixSocket(path: []const u8) !std.fs.File {
 
     return std.fs.File.openHandle(sockfd);
 }
-
-pub const getHostName = os.gethostname;
-
-test "getHostName" {
-    var buf: [os.HOST_NAME_MAX]u8 = undefined;
-    const hostname = try getHostName(&buf);
-    expect(hostname.len != 0);
-}
diff --git a/std/os.zig b/std/os.zig
index 63e6338f81..a8677666ad 100644
--- a/std/os.zig
+++ b/std/os.zig
@@ -2688,11 +2688,20 @@ pub fn futimens(fd: fd_t, times: *const [2]timespec) FutimensError!void {
     }
 }
 
-pub const GetHostNameError = error{Unexpected};
+pub const GetHostNameError = error{
+    PermissionDenied,
+    Unexpected,
+};
 
 pub fn gethostname(name_buffer: *[HOST_NAME_MAX]u8) GetHostNameError![]u8 {
     if (builtin.link_libc) {
-        @compileError("TODO implement gethostname when linking libc");
+        switch (errno(system.gethostname(name_buffer, name_buffer.len))) {
+            0 => return mem.toSlice(u8, name_buffer),
+            EFAULT => unreachable,
+            ENAMETOOLONG => unreachable, // HOST_NAME_MAX prevents this
+            EPERM => return error.PermissionDenied,
+            else => |err| return unexpectedErrno(err),
+        }
     }
     if (linux.is_the_target) {
         var uts: utsname = undefined;
@@ -2703,6 +2712,7 @@ pub fn gethostname(name_buffer: *[HOST_NAME_MAX]u8) GetHostNameError![]u8 {
                 return name_buffer[0..hostname.len];
             },
             EFAULT => unreachable,
+            EPERM => return error.PermissionDenied,
             else => |err| return unexpectedErrno(err),
         }
     }
diff --git a/std/os/bits/darwin.zig b/std/os/bits/darwin.zig
index 483d4cda90..b21498ba2d 100644
--- a/std/os/bits/darwin.zig
+++ b/std/os/bits/darwin.zig
@@ -1175,3 +1175,4 @@ pub fn S_ISSOCK(m: u32) bool {
 pub fn S_IWHT(m: u32) bool {
     return m & S_IFMT == S_IFWHT;
 }
+pub const HOST_NAME_MAX = 72;
diff --git a/std/os/bits/freebsd.zig b/std/os/bits/freebsd.zig
index 45432a6c07..f94ff07f58 100644
--- a/std/os/bits/freebsd.zig
+++ b/std/os/bits/freebsd.zig
@@ -935,3 +935,5 @@ pub fn S_ISSOCK(m: u32) bool {
 pub fn S_IWHT(m: u32) bool {
     return m & S_IFMT == S_IFWHT;
 }
+
+pub const HOST_NAME_MAX = 255;
diff --git a/std/os/bits/netbsd.zig b/std/os/bits/netbsd.zig
index ff19d090af..5036e1e9a1 100644
--- a/std/os/bits/netbsd.zig
+++ b/std/os/bits/netbsd.zig
@@ -819,3 +819,5 @@ pub fn S_ISSOCK(m: u32) bool {
 pub fn S_IWHT(m: u32) bool {
     return m & S_IFMT == S_IFWHT;
 }
+
+pub const HOST_NAME_MAX = 255;
diff --git a/std/os/test.zig b/std/os/test.zig
index a821c5dd9f..d886597a38 100644
--- a/std/os/test.zig
+++ b/std/os/test.zig
@@ -210,3 +210,12 @@ test "dl_iterate_phdr" {
     expect(os.dl_iterate_phdr(usize, iter_fn, &counter) != 0);
     expect(counter != 0);
 }
+
+test "gethostname" {
+    if (os.windows.is_the_target)
+        return error.SkipZigTest;
+
+    var buf: [os.HOST_NAME_MAX]u8 = undefined;
+    const hostname = try os.gethostname(&buf);
+    expect(hostname.len != 0);
+}
-- 
cgit v1.2.3