commit a0f1e21ff939612898d63ae2245e47dffc1a8153 from: rsc date: Tue Apr 20 02:03:38 2004 UTC make things work on SunOS commit - e637c944febf271252e59742aa108d6e0a527eb7 commit + a0f1e21ff939612898d63ae2245e47dffc1a8153 blob - 2fdca44510f3e18a3c03d7f8eea3dafec8e03db1 blob + 0bcf3b5c8fd371aa81bcd8f94c7c367d2b71470b --- include/html.h +++ include/html.h @@ -259,7 +259,8 @@ struct Ispacer // Item state flags and value fields enum { - IFbrk = 0x80000000, // forced break before this item +// IFbrk = 0x80000000, // forced break before this item +#define IFbrk 0x80000000 /* too big for sun */ IFbrksp = 0x40000000, // add 1 line space to break (IFbrk set too) IFnobrk = 0x20000000, // break not allowed before this item IFcleft = 0x10000000, // clear left floats (IFbrk set too) blob - efc2a9796cc00494db14822d0952ed7f0a09c555 blob + 12f64b85db0ef1b2fd11f43264350a8f7f029c40 --- src/cmd/9term/SunOS.c +++ src/cmd/9term/SunOS.c @@ -60,14 +60,14 @@ updatewinsize(int row, int col, int dx, int dy) static struct termios ttmode; int -israw(int fd) +isecho(int fd) { if(tcgetattr(fd, &ttmode) < 0) fprint(2, "tcgetattr: %r\n"); if(debug) fprint(2, "israw %c%c\n", ttmode.c_lflag&ICANON ? 'c' : '-', ttmode.c_lflag&ECHO ? 'e' : '-'); - return !(ttmode.c_lflag&(ICANON|ECHO)); + return (ttmode.c_lflag&(ICANON|ECHO)); } int blob - 18b68f4e24cd19ea382e04ce41d07269f42205fb blob + 9cfac9e3c5b643e68631936c31d48dd525cbe0be --- src/cmd/acid/expr.c +++ src/cmd/acid/expr.c @@ -39,7 +39,7 @@ initfsize(void) fsize['s'] = 4; fsize['u'] = 2; fsize['x'] = 2; -}; +} int fmtsize(Value *v) @@ -1021,7 +1021,7 @@ initexpop(void) expop[OFMT] = ofmt; expop[OEVAL] = oeval; expop[OWHAT] = owhat; -}; +} void initexpr(void) blob - db11eb1c7925d8fa1c973834b39c98a8bd421638 blob + bbfb47b15cf8d8c796d24c95bd9c70c09ecec20f --- src/cmd/acid/lex.c +++ src/cmd/acid/lex.c @@ -52,7 +52,7 @@ initcmap(void) cmap['v']= '\v'+1; cmap['\\']= '\\'+1; cmap['"']= '"'+1; -}; +} void kinit(void) blob - 960210378b6ed9df98142559d1149273117f1a24 blob + 0c66e024d92f37ef98d1b9c9c769c324da6a96cd --- src/cmd/acid/print.c +++ src/cmd/acid/print.c @@ -30,7 +30,7 @@ initbinop(void) binop[OCAND]= "&&"; binop[OCOR]= "||"; binop[OASGN]= " = "; -}; +} static char *tabs = "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"; char *typenames[] = { blob - e544d4d79cc10951a2476dd2a40e86d90d6f1ea8 blob + d846b937ec4d5675e3235a0b8305d7cd350399d6 --- src/cmd/bzip2/mkfile +++ src/cmd/bzip2/mkfile @@ -16,7 +16,7 @@ LIB=lib/libbzip2.a SHORTLIB=bio 9 <$PLAN9/src/mkmany -CFLAGS=$CFLAGS -p -DPLAN9 -Ilib +CFLAGS=$CFLAGS -DPLAN9 -Ilib test:V: $O.bzip2 $O.bunzip2 ./$O.bzip2 -1 < sample1.ref > sample1.rb2 blob - d136a78b1ca6804597d3d48af3a3aa5ad411832d blob + 134cbc8f3e3ced8e56a6ba0b85e1dbdc952fd07d --- src/cmd/db/print.c +++ src/cmd/db/print.c @@ -5,6 +5,8 @@ */ #include "defs.h" #include "fns.h" + +#define ptrace dbptrace extern int infile; extern int outfile; blob - 1c1639b947df3201890cf1368457e4db00ca876b blob + d947d8998f366b4702ab26b14c81b16ccd9fe5c2 --- src/cmd/ed.c +++ src/cmd/ed.c @@ -697,6 +697,8 @@ notifyf(void *a, char *s) noted(NDFLT); rescue(); } + if(strstr(s, "child")) + noted(NCONT); fprint(2, "ed: note: %s\n", s); abort(); } @@ -928,7 +930,8 @@ callunix(void) *p = 0; pid = fork(); if(pid == 0) { - execl("/bin/rc", "rc", "-c", buf, 0); + execlp("rc", "rc", "-c", buf, 0); + sysfatal("exec failed: %r"); exits("execl failed"); } waiting = 1; blob - 5b9863b44c857163425a108ed8a8e8c3bbc90c09 blob + 1713a26c3328d24cd886ed3fbc32c368ad23d45a --- src/cmd/gzip/gzip.h +++ src/cmd/gzip/gzip.h @@ -34,7 +34,8 @@ enum GZOSACORN = 13, /* Acorn RISCOS */ GZOSUNK = 255, - GZCRCPOLY = 0xedb88320UL, +#define GZCRCPOLY 0xedb88320 +/* GZCRCPOLY = 0xedb88320UL, */ GZOSINFERNO = GZOSUNIX, }; blob - 9b703de281c09d152c2ba8bf7488a4e03cf6b7a9 blob + d005469f7eb4c8134fa84d253facdb6824ae82b6 --- src/cmd/gzip/zip.h +++ src/cmd/gzip/zip.h @@ -16,7 +16,8 @@ enum ZTrailInfo = 1 << 3, /* uncsize, csize, and crc are in trailer */ ZCompPatch = 1 << 5, /* compression patched data */ - ZCrcPoly = 0xedb88320, +/* ZCrcPoly = 0xedb88320, */ +#define ZCrcPoly 0xedb88320 /* * compression method blob - ee924dde5ebb70fa915322a87852559c25dc9d20 blob + 151b9c3566699194ebeefd079411afe7cf74bb44 --- src/cmd/plot/libplot/mplot.h +++ src/cmd/plot/libplot/mplot.h @@ -18,7 +18,9 @@ extern struct penvir { double grade; int pgap; double pslant; - int pmode, foregr, backgr; + int pmode; + ulong foregr; + ulong backgr; } *e0, *e1, *esave; #define RADIAN 57.3 /* radians per degree */ struct seg { blob - 33a533b8391aff2fdc1b9bb6c65585dbbb238650 blob + 00229db0490f5480adf3cb2da57900db995aeab9 --- src/lib9/sysfatal.c +++ src/lib9/sysfatal.c @@ -15,7 +15,7 @@ sysfatal(char *fmt, ...) va_end(arg); __fixargv0(); - fprint(2, "%s; %s\n", argv0 ? argv0 : "", buf); + fprint(2, "%s: %s\n", argv0 ? argv0 : "", buf); exits("fatal"); } blob - 79a8a11d4050d8c529170b1139ea0b81dcf2e25e blob + 6259a9ce7d070ed9f0802d21ed431238cd6b2338 --- src/lib9p/file.c +++ src/lib9p/file.c @@ -253,7 +253,19 @@ walkfile(File *f, char *path) } free(os); return f; +} + +static Qid +mkqid(vlong path, long vers, int type) +{ + Qid q; + + q.path = path; + q.vers = vers; + q.type = type; + return q; } + Tree* alloctree(char *uid, char *gid, ulong mode, void (*destroy)(File*)) @@ -281,7 +293,7 @@ alloctree(char *uid, char *gid, ulong mode, void (*des muid = estrdup9p(uid); - f->dir.qid = (Qid){0, 0, QTDIR}; + f->dir.qid = mkqid(0, 0, QTDIR); f->dir.length = 0; f->dir.atime = f->dir.mtime = time(0); f->dir.mode = DMDIR | mode; blob - 3a55af3f10c95abcffed9207357027220ad0a77a blob + 6f01778f36b52f92f949f834439d0be0c4a0eeb2 --- src/libflate/deflate.c +++ src/libflate/deflate.c @@ -535,7 +535,7 @@ lzwrite(LZstate *lz, void *buf, int n) if(n && lz->w){ nw = (*lz->w)(lz->wr, buf, n); if(nw != n){ - lz->w = nil; + lz->w = 0; lz->wbad = 1; }else lz->totw += n; blob - abd0a50fba2986c5c52c33fd5d86a31c5d9bd9fd blob + 5fe0158e27e0dc8643c0cd739692be2942a5f536 --- src/libhtml/runetab.c +++ src/libhtml/runetab.c @@ -57,7 +57,7 @@ cvtstringtab(char **tab, int n) rtab = emalloc(n*sizeof(rtab[0])); for(i=0; i>2; rD&3 mbz blob - 8c1ddac8d84ca5dcb5fb6ef0d73360db7030bcfb blob + 07bbd9fca6d23313fb5a3e8ff4816d5b2e0a36be --- src/libmach/symstabs.c +++ src/libmach/symstabs.c @@ -249,7 +249,7 @@ stabssyminit(Fhdr *fp) /* create new symbol, add it */ if(stabcvtsym(&sym, &s, dir, file, i) < 0) continue; - if(addsym(fp, &s) < 0) + if(addsym(fp, &s) == nil) goto err; break; } blob - 518eaae6006fa56b9d02f6269cdcded1e0dd92da blob + a8647f9480ad18086193b9e81f1aa6acb647aae2 --- src/libthread/create.c +++ src/libthread/create.c @@ -25,7 +25,7 @@ newthread(Proc *p, void (*f)(void *arg), void *arg, ui sysfatal("bad stacksize %d", stacksize); t = _threadmalloc(sizeof(Thread), 1); s = _threadmalloc(stacksize, 0); - t->stk = (char*)s; + t->stk = (uchar*)s; t->stksize = stacksize; _threaddebugmemset(s, 0xFE, stacksize); _threadinitstack(t, f, arg); blob - 250a19a2a86a64b88daead0947776cfa80504035 blob + d193d6ce4e6ee5b8b4c9efb3648a0f520c81c08a --- src/libthread/sched.c +++ src/libthread/sched.c @@ -1,3 +1,4 @@ +#include #include #include #include "threadimpl.h"