diff options
| author |  dave caruso <me@paperdave.net>
| 2023-08-31 23:04:19 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2023-08-31 23:04:19 -0700 |
| commit | 5288178c865cd9dcb500b00a65197bf2641d4e5c (patch) | |
| tree | 1394a9e42f3de39c6582e14aab1f5b9d96167346 /src | |
| parent | 6ae4dd808b986649616e4ba498e70480441e3b3c (diff) | |
| download | bun-5288178c865cd9dcb500b00a65197bf2641d4e5c.tar.gz bun-5288178c865cd9dcb500b00a65197bf2641d4e5c.tar.zst bun-5288178c865cd9dcb500b00a65197bf2641d4e5c.zip | |
fix(runtime): `fs.cp` edge cases (#4439)
* yippee
* enable cpSync tests
* much better
* that doesnt actually do anything
* lose
Diffstat (limited to '')
| -rw-r--r-- | src/bun.js/node/node_fs.zig | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/bun.js/node/node_fs.zig b/src/bun.js/node/node_fs.zig index 8f822448b..5407c2d5c 100644 --- a/src/bun.js/node/node_fs.zig +++ b/src/bun.js/node/node_fs.zig @@ -564,6 +564,11 @@ pub const AsyncCpTask = struct { } this.result = result; + + if (this.result == .err) { + this.result.err.path = bun.default_allocator.dupe(u8, this.result.err.path) catch ""; + } + this.globalObject.bunVMConcurrently().eventLoop().enqueueTaskConcurrent(JSC.ConcurrentTask.fromCallback(this, runFromJSThread)); } @@ -3584,7 +3589,7 @@ pub const NodeFS = struct { const dest_fd = switch (Syscall.open(dest, flags, JSC.Node.default_permission)) { .result => |result| result, - .err => |err| return Maybe(Return.CopyFile){ .err = err }, + .err => |err| return Maybe(Return.CopyFile){ .err = err.withPath(args.dest.slice()) }, }; defer { _ = std.c.ftruncate(dest_fd, @as(std.c.off_t, @intCast(@as(u63, @truncate(wrote))))); @@ -5392,11 +5397,10 @@ pub const NodeFS = struct { .ACCES, .NAMETOOLONG, .ROFS, - .NOENT, .PERM, .INVAL, => { - @memcpy(this.sync_error_buf[0..src.len], dest); + @memcpy(this.sync_error_buf[0..src.len], src); return .{ .err = err.err.withPath(this.sync_error_buf[0..src.len]) }; }, // Other errors may be due to clonefile() not being supported @@ -5792,11 +5796,10 @@ pub const NodeFS = struct { .ACCES, .NAMETOOLONG, .ROFS, - .NOENT, .PERM, .INVAL, => { - @memcpy(this.sync_error_buf[0..src.len], dest); + @memcpy(this.sync_error_buf[0..src.len], src); task.finishConcurrently(.{ .err = err.err.withPath(this.sync_error_buf[0..src.len]) }); return false; }, |