ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-16 06:28:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'nextbreach' of github.com:urbit/urbit into nextbreach

Browse Source 
Conflicts:
	urb/urbit.pill
This commit is contained in:
C. Guy Yarvin 2014-06-04 03:44:33 -07:00
commit 8b67582649
3 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/v/vere.h
View File

@ -515,6 +515,7 @@
u2_bean gab; // -g
u2_bean dem; // -d, dem
u2_bean fog; // -Xwtf, skip last event
u2_bean fak; // -F, fake carrier
u2_bean loh; // -L, local-only networking
u2_bean pro; // , profile
u2_bean veb; // -v, verbose (inverse of -q)

10
v/main.c
View File

@ -66,13 +66,13 @@ _main_getopt(c3_i argc, c3_c** argv)
u2_Host.ops_u.loh = u2_no;
u2_Host.ops_u.dem = u2_no;
u2_Host.ops_u.fog = u2_no;
u2_Host.ops_u.fak = u2_no;
u2_Host.ops_u.pro = u2_no;
u2_Host.ops_u.veb = u2_yes;
u2_Host.ops_u.nuu = u2_no;
u2_Host.ops_u.vno = u2_no;
u2_Host.ops_u.kno_w = DefaultKernel;
while ( (ch_i = getopt(argc, argv, "I:X:f:k:l:n:p:r:LabcdgqvV")) != -1 ) {
while ( (ch_i = getopt(argc, argv, "I:X:f:k:l:n:p:r:LabcdgqvF")) != -1 ) {
switch ( ch_i ) {
case 'I': {
u2_Host.ops_u.imp_c = strdup(optarg);
@ -117,6 +117,11 @@ _main_getopt(c3_i argc, c3_c** argv)
break;
}
case 'L': { u2_Host.ops_u.loh = u2_yes; break; }
case 'F': {
u2_Host.ops_u.loh = u2_yes;
u2_Host.ops_u.fak = u2_yes;
break;
}
case 'a': { u2_Host.ops_u.abo = u2_yes; break; }
case 'b': { u2_Host.ops_u.bat = u2_yes; break; }
case 'c': { u2_Host.ops_u.nuu = u2_yes; break; }
@ -124,7 +129,6 @@ _main_getopt(c3_i argc, c3_c** argv)
case 'g': { u2_Host.ops_u.gab = u2_yes; break; }
case 'q': { u2_Host.ops_u.veb = u2_no; break; }
case 'v': { u2_Host.ops_u.veb = u2_yes; break; }
case 'V': { u2_Host.ops_u.vno = u2_yes; break; }
case '?': default: {
return u2_no;
}

32
v/sist.c
View File

@ -307,11 +307,11 @@ _sist_home(u2_reck* rec_u)
}
}
// Copy zod files, if we're generating zod.
// Copy zod files, if we're generating a carrier.
//
if ( u2_Host.ops_u.imp_c && 0 == strcmp(u2_Host.ops_u.imp_c, "~zod") ) {
snprintf(ful_c, 2048, "cp -r %s/zod %s/",
U2_LIB, u2_Host.cpu_c);
if ( u2_Host.ops_u.imp_c ) {
snprintf(ful_c, 2048, "cp -r %s/zod %s/%s",
U2_LIB, u2_Host.cpu_c, u2_Host.ops_u.imp_c+1);
if ( 0 != system(ful_c) ) {
uL(fprintf(uH, "could not %s\n", ful_c));
u2_lo_bail(rec_u);
@ -1191,7 +1191,7 @@ u2_sist_boot(void)
u2_noun ten = _sist_zen(u2A);
uL(fprintf(uH, "generating 2048-bit RSA pair...\n"));
pig = u2nq(c3__make, u2_nul, 11, ten);
pig = u2nq(c3__make, u2_nul, 11, u2nc(ten, u2_Host.ops_u.fak));
}
else {
u2_noun imp = u2_ci_string(u2_Host.ops_u.imp_c);
@ -1202,14 +1202,24 @@ u2_sist_boot(void)
u2_lo_bail(u2A);
}
else {
u2_noun gen = _sist_text(u2A, "generator");
u2_noun gun = u2_dc("slaw", c3__uw, gen);
u2_noun gen = u2_nul;
u2_noun gun = u2_nul;
if (u2_no == u2_Host.ops_u.fak) {
gen = _sist_text(u2A, "generator");
gun = u2_dc("slaw", c3__uw, gen);
if ( u2_nul == gun ) {
fprintf(stderr, "czar: incorrect format\r\n");
u2_lo_bail(u2A);
if ( u2_nul == gun ) {
fprintf(stderr, "czar: incorrect format\r\n");
u2_lo_bail(u2A);
}
}
pig = u2nt(c3__sith, u2k(u2t(whu)), u2k(u2t(gun)));
else {
gun = u2nc(u2_nul, u2_nul);
}
pig = u2nq(c3__sith,
u2k(u2t(whu)),
u2k(u2t(gun)),
u2_Host.ops_u.fak);
u2z(whu); u2z(gun);
}