Merge remote-tracking branch 'urbit/master' into newbreach

This commit is contained in:
Steve Dee 2014-04-09 17:38:59 -07:00
commit 5c5d2b81ec
4 changed files with 14 additions and 1 deletions

1
.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
/urb/urbit.pill binary

View File

@ -137,6 +137,16 @@ _reck_nock_poke(u2_reck* rec_u, u2_noun ovo)
}
#endif
#if 0
{
c3_c* ovi_c = u2_cr_string(u2h(u2t(ovo)));
uL(fprintf(uH, "poke: %s\n", ovi_c));
free(ovi_c);
}
#endif
pro = u2_cn_mung(fun, sam);
return pro;
}

View File

@ -46,7 +46,7 @@ _save_time_cb(uv_timer_t* tim_u, c3_i sas_i)
// uL(fprintf(uH, "autosaving... ent_d %llu\n", u2A->ent_d));
u2_cm_purge();
u2_lo_grab("save", u2_none);
// u2_lo_grab("save", u2_none);
#ifdef FORKPT
c3_w pid_w;

View File

@ -180,12 +180,14 @@ _unix_fs_event_cb(uv_fs_event_t* was_u,
u2_unod* nod_u = (void*)was_u;
// uL(fprintf(uH, "fs: %s in %s\n", pax_c, nod_u->pax_c));
u2_lo_open();
{
while ( nod_u ) {
nod_u->dry = u2_no;
nod_u = (u2_unod*) nod_u->par_u;
}
}
u2_lo_shut(u2_yes);
}
/* _unix_file_watch(): create file tracker (from filesystem)