Skip to content

Commit

Permalink
cli: fix play boot
Browse files Browse the repository at this point in the history
  • Loading branch information
matthew-levan committed Jul 2, 2023
1 parent 8668d73 commit 5e3f253
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions pkg/vere/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ _main_getopt(c3_i argc, c3_c** argv)
return c3n;
} else {
u3_Host.ops_u.sap_w = arg_w * 60;
if ( 0 == u3_Host.ops_u.sap_w)
if ( 0 == u3_Host.ops_u.sap_w )
return c3n;
}
break;
Expand Down Expand Up @@ -1197,7 +1197,7 @@ _cw_disk_init(c3_c* dir_c)
u3_disk* log_u = u3_disk_init(dir_c, cb_u);

if ( !log_u ) {
fprintf(stderr, "unable to open event log\n");;
fprintf(stderr, "unable to open event log\n");
exit(1);
}

Expand Down Expand Up @@ -1924,12 +1924,12 @@ _cw_meld(c3_i argc, c3_c* argv[])
exit(1);
}

u3C.wag_w |= u3o_hashless;

u3_Host.eve_d = u3m_boot(u3_Host.dir_c, (size_t)1 << u3_Host.ops_u.lom_y);
u3_disk* log_u = _cw_disk_init(u3_Host.dir_c); // XX s/b try_aquire lock
c3_w pre_w;

u3C.wag_w |= u3o_hashless;

pre_w = u3a_open(u3R);
u3u_meld();
u3a_print_memory(stderr, "urbit: meld: gained", u3u_meld());
Expand Down Expand Up @@ -2245,7 +2245,6 @@ _cw_play(c3_i argc, c3_c* argv[])

// XX handle SIGTSTP so that the lockfile is not orphaned?
//
u3_Host.eve_d = u3m_boot(u3_Host.dir_c, (size_t)1 << u3_Host.ops_u.lom_y);
u3_disk* log_u = _cw_disk_init(u3_Host.dir_c); // XX s/b try_aquire lock

// Handle SIGTSTP as if it was SIGINT.
Expand All @@ -2269,6 +2268,8 @@ _cw_play(c3_i argc, c3_c* argv[])
_cw_play_snap(log_u);
}

u3_Host.eve_d = u3m_boot(u3_Host.dir_c, (size_t)1 << u3_Host.ops_u.lom_y);

u3C.slog_f = _cw_play_slog;

{
Expand Down

0 comments on commit 5e3f253

Please sign in to comment.