diff options
Diffstat (limited to 'src/host/root.zig')
| -rw-r--r-- | src/host/root.zig | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/src/host/root.zig b/src/host/root.zig index c64af92..629c466 100644 --- a/src/host/root.zig +++ b/src/host/root.zig @@ -95,10 +95,10 @@ pub fn main(init: std.process.Init, linked: ?abi.Sketch) !void { // A scripted run from fresh state works on files of its own, moved to // the given path at exit: two runs of one build step (two `zig build`s - // at once share its output path) never share a state or store file, - // nor the files the sketch appends to, nor fail on the store's lock - // (its sessions are in memory). An export's are removed instead: - // nothing reads them, and a player may have the given ones open. + // at once share its output path) never share a state file, nor the + // files the sketch appends to (its sessions are in memory). An export's + // are removed instead: nothing reads them, and a player may have the + // given ones open. var private_buf: [std.fs.max_path_bytes]u8 = undefined; if (options.state.len == 0 and (script_path != null or options.export_to != null)) options.state = "sketch.state"; const given = options.state; @@ -156,9 +156,9 @@ const usage = /// A state file in a directory named `.sketchbook` (`zig build run`'s): /// the directory is made, with a `.gitignore` of `*` (its sessions database -/// grows, and a jj snapshot would commit it), and the state and store files -/// an older build kept beside it are moved in, once. A file is never -/// replaced: when both exist, nothing moves. +/// grows, and a jj snapshot would commit it), and the state file an older +/// build kept beside it is moved in, once. A file is never replaced: when +/// both exist, nothing moves. fn sketchbookDir(io: std.Io, state: []const u8) void { const dir = std.fs.path.dirname(state) orelse return; if (!std.mem.eql(u8, std.fs.path.basename(dir), ".sketchbook")) return; @@ -167,20 +167,15 @@ fn sketchbookDir(io: std.Io, state: []const u8) void { var buf: [std.fs.max_path_bytes]u8 = undefined; const ignore = std.fmt.bufPrint(&buf, "{s}/.gitignore", .{dir}) catch return; cwd.writeFile(io, .{ .sub_path = ignore, .data = "*\n", .flags = .{ .exclusive = true } }) catch {}; - for ([_][]const u8{ "", ".store" }) |suffix| { - var from_buf: [std.fs.max_path_bytes]u8 = undefined; - var to_buf: [std.fs.max_path_bytes]u8 = undefined; - const parent = std.fs.path.dirname(dir) orelse "."; - const from = std.fmt.bufPrintSentinel(&from_buf, "{s}/{s}{s}", .{ parent, std.fs.path.basename(state), suffix }, 0) catch return; - const to = std.fmt.bufPrintSentinel(&to_buf, "{s}{s}", .{ state, suffix }, 0) catch return; - switch (std.os.linux.errno(std.os.linux.renameat2(std.os.linux.AT.FDCWD, from.ptr, std.os.linux.AT.FDCWD, to.ptr, .{ .NOREPLACE = true }))) { - .SUCCESS => std.debug.print("sketchbook: moved {s} to {s}\n", .{ from, to }), - .EXIST => { - std.debug.print("sketchbook: {s} and {s} both exist: nothing moved, {s} is used\n", .{ from, to, to }); - return; - }, - else => {}, - } + var from_buf: [std.fs.max_path_bytes]u8 = undefined; + var to_buf: [std.fs.max_path_bytes]u8 = undefined; + const parent = std.fs.path.dirname(dir) orelse "."; + const from = std.fmt.bufPrintSentinel(&from_buf, "{s}/{s}", .{ parent, std.fs.path.basename(state) }, 0) catch return; + const to = std.fmt.bufPrintSentinel(&to_buf, "{s}", .{state}, 0) catch return; + switch (std.os.linux.errno(std.os.linux.renameat2(std.os.linux.AT.FDCWD, from.ptr, std.os.linux.AT.FDCWD, to.ptr, .{ .NOREPLACE = true }))) { + .SUCCESS => std.debug.print("sketchbook: moved {s} to {s}\n", .{ from, to }), + .EXIST => std.debug.print("sketchbook: {s} and {s} both exist: nothing moved, {s} is used\n", .{ from, to, to }), + else => {}, } } |
