Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop to next/kelvin/410 #713

Merged
merged 2 commits into from
Aug 19, 2024
Merged

Merge develop to next/kelvin/410 #713

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5594bc
lick: add `:` to prints to match other vanes
matthew-levan Aug 9, 2024
c482222
lick: add `:` to prints to match other vanes (#704)
pkova Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions pkg/vere/io/lick.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ _lick_close_chan(u3_chan* can_u)
dev = _lick_string_to_path(gen_u->nam_c+1);
mar = u3i_string("disconnect");
dat = u3_nul;

cad = u3nq(c3__soak, dev, mar, dat);

u3_auto_peer(
Expand Down Expand Up @@ -333,7 +333,7 @@ _lick_mkdirp(c3_c* por_c)
c3_c pax_c[2048];

strncpy(pax_c, por_c, sizeof(pax_c));

c3_c* fas_c = strchr(pax_c + 1, '/');

while ( fas_c ) {
Expand Down Expand Up @@ -422,7 +422,7 @@ _lick_init_sock(u3_shan* san_u)
static void
_lick_ef_shut(u3_lick* lic_u, u3_noun nam)
{
c3_c* nam_c = _lick_it_path(nam);
c3_c* nam_c = _lick_it_path(nam);

u3_port* cur_u = lic_u->gen_u;
u3_port* las_u = NULL;
Expand All @@ -434,7 +434,7 @@ _lick_ef_shut(u3_lick* lic_u, u3_noun nam)
if( las_u == NULL ) {
lic_u->gen_u = cur_u->nex_u;
}
else {
else {
las_u->nex_u = cur_u->nex_u;
}
c3_free(cur_u);
Expand Down Expand Up @@ -501,7 +501,7 @@ _lick_ef_spit(u3_lick* lic_u, u3_noun nam, u3_noun dat)

if( c3y == gen_u->con_o ) {
_lick_send_noun(gen_u->san_u->can_u, dat);
}
}
else {
u3_noun dev, wir, cad, mar;
u3z(dat);
Expand Down Expand Up @@ -538,11 +538,11 @@ _lick_io_kick(u3_auto* car_u, u3_noun wir, u3_noun cad)
if ( (c3__spin == tag) ) {
_lick_ef_spin(lic_u, u3k(tmp)); // execute spin command
ret_o = c3y;
}
}
else if ( (c3__shut == tag) ) {
_lick_ef_shut(lic_u, u3k(tmp)); // execute shut command
ret_o = c3y;
}
}
else if ( c3__spit == tag ) {
if ( c3y == u3r_cell(tmp, &nam, &dat) ) {
_lick_ef_spit(lic_u, u3k(nam), u3k(dat));
Expand Down Expand Up @@ -633,9 +633,9 @@ u3_lick_io_init(u3_pier* pir_u)
strcat(pax_c, URB_DEV_PATH);

if ( -1 == stat(pax_c, &st) ) {
u3l_log("lick init mkdir %s",pax_c );
u3l_log("lick: init mkdir %s",pax_c );
if ( mkdir(pax_c, 0700) && (errno != EEXIST) ) {
u3l_log("lick cannot make directory");
u3l_log("lick: cannot make directory");
u3_king_bail();
}
}
Expand Down
Loading