diff options
author | 2023-01-27 15:26:01 -0800 | |
---|---|---|
committer | 2023-01-27 15:27:04 -0800 | |
commit | 2e1c7f5597e516133feaa5af2dc25c4794d8e113 (patch) | |
tree | c251cf73554d667475786bd7d2f66683a84d9eb1 | |
parent | 6cccc0d26c2d8acbb4c9445d3344f48c5339c6da (diff) | |
download | bun-2e1c7f5597e516133feaa5af2dc25c4794d8e113.tar.gz bun-2e1c7f5597e516133feaa5af2dc25c4794d8e113.tar.zst bun-2e1c7f5597e516133feaa5af2dc25c4794d8e113.zip |
sentinel
-rw-r--r-- | src/bun.js/module_loader.zig | 2 | ||||
-rw-r--r-- | src/bun.zig | 15 | ||||
-rw-r--r-- | src/cli/run_command.zig | 4 | ||||
-rw-r--r-- | src/deps/boringssl.translated.zig | 4 | ||||
-rw-r--r-- | src/install/install.zig | 2 |
5 files changed, 21 insertions, 6 deletions
diff --git a/src/bun.js/module_loader.zig b/src/bun.js/module_loader.zig index aab47ade3..485a5c59a 100644 --- a/src/bun.js/module_loader.zig +++ b/src/bun.js/module_loader.zig @@ -119,7 +119,7 @@ fn jsModuleFromFile(from_path: string, comptime input: string) string { var buf: [bun.MAX_PATH_BYTES]u8 = undefined; var absolute_path_to_use = Fs.FileSystem.instance.absBuf(&parts, &buf); buf[absolute_path_to_use.len] = 0; - file = std.fs.openFileAbsoluteZ(absolute_path_to_use[0.. :0], .{ .mode = .read_only }) catch { + file = std.fs.openFileAbsoluteZ(absolute_path_to_use[0..absolute_path_to_use.len :0], .{ .mode = .read_only }) catch { const WarnOnce = struct { pub var warned = false; }; diff --git a/src/bun.zig b/src/bun.zig index cf3ea67a5..d555b23d1 100644 --- a/src/bun.zig +++ b/src/bun.zig @@ -933,3 +933,18 @@ pub fn sliceTo(ptr: anytype, comptime end: meta.Elem(@TypeOf(ptr))) SliceTo(@Typ return ptr[0..length]; } } + +pub fn cstring(input: []const u8) [:0]const u8 { + if (input.len == 0) + return ""; + + if (comptime Environment.allow_assert) { + std.debug.assert( + lenSliceTo( + @ptrCast([*:0]const u8, input.ptr), + 0, + ) == input.len, + ); + } + return @ptrCast([*:0]const u8, input.ptr)[0..input.len :0]; +} diff --git a/src/cli/run_command.zig b/src/cli/run_command.zig index 75539578b..dc0138310 100644 --- a/src/cli/run_command.zig +++ b/src/cli/run_command.zig @@ -396,7 +396,7 @@ pub const RunCommand = struct { var retried = false; if (!strings.endsWithComptime(std.mem.span(std.os.argv[0]), "node")) { - var argv0 = optional_bun_path.*[0.. :0].ptr; + var argv0 = @ptrCast([*:0]const u8, optional_bun_path.ptr); // if we are already an absolute path, use that // if the user started the application via a shebang, it's likely that the path is absolute already @@ -408,7 +408,7 @@ pub const RunCommand = struct { var self = std.fs.selfExePath(&self_exe_bin_path_buf) catch unreachable; if (self.len > 0) { self.ptr[self.len] = 0; - argv0 = self[0.. :0].ptr; + argv0 = @ptrCast([*:0]const u8, self.ptr); optional_bun_path.* = self; } } diff --git a/src/deps/boringssl.translated.zig b/src/deps/boringssl.translated.zig index 05a8e64f4..c5bdad6ec 100644 --- a/src/deps/boringssl.translated.zig +++ b/src/deps/boringssl.translated.zig @@ -1331,7 +1331,7 @@ pub extern fn EVP_md5_sha1() *const EVP_MD; pub extern fn EVP_get_digestbynid(nid: c_int) ?*const EVP_MD; pub extern fn EVP_get_digestbyobj(obj: ?*const ASN1_OBJECT) ?*const EVP_MD; pub extern fn EVP_MD_CTX_init(ctx: *EVP_MD_CTX) void; -pub extern fn EVP_MD_CTX_new() [*c]EVP_MD_CTX; +pub extern fn EVP_MD_CTX_new() *EVP_MD_CTX; pub extern fn EVP_MD_CTX_cleanup(ctx: *EVP_MD_CTX) c_int; pub extern fn EVP_MD_CTX_free(ctx: *EVP_MD_CTX) void; pub extern fn EVP_MD_CTX_copy_ex(out: [*c]EVP_MD_CTX, in: [*c]const EVP_MD_CTX) c_int; @@ -1370,7 +1370,7 @@ pub extern fn EVP_MD_CTX_copy(out: [*c]EVP_MD_CTX, in: [*c]const EVP_MD_CTX) c_i pub extern fn EVP_add_digest(digest: ?*const EVP_MD) c_int; pub extern fn EVP_get_digestbyname([*c]const u8) ?*const EVP_MD; pub extern fn EVP_dss1() ?*const EVP_MD; -pub extern fn EVP_MD_CTX_create() [*c]EVP_MD_CTX; +pub extern fn EVP_MD_CTX_create() ?*EVP_MD_CTX; pub extern fn EVP_MD_CTX_destroy(ctx: *EVP_MD_CTX) void; pub extern fn EVP_DigestFinalXOF(ctx: *EVP_MD_CTX, out: [*c]u8, len: usize) c_int; pub extern fn EVP_MD_meth_get_flags(md: ?*const EVP_MD) u32; diff --git a/src/install/install.zig b/src/install/install.zig index 95df2b337..2885b5a26 100644 --- a/src/install/install.zig +++ b/src/install/install.zig @@ -6463,7 +6463,7 @@ pub const PackageManager = struct { var result = try bun.getFdPath(manager.options.global_bin_dir.dir.fd, &out_buffer); out_buffer[result.len] = 0; var result_: [:0]u8 = out_buffer[0..result.len :0]; - manager.options.bin_path = (try FileSystem.instance.dirname_store.append([:0]u8, result_))[0.. :0]; + manager.options.bin_path = bun.cstring(try FileSystem.instance.dirname_store.append([:0]u8, result_)); } pub fn startProgressBarIfNone(manager: *PackageManager) void { |