prevent double frees

This commit is contained in:
Daylin Morgan 2024-05-13 11:27:57 -05:00
parent 689c594493
commit f930a245e3
Signed by: daylin
GPG key ID: 950D13E9719334AD
2 changed files with 110 additions and 20 deletions

View file

@ -24,33 +24,54 @@ pub const OizysCmd = enum {
pub fn init(allocator: std.mem.Allocator, matches: *const ArgMatches, forward: ?[][]const u8) !Oizys { pub fn init(allocator: std.mem.Allocator, matches: *const ArgMatches, forward: ?[][]const u8) !Oizys {
const cmd = matches.subcommand.?.name; const cmd = matches.subcommand.?.name;
const flags = matches.subcommandMatches(cmd).?; const flags = matches.subcommandMatches(cmd).?;
const host = flags.getSingleValue("host") orelse var oizys = Oizys{
try Oizys.getDefaultHostName(allocator);
const flake = flags.getSingleValue("flake") orelse
try Oizys.getDefaultFlake(allocator);
return Oizys{
.allocator = allocator, .allocator = allocator,
.host = host, .host = undefined,
.flake = flake, .flake = undefined,
.output = try std.fmt.allocPrint( .output = undefined,
allocator,
"{s}#nixosConfigurations.{s}.config.system.build.toplevel",
.{ flake, host },
),
.cmd = std.meta.stringToEnum(OizysCmd, cmd).?, .cmd = std.meta.stringToEnum(OizysCmd, cmd).?,
.cache_name = flags.getSingleValue("cache") orelse "daylin", .cache_name = flags.getSingleValue("cache") orelse "daylin",
.forward = forward, .forward = forward,
}; };
if (flags.getSingleValue("host")) |host| {
oizys.host = try allocator.dupe(u8, host);
} else {
oizys.host = try Oizys.getDefaultHostName(allocator);
}
if (flags.getSingleValue("flake")) |flake| {
oizys.flake = try allocator.dupe(u8, flake);
} else {
oizys.flake = try Oizys.getDefaultFlake(allocator);
}
oizys.output = try std.fmt.allocPrint(
allocator,
"{s}#nixosConfigurations.{s}.config.system.build.toplevel",
.{ oizys.flake, oizys.host },
);
return oizys;
// return Oizys{
// .allocator = allocator,
// .host = host,
// .flake = flake,
// .output = try std.fmt.allocPrint(
// allocator,
// "{s}#nixosConfigurations.{s}.config.system.build.toplevel",
// .{ flake, host },
// ),
// .cmd = std.meta.stringToEnum(OizysCmd, cmd).?,
// .cache_name = flags.getSingleValue("cache") orelse "daylin",
// .forward = forward,
// };
} }
pub fn deinit(self: *Oizys) void { pub fn deinit(self: *Oizys) void {
self.allocator.free(self.flake); self.allocator.free(self.flake);
self.allocator.free(self.host);
self.allocator.free(self.output); self.allocator.free(self.output);
self.allocator.free(self.host);
} }
pub fn getDefaultHostName(allocator: Allocator) ![]const u8 { pub fn getDefaultHostName(allocator: Allocator) ![]const u8 {
var name_buffer: [std.posix.HOST_NAME_MAX]u8 = undefined; var name_buffer: [std.posix.HOST_NAME_MAX]u8 = undefined;
const hostname = try std.posix.gethostname(&name_buffer); const hostname = try std.posix.gethostname(&name_buffer);
@ -108,11 +129,76 @@ pub fn cache(self: *Oizys) !void {
_ = try p.spawnAndWait(); _ = try p.spawnAndWait();
} }
const DryResult = struct {
allocator: Allocator,
fetch: [][]const u8,
build: [][]const u8,
pub fn parse(allocator: Allocator, output: []const u8) !DryResult {
var it = std.mem.splitSequence(u8, output, ":\n");
_ = it.next();
var fetch = std.ArrayList([]const u8).init(allocator);
var build = std.ArrayList([]const u8).init(allocator);
if (it.next()) |x| {
try parseLines(x, &fetch);
} else {
return error.DryParseError;
}
if (it.next()) |x| {
try parseLines(x, &build);
} else {
return error.DryParseError;
}
return .{
.allocator = allocator,
.fetch = try fetch.toOwnedSlice(),
.build = try build.toOwnedSlice(),
};
}
pub fn deinit(self: *DryResult) void {
self.allocator.free(self.fetch);
self.allocator.free(self.build);
// for (self.fetch) |item| {
// self.allocator.free(item);
// }
// for (self.build) |item| {
// self.allocator.free(item);
// }
}
fn parseLines(buffer: []const u8, list: *std.ArrayList([]const u8)) !void {
var lines = std.mem.splitSequence(u8, buffer, "\n");
while (lines.next()) |line| {
try list.append(line);
}
}
};
pub fn dry(self: *Oizys) !void {
const cmd_output = try std.ChildProcess.run(.{
.allocator = self.allocator,
.argv = &.{ "nix", "build", self.output, "--dry-run" },
});
defer self.allocator.free(cmd_output.stdout);
defer self.allocator.free(cmd_output.stderr);
var result = try DryResult.parse(self.allocator, cmd_output.stderr);
defer result.deinit();
std.debug.print(
"to fetch: {d}\nto build: {d}\n",
.{ result.fetch.len, result.build.len },
);
}
pub fn run(self: *Oizys) !void { pub fn run(self: *Oizys) !void {
switch (self.cmd) { switch (self.cmd) {
.@"switch" => try self.runNixCmd(.NixosRebuild, &.{ "switch", "--flake", self.flake }), .@"switch" => try self.runNixCmd(.NixosRebuild, &.{ "switch", "--flake", self.flake }),
.boot => try self.runNixCmd(.NixosRebuild, &.{ "boot", "--flake", self.flake }), .boot => try self.runNixCmd(.NixosRebuild, &.{ "boot", "--flake", self.flake }),
.dry => try self.runNixCmd(.Nix, &.{ "build", self.output, "--dry-run" }), .dry => try self.dry(),
.build => try self.runNixCmd(.Nix, &.{ "build", self.output }), .build => try self.runNixCmd(.Nix, &.{ "build", self.output }),
.output => { .output => {
const stdout = std.io.getStdOut().writer(); const stdout = std.io.getStdOut().writer();

View file

@ -4,9 +4,13 @@ const Cli = @import("Cli.zig");
pub fn main() !void { pub fn main() !void {
// memory management isn't hard :P // memory management isn't hard :P
var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator); // var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
defer arena.deinit(); // defer arena.deinit();
const allocator = arena.allocator(); // const allocator = arena.allocator();
//
var gpa = std.heap.GeneralPurposeAllocator(.{}){};
const allocator = gpa.allocator();
defer _ = gpa.deinit();
var cli = try Cli.init(allocator); var cli = try Cli.init(allocator);
try cli.parse(); try cli.parse();