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

added %ogre handling

Browse Source
This commit is contained in:
Philip C Monk 2015-06-09 13:27:22 -04:00
parent b0f8774343
commit cb7a824c18
4 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
i/c/motes.h
View File

@ -734,6 +734,7 @@
# define c3__oak c3_s3('o','a','k')
# define c3__of c3_s2('o','f')
# define c3__off c3_s3('o','f','f')
# define c3__ogre c3_s4('o','g','r','e')
# define c3__old c3_s3('o','l','d')
# define c3__on c3_s2('o','n')
# define c3__onan c3_s4('o','n','a','n')

10
i/v/vere.h
View File

@ -970,7 +970,7 @@
void
u3_unix_ef_move();
/* u3_unix_ef_look(): update filesystem, inbound.
/* u3_unix_ef_look(): update filesystem from unix
*/
void
u3_unix_ef_look(void);
@ -978,8 +978,12 @@
/* u3_unix_ef_ergo(): update filesystem from urbit
*/
void
u3_unix_ef_ergo(u3_noun mon,
u3_noun can);
u3_unix_ef_ergo(u3_noun mon, u3_noun can);
/* u3_unix_ef_ogre(): delete mount point
*/
void
u3_unix_ef_ogre(u3_noun mon);
/* u3_unix_io_init(): initialize storage.
*/

6
v/reck.c
View File

@ -172,10 +172,14 @@ _reck_kick_sync(u3_noun pox, u3_noun fav)
u3_unix_ef_ergo(mon, can);
u3z(pox); u3z(fav); return c3y;
} break;
case c3__ogre: {
u3_unix_ef_ogre(u3k(u3t(fav)));
u3z(pox); u3z(fav); return c3y;
}
}
// XX obviously not right!
//
// ? looks fine to me
u3z(pox); u3z(fav); return c3n;
}

35
v/unix.c
View File

@ -126,27 +126,6 @@ _unix_write_file(c3_c* pax_c, u3_atom mim)
free(dat_y);
}
#if 0
/* _unix_opendir(): opendir, recreating if nonexistent.
*/
static DIR*
_unix_opendir(c3_c* pax_c)
{
DIR* rid_u = opendir(pax_c);
if ( !rid_u ) {
// uL(fprintf(uH, "%s: %s\n", pax_c, strerror(errno)));
_unix_mkdir(pax_c);
rid_u = opendir(pax_c);
if ( !rid_u ) {
uL(fprintf(uH, "%s: %s\n", pax_c, strerror(errno)));
c3_assert(0);
}
}
return rid_u;
}
#endif
/* _unix_get_mount_point(): retrieve or create mount point
*/
static u3_umon*
@ -259,7 +238,6 @@ _unix_free_node(u3_unod* nod_u)
}
}
#if 0
/* _unix_free_mount_point(): free mount point
*/
static void
@ -322,7 +300,6 @@ _delete_mount_point_out:
free(nam_c);
u3z(mon);
}
#endif
/* _unix_fs_event_cb(): filesystem event callback.
*/
@ -552,7 +529,6 @@ _unix_update_dir(u3_udir* dir_u)
c3_i fid_i = open(nod_u->pax_c, O_RDONLY, 0644);
if ( (fid_i < 0) || (fstat(fid_i, &buf_u) < 0) ) {
if ( ENOENT != errno ) {
uL(fprintf(uH, "_unix_update_dir: error opening file %s: %s\r\n",
nod_u->pax_c, strerror(errno)));
@ -842,14 +818,21 @@ _unix_sync_ergo(u3_umon* mon_u, u3_noun can)
/* u3_unix_ef_ergo(): update filesystem from urbit
*/
void
u3_unix_ef_ergo(u3_noun mon,
u3_noun can)
u3_unix_ef_ergo(u3_noun mon, u3_noun can)
{
u3_umon* mon_u = _unix_get_mount_point(mon);
_unix_sync_ergo(mon_u, can);
}
/* u3_unix_ef_ogre(): delete mount point
*/
void
u3_unix_ef_ogre(u3_noun mon)
{
_unix_delete_mount_point(mon);
}
/* u3_unix_io_init(): initialize unix sync.
*/
void