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

Merge branch 'test', because of continuity breach.

Browse Source
This commit is contained in:
C. Guy Yarvin 2015-10-17 12:03:25 -07:00
commit 1d718c9650
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/vere/vere.h
View File

@ -819,7 +819,7 @@
void
u3_term_ef_bake(u3_noun fav);
/* u3_term_ef_blit(): send %blit effect to to terminal.
/* u3_term_ef_blit(): send %blit effect to terminal.
*/
void
u3_term_ef_blit(c3_l tid_l,
@ -950,7 +950,7 @@
void
u3_unix_ef_ogre(u3_noun mon);
/* u3_unix_ef_ogre(): delete mount point
/* u3_unix_ef_hill(): enumerate mount points
*/
void
u3_unix_ef_hill(u3_noun hil);

23
vere/main.c
View File

@ -210,8 +210,25 @@ _main_getopt(c3_i argc, c3_c** argv)
static void
u3_ve_usage(c3_i argc, c3_c** argv)
{
fprintf(stderr, "%s: usage: [-v] [-k stage] [-p ames_port] computer\n",
argv[0]);
c3_c *use_c[] = {"Usage: %s [options...] computer\n",
"-w name Immediately upgrade to ~name\n",
"-t ticket Use ~ticket automatically\n",
"-I galaxy Start as ~galaxy\n",
"-F Fake keys\n",
"-L Local-only network\n",
"-n host Set unix hostname\n",
"-p ames_port Set the HTTP port to bind to\n",
"-v Verbose\n",
"-D Recompute from events\n",
"-P Profiling\n",
"-M Memory madness\n",
"-f Fuzz testing\n",
"-k stage Start at Hoon kernel version stage\n",
"-Xwtf Skip last event\n"};
c3_i i;
for ( i=0; i < sizeof(use_c)/sizeof(c3_c*); i++ ) {
fprintf(stderr,use_c[i],argv[0]);
}
exit(1);
}
@ -325,7 +342,7 @@ main(c3_i argc,
if ( c3y == u3_Host.ops_u.nuu ) {
struct stat s;
if ( !stat(u3_Host.dir_c, &s) ) {
fprintf(stderr, "used -c but %s already exists\n", u3_Host.dir_c);
fprintf(stderr, "tried to create, but %s already exists\n", u3_Host.dir_c);
exit(1);
}
}