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

file descriptor rewrite (#18790)

Browse Source
This commit is contained in:
chloe caruso
2025-04-15 09:37:11 -07:00
committed by GitHub
parent caeea11706
commit 903706dccf
110 changed files with 1708 additions and 1892 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/cli/create_command.zig
View File

@@ -444,12 +444,12 @@ pub const CreateCommand = struct {
if (!create_options.skip_package_json) {
const plucker = pluckers[0];
if (plucker.found and plucker.fd != .zero) {
if (plucker.found and plucker.fd.isValid()) {
node.name = "Updating package.json";
progress.refresh();
package_json_contents = plucker.contents;
package_json_file = plucker.fd.asFile();
package_json_file = plucker.fd.stdFile();
}
}
},
@@ -557,7 +557,7 @@ pub const CreateCommand = struct {
}
if (entry.kind != .file) continue;
var outfile = destination_dir_.createFile(entry.path, .{}) catch brk: {
var outfile = bun.FD.fromStdFile(destination_dir_.createFile(entry.path, .{}) catch brk: {
if (bun.Dirname.dirname(bun.OSPathChar, entry.path)) |entry_dirname| {
bun.MakePath.makePath(bun.OSPathChar, destination_dir_, entry_dirname) catch {};
}
@@ -567,22 +567,22 @@ pub const CreateCommand = struct {
Output.err(err, "failed to copy file {}", .{bun.fmt.fmtOSPath(entry.path, .{})});
Global.crash();
};
};
});
defer outfile.close();
defer node_.completeOne();
var infile = try entry.dir.openFile(entry.basename, .{ .mode = .read_only });
const infile = bun.FD.fromStdFile(try entry.dir.openFile(entry.basename, .{ .mode = .read_only }));
defer infile.close();
// Assumption: you only really care about making sure something that was executable is still executable
switch (bun.sys.fstat(bun.toFD(infile.handle))) {
switch (infile.stat()) {
.err => {},
.result => |stat| {
_ = bun.sys.fchmod(bun.toFD(outfile.handle), @intCast(stat.mode));
_ = outfile.chmod(@intCast(stat.mode));
},
}
CopyFile.copyFile(infile.handle, outfile.handle).unwrap() catch |err| {
CopyFile.copyFile(infile, outfile).unwrap() catch |err| {
node_.end();
progress_.refresh();
Output.err(err, "failed to copy file {}", .{bun.fmt.fmtOSPath(entry.path, .{})});
@@ -1429,7 +1429,7 @@ pub const CreateCommand = struct {
package_json_expr.data.e_object.properties = js_ast.G.Property.List.init(package_json_expr.data.e_object.properties.ptr[0..property_i]);
}
const file = package_json_file.?;
const file: bun.FD = .fromStdFile(package_json_file.?);
var buffer_writer = JSPrinter.BufferWriter.init(bun.default_allocator);
buffer_writer.append_newline = true;
@@ -1446,14 +1446,13 @@ pub const CreateCommand = struct {
package_json_file = null;
break :process_package_json;
};
const fd = bun.toFD(file);
const written = package_json_writer.ctx.getWritten();
bun.sys.File.writeAll(.{ .handle = fd }, written).unwrap() catch |err| {
bun.sys.File.writeAll(.{ .handle = file }, written).unwrap() catch |err| {
Output.prettyErrorln("package.json failed to write due to error {s}", .{@errorName(err)});
package_json_file = null;
break :process_package_json;
};
bun.sys.ftruncate(fd, @intCast(written.len)).unwrap() catch |err| {
file.truncate(@intCast(written.len)).unwrap() catch |err| {
Output.prettyErrorln("package.json failed to write due to error {s}", .{@errorName(err)});
package_json_file = null;
break :process_package_json;
@@ -1741,7 +1740,7 @@ pub const CreateCommand = struct {
const outdir_path_ = home_dir_buf[0..outdir_path.len :0];
if (bun.path.hasAnyIllegalChars(outdir_path_)) break :outer;
if (bun.sys.existsAtType(bun.toFD(std.fs.cwd()), outdir_path_).asValue()) |exists_at_type| {
if (bun.FD.cwd().existsAtType(outdir_path_).asValue()) |exists_at_type| {
if (exists_at_type == .file) {
const extension = std.fs.path.extension(positional);
if (Example.Tag.fromFileExtension(extension)) |tag| {
@@ -1765,7 +1764,7 @@ pub const CreateCommand = struct {
home_dir_buf[outdir_path.len] = 0;
const outdir_path_ = home_dir_buf[0..outdir_path.len :0];
if (bun.path.hasAnyIllegalChars(outdir_path_)) break :outer;
if (bun.sys.directoryExistsAt(bun.toFD(std.fs.cwd()), outdir_path_).isTrue()) {
if (bun.FD.cwd().directoryExistsAt(outdir_path_).isTrue()) {
example_tag = Example.Tag.local_folder;
break :brk outdir_path;
}
@@ -1778,7 +1777,7 @@ pub const CreateCommand = struct {
home_dir_buf[outdir_path.len] = 0;
const outdir_path_ = home_dir_buf[0..outdir_path.len :0];
if (bun.path.hasAnyIllegalChars(outdir_path_)) break :outer;
if (bun.sys.directoryExistsAt(bun.toFD(std.fs.cwd()), outdir_path_).isTrue()) {
if (bun.FD.cwd().directoryExistsAt(outdir_path_).isTrue()) {
example_tag = Example.Tag.local_folder;
break :brk outdir_path;
}
@@ -1791,7 +1790,7 @@ pub const CreateCommand = struct {
home_dir_buf[outdir_path.len] = 0;
const outdir_path_ = home_dir_buf[0..outdir_path.len :0];
if (bun.path.hasAnyIllegalChars(outdir_path_)) break :outer;
if (bun.sys.directoryExistsAt(bun.toFD(std.fs.cwd()), outdir_path_).isTrue()) {
if (bun.FD.cwd().directoryExistsAt(outdir_path_).isTrue()) {
example_tag = Example.Tag.local_folder;
break :brk outdir_path;
}
@@ -1911,26 +1910,26 @@ pub const Example = struct {
var examples = std.ArrayList(Example).fromOwnedSlice(ctx.allocator, remote_examples);
{
var folders = [3]std.fs.Dir{
bun.invalid_fd.asDir(),
bun.invalid_fd.asDir(),
bun.invalid_fd.asDir(),
bun.invalid_fd.stdDir(),
bun.invalid_fd.stdDir(),
bun.invalid_fd.stdDir(),
};
if (env_loader.map.get("BUN_CREATE_DIR")) |home_dir| {
var parts = [_]string{home_dir};
const outdir_path = filesystem.absBuf(&parts, &home_dir_buf);
folders[0] = std.fs.cwd().openDir(outdir_path, .{}) catch bun.invalid_fd.asDir();
folders[0] = std.fs.cwd().openDir(outdir_path, .{}) catch bun.invalid_fd.stdDir();
}
{
var parts = [_]string{ filesystem.top_level_dir, BUN_CREATE_DIR };
const outdir_path = filesystem.absBuf(&parts, &home_dir_buf);
folders[1] = std.fs.cwd().openDir(outdir_path, .{}) catch bun.invalid_fd.asDir();
folders[1] = std.fs.cwd().openDir(outdir_path, .{}) catch bun.invalid_fd.stdDir();
}
if (env_loader.map.get(bun.DotEnv.home_env)) |home_dir| {
var parts = [_]string{ home_dir, BUN_CREATE_DIR };
const outdir_path = filesystem.absBuf(&parts, &home_dir_buf);
folders[2] = std.fs.cwd().openDir(outdir_path, .{}) catch bun.invalid_fd.asDir();
folders[2] = std.fs.cwd().openDir(outdir_path, .{}) catch bun.invalid_fd.stdDir();
}
// subfolders with package.json