mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-09 10:28:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean-up some option parsing in Bun.spawn

Browse Source
This commit is contained in:
Jarred Sumner
2023-05-31 23:15:21 -07:00
parent 1ca70b855c
commit fdcfcce9e7
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/bun.js/api/bun/subprocess.zig
View File

@@ -1114,7 +1114,14 @@ pub const Subprocess = struct {
}
while (cmds_array.next()) |value| {
argv.appendAssumeCapacity(value.getZigString(globalThis).toOwnedSliceZ(allocator) catch {
const arg = value.getZigString(globalThis);
// if the string is empty, ignore it, don't add it to the argv
if (arg.len == 0) {
continue;
}
argv.appendAssumeCapacity(arg.toOwnedSliceZ(allocator) catch {
globalThis.throw("out of memory", .{});
return .zero;
});
@@ -1128,11 +1135,15 @@ pub const Subprocess = struct {
if (args != .zero and args.isObject()) {
if (args.get(globalThis, "cwd")) |cwd_| {
// ignore definitely invalid cwd
if (!cwd_.isEmptyOrUndefinedOrNull()) {
cwd = cwd_.getZigString(globalThis).toOwnedSliceZ(allocator) catch {
globalThis.throw("out of memory", .{});
return .zero;
};
const cwd_str = cwd_.getZigString(globalThis);
if (cwd_str.len > 0) {
cwd = cwd_str.toOwnedSliceZ(allocator) catch {
globalThis.throw("out of memory", .{});
return .zero;
};
}
}
}