diff options
| author | rsc <devnull@localhost> | 2003-11-24 22:39:06 +0000 |
|---|---|---|
| committer | rsc <devnull@localhost> | 2003-11-24 22:39:06 +0000 |
| commit | 912fba95e74c7631352bc5007249d75e720bbcdf (patch) | |
| tree | b9c86c0c38c71d742ffd3990706f380f8263fd8d /src/cmd | |
| parent | 2db9e4821d8ae4889e63e5bb205b04eccb7af405 (diff) | |
| download | plan9port-912fba95e74c7631352bc5007249d75e720bbcdf.tar.gz plan9port-912fba95e74c7631352bc5007249d75e720bbcdf.tar.bz2 plan9port-912fba95e74c7631352bc5007249d75e720bbcdf.zip | |
Changes for Mac OS X. Most important is stack sizes in samterm,
which were completely bogus. (Libthread used to ignore them but
not anymore. Maybe we really should ignore them, but that breaks
Venti, which needs *really* big stacks.)
Diffstat (limited to 'src/cmd')
| -rw-r--r-- | src/cmd/rm.c | 2 | ||||
| -rw-r--r-- | src/cmd/sam/sam.h | 1 | ||||
| -rw-r--r-- | src/cmd/samterm/mkfile | 2 | ||||
| -rw-r--r-- | src/cmd/samterm/plan9.c | 8 | ||||
| -rw-r--r-- | src/cmd/venti/mkfile | 2 |
5 files changed, 9 insertions, 6 deletions
diff --git a/src/cmd/rm.c b/src/cmd/rm.c index 6066543e..e76fdb0a 100644 --- a/src/cmd/rm.c +++ b/src/cmd/rm.c @@ -6,7 +6,7 @@ char errbuf[ERRMAX]; int ignerr = 0; -void +static void err(char *f) { if(!ignerr){ diff --git a/src/cmd/sam/sam.h b/src/cmd/sam/sam.h index 5ba8a614..7e824da1 100644 --- a/src/cmd/sam/sam.h +++ b/src/cmd/sam/sam.h @@ -16,6 +16,7 @@ #define TRUE 1 #define FALSE 0 +#undef INFINITY /* Darwin declares this as HUGE_VAL */ #define INFINITY 0x7FFFFFFFL #define INCR 25 #define STRSIZE (2*BLOCKSIZE) diff --git a/src/cmd/samterm/mkfile b/src/cmd/samterm/mkfile index a6b9a60e..ba64daf0 100644 --- a/src/cmd/samterm/mkfile +++ b/src/cmd/samterm/mkfile @@ -25,6 +25,6 @@ CFLAGS=$CFLAGS -I../sam LDFLAGS=$LDFLAGS -lframe -ldraw -lthread -l9 -lregexp9 \ -lbio -lfmt -lutf -L$X11/lib -lX11 -lm -o.samterm: $PLAN9/lib/libdraw.a +o.samterm: $PLAN9/lib/libframe.a $PLAN9/lib/libdraw.a $PLAN9/lib/libthread.a <$PLAN9/src/mkone diff --git a/src/cmd/samterm/plan9.c b/src/cmd/samterm/plan9.c index e459bcf3..f12f0850 100644 --- a/src/cmd/samterm/plan9.c +++ b/src/cmd/samterm/plan9.c @@ -15,6 +15,8 @@ static char *exname; +#define STACK 8192 + void getscreen(int argc, char **argv) { @@ -163,7 +165,7 @@ extstart(void) plumbc = chancreate(sizeof(int), 0); arg[0] = plumbc; arg[1] = (void*)fd; - proccreate(extproc, arg, 8192); + proccreate(extproc, arg, STACK); atexit(removeextern); } @@ -256,7 +258,7 @@ plumbstart(void) } arg[0] =plumbc; arg[1] = &fd; - proccreate(plumbproc, arg, 4096); + proccreate(plumbproc, arg, STACK); return 1; } #endif @@ -293,5 +295,5 @@ void hoststart(void) { hostc = chancreate(sizeof(int), 0); - proccreate(hostproc, hostc, 1024); + proccreate(hostproc, hostc, STACK); } diff --git a/src/cmd/venti/mkfile b/src/cmd/venti/mkfile index e899ef3f..7a3e9f2f 100644 --- a/src/cmd/venti/mkfile +++ b/src/cmd/venti/mkfile @@ -72,7 +72,7 @@ it:V: all <$PLAN9/src/mkmany $SLIB: $LIBOFILES - ar rvc $SLIB $LIBOFILES + $AR rvc $SLIB $LIBOFILES # xml.c:D: mkxml dat.h # ./mkxml dat.h > xml.c |