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

fix fs.test.ts

Browse Source
This commit is contained in:
Dylan Conway
2025-01-20 21:26:56 -08:00
parent d0b9342528
commit fbaeadd093
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/bun.js/node/node_fs.zig
View File

@@ -4422,7 +4422,7 @@ pub const NodeFS = struct {
.err => |err| .{ .err = .{
.syscall = .scandir,
.errno = err.errno,
.path = err.path,
.path = args.path.slice(),
} },
.result => |result| .{ .result = result },
};
@@ -4480,7 +4480,7 @@ pub const NodeFS = struct {
}) |current| : (entry = iterator.next()) {
if (ExpectedType == Dirent) {
if (dirent_path.isEmpty()) {
dirent_path = JSC.WebCore.Encoder.toBunString(basename, args.encoding);
dirent_path = JSC.WebCore.Encoder.toBunString(strings.withoutNTPrefix(std.meta.Child(@TypeOf(basename)), basename), args.encoding);
}
}
if (comptime !is_u16) {
@@ -4784,7 +4784,7 @@ pub const NodeFS = struct {
const path_u8 = bun.path.dirname(bun.path.join(&[_]string{ root_basename, name_to_copy }, .auto), .auto);
if (dirent_path_prev.isEmpty() or !bun.strings.eql(dirent_path_prev.byteSlice(), path_u8)) {
dirent_path_prev.deref();
dirent_path_prev = JSC.WebCore.Encoder.toBunString(path_u8, args.encoding);
dirent_path_prev = JSC.WebCore.Encoder.toBunString(strings.withoutNTPrefix(std.meta.Child(@TypeOf(path_u8)), path_u8), args.encoding);
}
dirent_path_prev.ref();
entries.append(.{
@@ -4794,10 +4794,10 @@ pub const NodeFS = struct {
}) catch bun.outOfMemory();
},
Buffer => {
entries.append(Buffer.fromString(name_to_copy, bun.default_allocator) catch bun.outOfMemory()) catch bun.outOfMemory();
entries.append(Buffer.fromString(strings.withoutNTPrefix(std.meta.Child(@TypeOf(name_to_copy)), name_to_copy), bun.default_allocator) catch bun.outOfMemory()) catch bun.outOfMemory();
},
bun.String => {
entries.append(JSC.WebCore.Encoder.toBunString(name_to_copy, args.encoding)) catch bun.outOfMemory();
entries.append(JSC.WebCore.Encoder.toBunString(strings.withoutNTPrefix(std.meta.Child(@TypeOf(name_to_copy)), name_to_copy), args.encoding)) catch bun.outOfMemory();
},
else => @compileError(unreachable),
}

15
src/string_immutable.zig
View File

@@ -1908,14 +1908,19 @@ pub fn fromWPath(buf: []u8, utf16: []const u16) [:0]const u8 {
return buf[0..encode_into_result.written :0];
}
pub fn withoutNTPrefix(path: [:0]const u16) [:0]const u16 {
if (hasPrefixComptimeUTF16(path, &bun.windows.nt_object_prefix_u8)) {
pub fn withoutNTPrefix(comptime T: type, path: []const T) []const T {
if (comptime !Environment.isWindows) return path;
const cmp = if (T == u8)
hasPrefixComptime
else
hasPrefixComptimeUTF16;
if (cmp(path, &bun.windows.nt_object_prefix_u8)) {
return path[bun.windows.nt_object_prefix.len..];
}
if (hasPrefixComptimeUTF16(path, &bun.windows.nt_maxpath_prefix_u8)) {
return path[bun.windows.nt_maxpath_prefix.len..];
if (cmp(path, &bun.windows.long_path_prefix_u8)) {
return path[bun.windows.long_path_prefix.len..];
}
if (hasPrefixComptimeUTF16(path, &bun.windows.nt_unc_object_prefix_u8)) {
if (cmp(path, &bun.windows.nt_unc_object_prefix_u8)) {
return path[bun.windows.nt_unc_object_prefix.len..];
}
return path;