mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-12 03:48:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

[libarchive] Allow passing a Dir fd instead of always creating a new dir

Browse Source
This commit is contained in:
Jarred Sumner
2022-01-02 00:04:03 -08:00
parent ba4013816d
commit 2fc6da125f
1 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/libarchive/libarchive.zig
View File

@@ -457,9 +457,9 @@ pub const Archive = struct {
}
}
pub fn extractToDisk(
pub fn extractToDir(
file_buffer: []const u8,
root: []const u8,
dir: std.fs.Dir,
ctx: ?*Archive.Context,
comptime FilePathAppender: type,
appender: FilePathAppender,
@@ -476,21 +476,6 @@ pub const Archive = struct {
var archive = stream.archive;
var count: u32 = 0;
var dir: std.fs.Dir = brk: {
const cwd = std.fs.cwd();
cwd.makePath(
root,
) catch {};
if (std.fs.path.isAbsolute(root)) {
break :brk try std.fs.openDirAbsolute(root, .{ .iterate = true });
} else {
break :brk try cwd.openDir(root, .{ .iterate = true });
}
};
defer if (comptime close_handles) dir.close();
loop: while (true) {
const r = @intToEnum(Status, lib.archive_read_next_header(archive, &entry));
@@ -567,4 +552,31 @@ pub const Archive = struct {
return count;
}
pub fn extractToDisk(
file_buffer: []const u8,
root: []const u8,
ctx: ?*Archive.Context,
comptime FilePathAppender: type,
appender: FilePathAppender,
comptime depth_to_skip: usize,
comptime close_handles: bool,
comptime log: bool,
) !u32 {
var dir: std.fs.Dir = brk: {
const cwd = std.fs.cwd();
cwd.makePath(
root,
) catch {};
if (std.fs.path.isAbsolute(root)) {
break :brk try std.fs.openDirAbsolute(root, .{ .iterate = true });
} else {
break :brk try cwd.openDir(root, .{ .iterate = true });
}
};
defer if (comptime close_handles) dir.close();
return try extractToDir(file_buffer, dir, ctx, FilePathAppender, appender, depth_to_skip, close_handles, log);
}
};