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

Merge branch 'master' of https://github.com/urbit/urbit

Browse Source
This commit is contained in:
Anton Dyudin 2014-07-01 16:30:30 -07:00 committed by Anton Dyudin
commit b9689a17e1
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
v/unix.c
View File

@ -939,7 +939,14 @@ _unix_pdir(u2_udir* par_u, u2_noun tet)
dir_u = &(par_u->dis_u);
while ( 1 ) {
if ( !*dir_u || !strncmp(((*dir_u)->pax_c + pax_w + 1), tet_c, tet_w) ) {
if ( !*dir_u ||
!strncmp(((*dir_u)->pax_c + pax_w + 1), tet_c, tet_w) )
{
if ( strcmp(((*dir_u)->pax_c + pax_w + 1), tet_c) ) {
uL(fprintf(uH, "par %s %d\n", par_u->pax_c, pax_w));
uL(fprintf(uH, "one %s\n", (*dir_u)->pax_c));
uL(fprintf(uH, "bad %s\n", ((*dir_u)->pax_c + pax_w + 1)));
}
free(tet_c); return dir_u;
}
else dir_u = &((*dir_u)->nex_u);
@ -986,7 +993,7 @@ _unix_desk_sync_tofu(u2_udir* dir_u,
c3_c* pux_c = _unix_file_form(dir_u, u2k(pre), u2_yes, u2k(ext));
u2_ufil** fil_u;
// uL(fprintf(uH, "tofu pox_c %s op %s\n", pox_c, u2_cr_string(u2h(mis))));
uL(fprintf(uH, "tofu pox_c %s op %s\n", pox_c, u2_cr_string(u2h(mis))));
#ifdef SYNCLOG
c3_w slot = u2_Host.unx_u.lot_w++ % 1024;
@ -1081,6 +1088,10 @@ _unix_desk_sync_tofu(u2_udir* dir_u,
static void
_unix_desk_sync_tako(u2_udir* dir_u, u2_noun pax, u2_noun mis)
{
uL(fprintf(uH, "tako path %s, op %s\n",
u2_cr_string(u2_do("spat", u2k(pax))),
u2_cr_string(u2h(mis))));
if ( (u2_no == u2du(pax)) ) {
c3_assert(!"tack");
}