urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-20 17:32:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4173 from urbit/jb/verb

Browse Source 
vere: set arvo verbosity based on presence of -v
This commit is contained in:
Joe Bryan 2020-12-15 15:41:51 -08:00 committed by GitHub
commit 6b5c90bc38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/urbit/vere/io/fore.c
View File

@ -121,14 +121,10 @@ _fore_io_talk(u3_auto* car_u)
// set verbose as per -v // set verbose as per -v
// //
// XX should be explicit, not a toggle {
// c3_o lac_o = ( c3y == u3_Host.ops_u.veb ) ? c3n : c3y;
if ( c3y == u3_Host.ops_u.veb ) { wir = u3nc(c3__arvo, u3_nul);
// XX this path shouldn't be necessary cad = u3nt(c3__verb, u3_nul, lac_o);
//
wir = u3nt(c3__term, '1', u3_nul);
cad = u3nc(c3__verb, u3_nul);
u3_auto_plan(car_u, u3_ovum_init(0, u3_blip, wir, cad)); u3_auto_plan(car_u, u3_ovum_init(0, u3_blip, wir, cad));
} }

19
pkg/urbit/vere/pier.c
View File

@ -1731,20 +1731,21 @@ _pier_boot_make(u3_noun who, u3_noun wyr, u3_noun ven, u3_noun pil)
// prepend entropy and identity to the module sequence // prepend entropy and identity to the module sequence
// //
{ {
u3_noun wir, cad; u3_noun cad, wir = u3nt(u3_blip, c3__arvo, u3_nul);
c3_w eny_w[16]; c3_w eny_w[16];
c3_rand(eny_w); c3_rand(eny_w);
wir = u3nt(u3_blip, c3__arvo, u3_nul);
cad = u3nt(c3__verb, u3_nul, ( c3y == u3_Host.ops_u.veb ) ? c3n : c3y);
bot_u.mod = u3nc(u3nc(u3k(wir), cad), bot_u.mod);
cad = u3nc(c3__wack, u3i_words(16, eny_w)); cad = u3nc(c3__wack, u3i_words(16, eny_w));
bot_u.mod = u3nc(u3nc(wir, cad), bot_u.mod); bot_u.mod = u3nc(u3nc(u3k(wir), cad), bot_u.mod);
cad = u3nc(c3__whom, who); // transfer [who]
bot_u.mod = u3nc(u3nc(u3k(wir), cad), bot_u.mod);
wir = u3nt(u3_blip, c3__arvo, u3_nul); wir = u3nt(u3_blip, c3__arvo, u3_nul);
cad = u3nc(c3__whom, who); // transfer bot_u.mod = u3nc(u3nc(wir, wyr), bot_u.mod); // transfer [wir] and [wyr]
bot_u.mod = u3nc(u3nc(wir, cad), bot_u.mod);
wir = u3nt(u3_blip, c3__arvo, u3_nul);
bot_u.mod = u3nc(u3nc(wir, wyr), bot_u.mod);
} }
// prepend legacy boot event to the userspace sequence // prepend legacy boot event to the userspace sequence