diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bun.js/node/node_os.zig | 6 | ||||
| -rw-r--r-- | src/c.zig | 2 | ||||
| -rw-r--r-- | src/linux_c.zig | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/bun.js/node/node_os.zig b/src/bun.js/node/node_os.zig index edfd97e77..08388ced3 100644 --- a/src/bun.js/node/node_os.zig +++ b/src/bun.js/node/node_os.zig @@ -267,7 +267,8 @@ pub const Os = struct { pub fn release(globalThis: *JSC.JSGlobalObject, _: *JSC.CallFrame) callconv(.C) JSC.JSValue { if (comptime is_bindgen) return JSC.JSValue.jsUndefined(); - return JSC.ZigString.init(C.getRelease()).withEncoding().toValueGC(globalThis); + var name_buffer: [std.os.HOST_NAME_MAX]u8 = undefined; + return JSC.ZigString.init(C.getRelease(&name_buffer)).withEncoding().toValueGC(globalThis); } pub fn setPriority(globalThis: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(.C) JSC.JSValue { @@ -410,7 +411,8 @@ pub const Os = struct { pub fn version(globalThis: *JSC.JSGlobalObject, _: *JSC.CallFrame) callconv(.C) JSC.JSValue { if (comptime is_bindgen) return JSC.JSValue.jsUndefined(); - return JSC.ZigString.init(C.getVersion()).withEncoding().toValueGC(globalThis); + var name_buffer: [std.os.HOST_NAME_MAX]u8 = undefined; + return JSC.ZigString.init(C.getVersion(&name_buffer)).withEncoding().toValueGC(globalThis); } }; @@ -389,7 +389,7 @@ pub fn getVersion(buf: []u8) []const u8 { pub fn getRelease(buf: []u8) []const u8 { if (comptime Environment.isLinux) { - return linux.get_release(buf); + return linux.get_release(buf.ptr[0..std.os.HOST_NAME_MAX]); } else if (comptime Environment.isMac) { return darwin.get_release(buf); } else { diff --git a/src/linux_c.zig b/src/linux_c.zig index cfd6c314d..9c6e48558 100644 --- a/src/linux_c.zig +++ b/src/linux_c.zig @@ -364,7 +364,7 @@ pub fn set_process_priority(pid: c_uint, priority: c_int) i32 { pub fn get_version(name_buffer: *[std.os.HOST_NAME_MAX]u8) []const u8 { const uts = std.os.uname(); const result = std.mem.sliceTo(std.meta.assumeSentinel(&uts.version, 0), 0); - std.mem.copy(u8, &name_buffer, result); + std.mem.copy(u8, name_buffer, result); return name_buffer[0..result.len]; } @@ -372,7 +372,7 @@ pub fn get_version(name_buffer: *[std.os.HOST_NAME_MAX]u8) []const u8 { pub fn get_release(name_buffer: *[std.os.HOST_NAME_MAX]u8) []const u8 { const uts = std.os.uname(); const result = std.mem.sliceTo(std.meta.assumeSentinel(&uts.release, 0), 0); - std.mem.copy(u8, &name_buffer, result); + std.mem.copy(u8, name_buffer, result); return name_buffer[0..result.len]; } |