summaryrefslogtreecommitdiff
path: root/src/tui
diff options
context:
space:
mode:
Diffstat (limited to 'src/tui')
-rw-r--r--src/tui/tui.zig19
1 files changed, 2 insertions, 17 deletions
diff --git a/src/tui/tui.zig b/src/tui/tui.zig
index ff0e8334..a698abf7 100644
--- a/src/tui/tui.zig
+++ b/src/tui/tui.zig
@@ -2123,16 +2123,7 @@ const Shell = struct {
});
var popped = false;
var at_buf: [1024:0]u8 = undefined;
- const failed: []const u8 = failed: {
- const at = pardes.dump.upgradePath(&at_buf, core.settings.dump_dir.get()) orelse break :failed "Upgrade: no directory for the session's dump; this session stays as it is";
- const bytes = pardes.dump.dumpBytes(core) catch |err| {
- var words: [128]u8 = undefined;
- break :failed std.fmt.bufPrint(&why, "Upgrade: the session would not dump: {s}; it stays as it is", .{pardes.Messages.errorWords(err, &words)}) catch "Upgrade: the session would not dump";
- };
- defer s.gpa.free(bytes);
- if (!upgrade.writeDump(at, bytes)) break :failed std.fmt.bufPrint(&why, "Upgrade: the session's dump could not be written to {s}; it stays as it is", .{at[0..@min(at.len, 600)]}) catch "Upgrade: its dump could not be written";
- rec.dump = at;
- rec.old = upgrade.openSelf();
+ const failed: []const u8 = upgrade.dumpInto(core, &rec, &at_buf, &why) orelse failed: {
// What this process put in its terminals that the next puts in
// again: its images, and its keyboard mode, a stack.
for (s.terms) |slot| if (slot) |sc| if (sc.on) {
@@ -2143,13 +2134,7 @@ const Shell = struct {
};
popped = true;
unlinkKittyShm();
- daemon.upgraded();
- if (s.fs) |f| f.flushOut();
- const err_words = upgrade.exec(s.gpa, path, -1, &rec);
- // Still here: the exec failed.
- _ = libc.unlink(at);
- if (rec.old >= 0) _ = libc.close(rec.old);
- break :failed std.fmt.bufPrint(&why, "Upgrade: {s} would not start: {s}; this session stays as it is", .{ path[0..@min(path.len, 600)], err_words }) catch "Upgrade: the new pardes would not start";
+ break :failed upgrade.execAs(s.gpa, path, &rec, &at_buf, s.fs, &why);
};
// As it was: its ptys read on, its terminals' keys as they were.
for (&s.ptys, 0..) |*slot, id| if (slot.*) |*pt| {