diff --git a/sys/include/lib9.h b/sys/include/lib9.h index 984c2d7..2e8fd1f 100644 --- a/sys/include/lib9.h +++ b/sys/include/lib9.h @@ -309,5 +309,3 @@ #define sizeD2M jehanne_sizeD2M #define dirmodefmt jehanne_dirmodefmt #define chartorune jehanne_chartorune -#define read(fd, buf, size) jehanne_pread(fd, buf, size, -1) -#define write(fd, buf, size) jehanne_pwrite(fd, buf, size, -1) diff --git a/sys/src/cmd/acme/acme.c b/sys/src/cmd/acme/acme.c index e3b9c0f..9e2ab40 100644 --- a/sys/src/cmd/acme/acme.c +++ b/sys/src/cmd/acme/acme.c @@ -70,7 +70,7 @@ threadmain(int argc, char *argv[]) Display *d; // - rfork(RFENVG|RFNAMEG); + sys_rfork(RFENVG|RFNAMEG); ncol = -1; @@ -138,12 +138,12 @@ threadmain(int argc, char *argv[]) if(loadfile) rowloadfonts(loadfile); putenv("font", fontnames[0]); - snarffd = open("/dev/snarf", OREAD|OCEXEC); + snarffd = sys_open("/dev/snarf", OREAD|OCEXEC); if(cputype){ sprint(buf, "/arch/%s/aux/acme", cputype); - bind(buf, "/cmd", MBEFORE); + sys_bind(buf, "/cmd", MBEFORE); } - bind("/arch/rc/aux/acme", "/cmd", MBEFORE); + sys_bind("/arch/rc/aux/acme", "/cmd", MBEFORE); getwd(wdir, sizeof wdir); if(geninitdraw(nil, derror, fontnames[0], "acme", nil, Refnone) < 0){ @@ -307,7 +307,7 @@ killprocs(void) for(c=command; c; c=c->next) postnote(PNGROUP, c->pid, "hangup"); - remove(acmeerrorfile); + sys_remove(acmeerrorfile); } static int errorfd; @@ -320,7 +320,7 @@ acmeerrorproc(void *v) threadsetname("acmeerrorproc"); buf = emalloc(8192+1); - while((n=read(errorfd, buf, 8192)) >= 0){ + while((n=jehanne_read(errorfd, buf, 8192)) >= 0){ buf[n] = '\0'; sendp(cerr, estrdup(buf)); } @@ -337,21 +337,21 @@ acmeerrorinit(void) sprint(acmeerrorfile, "/srv/acme.%s.%d", getuser(), mainpid); fd = ocreate(acmeerrorfile, OWRITE, 0666); if(fd < 0){ - remove(acmeerrorfile); + sys_remove(acmeerrorfile); fd = ocreate(acmeerrorfile, OWRITE, 0666); if(fd < 0) error("can't create acmeerror file"); } sprint(buf, "%d", pfd[0]); - write(fd, buf, strlen(buf)); - close(fd); + jehanne_write(fd, buf, strlen(buf)); + sys_close(fd); /* reopen pfd[1] close on exec */ sprint(buf, "/fd/%d", pfd[1]); - errorfd = open(buf, OREAD|OCEXEC); + errorfd = sys_open(buf, OREAD|OCEXEC); if(errorfd < 0) error("can't re-open acmeerror file"); - close(pfd[1]); - close(pfd[0]); + sys_close(pfd[1]); + sys_close(pfd[0]); proccreate(acmeerrorproc, nil, STACK); } @@ -935,7 +935,7 @@ putsnarf(void) return; if(snarfbuf.nc > MAXSNARF) return; - fd = open("/dev/snarf", OWRITE); + fd = sys_open("/dev/snarf", OWRITE); if(fd < 0) return; for(i=0; i /* - * like fprint but be sure to deliver as a single write. - * (fprint uses a small write buffer.) + * like fprint but be sure to deliver as a single jehanne_write. + * (fprint uses a small jehanne_write buffer.) */ void xfprint(int fd, char *fmt, ...) @@ -25,7 +25,7 @@ xfprint(int fd, char *fmt, ...) va_end(arg); if(s == nil) sysfatal("smprint: %r"); - write(fd, s, strlen(s)); + jehanne_write(fd, s, strlen(s)); free(s); } @@ -35,7 +35,7 @@ main(int argc, char **argv) int fd; char dir[512]; - fd = open("/dev/acme/ctl", OWRITE); + fd = sys_open("/dev/acme/ctl", OWRITE); if(fd < 0) exits(0); getwd(dir, 512); diff --git a/sys/src/cmd/acme/aux/mkwnew.c b/sys/src/cmd/acme/aux/mkwnew.c index c3c66ee..416932f 100644 --- a/sys/src/cmd/acme/aux/mkwnew.c +++ b/sys/src/cmd/acme/aux/mkwnew.c @@ -36,16 +36,16 @@ main(int argc, char *argv[]) else snprint(wdir, sizeof wdir, "%s/-win", wdir); - if((fd = open("/dev/wnew", ORDWR)) < 0) + if((fd = sys_open("/dev/wnew", ORDWR)) < 0) sysfatal("wnew: can't open /dev/wnew: %r"); if(fprint(fd, "%d %s", pid, wdir+dflag) < 0) sysfatal("wnew: can't create window: %r"); - if(seek(fd, 0, 0) != 0) + if(sys_seek(fd, 0, 0) != 0) sysfatal("wnew: can't seek: %r"); - if((n=read(fd, wdir, sizeof wdir-1)) < 0) + if((n=jehanne_read(fd, wdir, sizeof wdir-1)) < 0) sysfatal("wnew: can't read window id: %r"); wdir[n] = '\0'; diff --git a/sys/src/cmd/acme/aux/win/main.c b/sys/src/cmd/acme/aux/win/main.c index 799168a..15ab18c 100644 --- a/sys/src/cmd/acme/aux/win/main.c +++ b/sys/src/cmd/acme/aux/win/main.c @@ -43,7 +43,7 @@ threadmain(int argc, char *argv[]) char buf[1024], **av; quotefmtinstall(); - rfork(RFNAMEG); + sys_rfork(RFNAMEG); ARGBEGIN{ case 'd': debug = 1; @@ -117,7 +117,7 @@ command(Window *w, char *s) while(*s==' ' || *s=='\t' || *s=='\n') s++; if(strcmp(s, "Delete")==0 || strcmp(s, "Del")==0){ - write(notepg, "hangup", 6); + jehanne_write(notepg, "hangup", 6); windel(w, 1); threadexitsall(nil); return 1; @@ -247,7 +247,7 @@ _sendinput(Window *w, uint32_t q0, uint32_t *q1) /* erase q0 to q0+n */ sprint(buf, "#%lud,#%lud", q0, q0+n); winsetaddr(w, buf, 0); - write(w->data, buf, 0); + jehanne_write(w->data, buf, 0); *q1 -= n; return 0; } @@ -309,20 +309,20 @@ sendit(char *s) { // char tmp[32]; - write(win->body, s, strlen(s)); + jehanne_write(win->body, s, strlen(s)); /* * RSC: The problem here is that other procs can call sendit, * so we lose our single-threadedness if we call sendinput. * In fact, we don't even have the right queue memory, - * I think that we'll get a write event from the body write above, + * I think that we'll get a jehanne_write event from the body jehanne_write above, * and we can do the sendinput then, from our single thread. * * I still need to figure out how to test this assertion for * programs that use /srv/win* * winselect(win, "$", 0); - seek(win->addr, 0UL, 0); - if(read(win->addr, tmp, 2*12) == 2*12) + sys_seek(win->addr, 0UL, 0); + if(jehanne_read(win->addr, tmp, 2*12) == 2*12) hostpt += sendinput(win, hostpt, atol(tmp), ); */ } @@ -446,11 +446,11 @@ mainctl(void *v) case 'S': /* output to stdout */ sprint(tmp, "#%lud", hostpt); winsetaddr(w, tmp, 0); - write(w->data, e->b, e->nb); + jehanne_write(w->data, e->b, e->nb); pendingS += e->nr; break; - case 'E': /* write to tag or body; body happens due to sendit */ + case 'E': /* jehanne_write to tag or body; body happens due to sendit */ delta = e->q1-e->q0; if(e->c2=='I'){ endpt += delta; @@ -509,7 +509,7 @@ mainctl(void *v) if(e->q0 < hostpt) hostpt += delta; if(e->nr>0 && e->r[e->nr-1]==0x7F){ - write(notepg, "interrupt", 9); + jehanne_write(notepg, "interrupt", 9); hostpt = endpt; break; } @@ -617,12 +617,12 @@ execproc(void *v) Channel *cpid; e = v; - rfork(RFCFDG|RFNOTEG); + sys_rfork(RFCFDG|RFNOTEG); av = e->argv; - close(0); - open("/dev/cons", OREAD); - close(1); - open("/dev/cons", OWRITE); + sys_close(0); + sys_open("/dev/cons", OREAD); + sys_close(1); + sys_open("/dev/cons", OWRITE); dup(1, 2); cpid = e->cpid; free(e); @@ -647,11 +647,11 @@ startcmd(char *argv[], int *notepg) cpid = chancreate(sizeof(uint32_t), 0); e->cpid = cpid; sprint(buf, "/mnt/wsys/%d", win->id); - bind(buf, "/dev/acme", MREPL); + sys_bind(buf, "/dev/acme", MREPL); proccreate(execproc, e, EXECSTACK); do pid = recvul(cpid); while(pid == -1); sprint(buf, "/proc/%d/notepg", pid); - *notepg = open(buf, OWRITE); + *notepg = sys_open(buf, OWRITE); } diff --git a/sys/src/cmd/acme/aux/win/pipe.c b/sys/src/cmd/acme/aux/win/pipe.c index bcaaf3b..c8c3c4e 100644 --- a/sys/src/cmd/acme/aux/win/pipe.c +++ b/sys/src/cmd/acme/aux/win/pipe.c @@ -72,20 +72,20 @@ pipecommand(Window *w, char *s) if(w->addr < 0) w->addr = winopenfile(w, "addr"); ctlprint(w->ctl, "addr=dot\n"); - seek(w->addr, 0UL, 0); - if(read(w->addr, tmp, 2*12) == 2*12){ + sys_seek(w->addr, 0UL, 0); + if(jehanne_read(w->addr, tmp, 2*12) == 2*12){ q0 = atol(tmp+0*12); q1 = atol(tmp+1*12); if(q0 == q1){ t = nil; k = 0; if(snarffd > 0){ - seek(0, snarffd, 0); + sys_seek(0, snarffd, 0); for(;;){ t = realloc(t, k+8192+2); if(t == nil) error("alloc failed: %r\n"); - n = read(snarffd, t+k, 8192); + n = jehanne_read(snarffd, t+k, 8192); if(n <= 0) break; k += n; @@ -180,5 +180,5 @@ startpipe(void) { newpipechan = chancreate(sizeof(Window*), 0); threadcreate(newpipethread, nil, STACK); - snarffd = open("/dev/snarf", OREAD|OCEXEC); + snarffd = sys_open("/dev/snarf", OREAD|OCEXEC); } diff --git a/sys/src/cmd/acme/aux/win/win.c b/sys/src/cmd/acme/aux/win/win.c index c9909b9..96595cb 100644 --- a/sys/src/cmd/acme/aux/win/win.c +++ b/sys/src/cmd/acme/aux/win/win.c @@ -20,8 +20,8 @@ newwindow(void) Window *w; w = emalloc(sizeof(Window)); - w->ctl = open("/mnt/wsys/new/ctl", ORDWR|OCEXEC); - if(w->ctl<0 || read(w->ctl, buf, 12)!=12) + w->ctl = sys_open("/mnt/wsys/new/ctl", ORDWR|OCEXEC); + if(w->ctl<0 || jehanne_read(w->ctl, buf, 12)!=12) error("can't open window ctl file: %r"); ctlprint(w->ctl, "noscroll\n"); w->id = atoi(buf); @@ -64,7 +64,7 @@ winopenfile(Window *w, char *f) int fd; sprint(buf, "/mnt/wsys/%d/%s", w->id, f); - fd = open(buf, ORDWR|OCEXEC); + fd = sys_open(buf, ORDWR|OCEXEC); if(fd < 0) error("can't open window file %s: %r", f); return fd; @@ -76,9 +76,9 @@ wintagwrite(Window *w, char *s, int n) int fd; fd = winopenfile(w, "tag"); - if(write(fd, s, n) != n) - error("tag write: %r"); - close(fd); + if(jehanne_write(fd, s, n) != n) + error("tag jehanne_write: %r"); + sys_close(fd); } void @@ -91,7 +91,7 @@ int wingetec(Window *w) { if(w->nbuf == 0){ - w->nbuf = read(w->event, w->buf, sizeof w->buf); + w->nbuf = jehanne_read(w->event, w->buf, sizeof w->buf); if(w->nbuf <= 0){ /* probably because window has exited, and only called by wineventproc, so just shut down */ threadexits(nil); @@ -189,9 +189,9 @@ winread(Window *w, uint32_t q0, uint32_t q1, char *data) nb = 0; while(m < q1){ n = sprint(buf, "#%d", m); - if(write(w->addr, buf, n) != n) + if(jehanne_write(w->addr, buf, n) != n) error("error writing addr: %r"); - n = read(w->data, buf, sizeof buf); + n = jehanne_read(w->data, buf, sizeof buf); if(n < 0) error("reading data: %r"); nr = nrunes(buf, n); @@ -214,15 +214,15 @@ void windormant(Window *w) { if(w->addr >= 0){ - close(w->addr); + sys_close(w->addr); w->addr = -1; } if(w->body >= 0){ - close(w->body); + sys_close(w->body); w->body = -1; } if(w->data >= 0){ - close(w->data); + sys_close(w->data); w->data = -1; } } @@ -231,14 +231,14 @@ int windel(Window *w, int sure) { if(sure) - write(w->ctl, "delete\n", 7); - else if(write(w->ctl, "del\n", 4) != 4) + jehanne_write(w->ctl, "delete\n", 7); + else if(jehanne_write(w->ctl, "del\n", 4) != 4) return 0; /* event proc will die due to read error from event file */ windormant(w); - close(w->ctl); + sys_close(w->ctl); w->ctl = -1; - close(w->event); + sys_close(w->event); w->event = -1; return 1; } @@ -254,7 +254,7 @@ winsetaddr(Window *w, char *addr, int errok) { if(w->addr < 0) w->addr = winopenfile(w, "addr"); - if(write(w->addr, addr, strlen(addr)) < 0){ + if(jehanne_write(w->addr, addr, strlen(addr)) < 0){ if(!errok) error("error writing addr(%s): %r", addr); return 0; diff --git a/sys/src/cmd/acme/buff.c b/sys/src/cmd/acme/buff.c index c51ffbe..eeb590a 100644 --- a/sys/src/cmd/acme/buff.c +++ b/sys/src/cmd/acme/buff.c @@ -257,7 +257,7 @@ loadfile(int fd, uint32_t q0, int *nulls, int(*f)(void*, uint32_t, Rune*, int), * last pass, possibly representing a partial rune. */ while(n > 0){ - n = read(fd, p+m, Maxblock); + n = jehanne_read(fd, p+m, Maxblock); if(n < 0){ warning(nil, "read error in Buffer.load"); break; diff --git a/sys/src/cmd/acme/disk.c b/sys/src/cmd/acme/disk.c index a4498d8..5b6efaf 100644 --- a/sys/src/cmd/acme/disk.c +++ b/sys/src/cmd/acme/disk.c @@ -121,7 +121,7 @@ diskwrite(Disk *d, Block **bp, Rune *r, uint32_t n) b = disknewblock(d, n); *bp = b; } - if(pwrite(d->fd, r, n*sizeof(Rune), b->addr) != n*sizeof(Rune)) + if(sys_pwrite(d->fd, r, n*sizeof(Rune), b->addr) != n*sizeof(Rune)) error("write error to temp file"); b->n = n; } @@ -139,7 +139,7 @@ diskread(Disk *d, Block *b, Rune *r, uint32_t n) n *= sizeof(Rune); p = (char*)r; for(tot = 0; tot < n; tot += nr){ - nr = pread(d->fd, p+tot, n-tot, b->addr+tot); + nr = sys_pread(d->fd, p+tot, n-tot, b->addr+tot); if(nr <= 0) error("read error from temp file"); } diff --git a/sys/src/cmd/acme/ecmd.c b/sys/src/cmd/acme/ecmd.c index 2e99cc5..3f77973 100644 --- a/sys/src/cmd/acme/ecmd.c +++ b/sys/src/cmd/acme/ecmd.c @@ -326,7 +326,7 @@ e_cmd(Text *t, Cmd *cp) samename = runeeq(name, i, t->file->name, t->file->nname); s = runetobyte(name, i); free(name); - fd = open(s, OREAD); + fd = sys_open(s, OREAD); if(fd < 0){ snprint(tmp, sizeof tmp, "can't open %s: %r", s); free(s); @@ -336,7 +336,7 @@ e_cmd(Text *t, Cmd *cp) isdir = (d!=nil && (d->qid.type&QTDIR)); free(d); if(isdir){ - close(fd); + sys_close(fd); snprint(tmp, sizeof tmp, "%s is a directory", s); free(s); editerror(tmp); @@ -345,7 +345,7 @@ e_cmd(Text *t, Cmd *cp) nulls = 0; loadfile(fd, q1, &nulls, readloader, f); free(s); - close(fd); + sys_close(fd); if(nulls) warning(nil, "%s: NUL bytes elided\n", s); else if(allreplaced && samename) diff --git a/sys/src/cmd/acme/exec.c b/sys/src/cmd/acme/exec.c index dc12375..dfcdeca 100644 --- a/sys/src/cmd/acme/exec.c +++ b/sys/src/cmd/acme/exec.c @@ -616,7 +616,7 @@ putfile(File *f, int q0, int q1, Rune *namer, int nname) n = (BUFSIZE-1)/UTFmax; bufread(f, q, r, n); m = snprint(s, BUFSIZE, "%.*S", n, r); - if(write(fd, s, m) != m){ + if(jehanne_write(fd, s, m) != m){ warning(nil, "can't write file %s: %r\n", name); goto Rescue2; } @@ -665,14 +665,14 @@ putfile(File *f, int q0, int q1, Rune *namer, int nname) free(d); free(namer); free(name); - close(fd); + sys_close(fd); winsettag(w); return; Rescue2: fbuffree(s); fbuffree(r); - close(fd); + sys_close(fd); /* fall through */ Rescue1: @@ -1267,7 +1267,7 @@ runproc(void *argvp) if(activewin) winid = activewin->id; } - rfork(RFNAMEG|RFENVG|RFFDG|RFNOTEG); + sys_rfork(RFNAMEG|RFENVG|RFFDG|RFNOTEG); sprint(buf, "%d", winid); putenv("winid", buf); @@ -1280,13 +1280,13 @@ runproc(void *argvp) fprint(2, "child: can't mount /dev/cons: %r\n"); threadexits("mount"); } - close(0); + sys_close(0); if(winid>0 && (pipechar=='|' || pipechar=='>')){ sprint(buf, "/mnt/acme/%d/rdsel", winid); - open(buf, OREAD); + sys_open(buf, OREAD); }else - open("/dev/null", OREAD); - close(1); + sys_open("/dev/null", OREAD); + sys_close(1); if((winid>0 || iseditcmd) && (pipechar=='|' || pipechar=='<')){ if(iseditcmd){ if(winid > 0) @@ -1295,20 +1295,20 @@ runproc(void *argvp) sprint(buf, "/mnt/acme/editout"); }else sprint(buf, "/mnt/acme/%d/wrsel", winid); - open(buf, OWRITE); - close(2); - open("/dev/cons", OWRITE); + sys_open(buf, OWRITE); + sys_close(2); + sys_open("/dev/cons", OWRITE); }else{ - open("/dev/cons", OWRITE); + sys_open("/dev/cons", OWRITE); dup(1, 2); } }else{ - rfork(RFFDG|RFNOTEG); + sys_rfork(RFFDG|RFNOTEG); fsysclose(); - close(0); - open("/dev/null", OREAD); - close(1); - open(acmeerrorfile, OWRITE); + sys_close(0); + sys_open("/dev/null", OREAD); + sys_close(1); + sys_open(acmeerrorfile, OWRITE); dup(1, 2); } @@ -1437,7 +1437,7 @@ run(Window *win, char *s, Rune *rdir, int ndir, int newns, arg[8] = cpid; arg[9] = (void*)(uintptr_t)iseditcmd; proccreate(runproc, arg, STACK); - /* mustn't block here because must be ready to answer mount() call in run() */ + /* mustn't block here because must be ready to answer sys_mount() call in run() */ arg = emalloc(2*sizeof(void*)); arg[0] = c; arg[1] = cpid; diff --git a/sys/src/cmd/acme/fsys.c b/sys/src/cmd/acme/fsys.c index 908113c..2baa256 100644 --- a/sys/src/cmd/acme/fsys.c +++ b/sys/src/cmd/acme/fsys.c @@ -135,15 +135,15 @@ fsysinit(void) cfd = p[0]; sfd = p[1]; fmtinstall('F', fcallfmt); - clockfd = open("/dev/time", OREAD|OCEXEC); - fd = open("/dev/user", OREAD); + clockfd = sys_open("/dev/time", OREAD|OCEXEC); + fd = sys_open("/dev/user", OREAD); if(fd >= 0){ - n = read(fd, buf, sizeof buf-1); + n = jehanne_read(fd, buf, sizeof buf-1); if(n > 0){ buf[n] = 0; user = estrdup(buf); } - close(fd); + sys_close(fd); } proccreate(fsysproc, nil, STACK); } @@ -279,16 +279,16 @@ fsysmount(Rune *dir, int ndir, Rune **incl, int nincl) Mntdir *m; /* close server side so don't hang if acme is half-exited */ - close(sfd); + sys_close(sfd); m = fsysaddid(dir, ndir, incl, nincl); sprint(buf, "%d", m->id); - if(mount(cfd, -1, "/mnt/acme", MREPL, buf, '9') < 0){ + if(sys_mount(cfd, -1, "/mnt/acme", MREPL, buf, '9') < 0){ fsysdelid(m); return nil; } - close(cfd); - bind("/mnt/acme", "/mnt/wsys", MREPL); - if(bind("/mnt/acme", "/dev", MBEFORE) < 0){ + sys_close(cfd); + sys_bind("/mnt/acme", "/mnt/wsys", MREPL); + if(sys_bind("/mnt/acme", "/dev", MBEFORE) < 0){ fsysdelid(m); return nil; } @@ -299,8 +299,8 @@ void fsysclose(void) { closing = 1; - close(cfd); - close(sfd); + sys_close(cfd); + sys_close(sfd); } Xfid* @@ -320,7 +320,7 @@ respond(Xfid *x, Fcall *t, char *err) n = convS2M(t, x->buf, messagesize); if(n <= 0) error("convert error in convS2M"); - if(write(sfd, x->buf, n) != n) + if(jehanne_write(sfd, x->buf, n) != n) error("write error in respond"); free(x->buf); x->buf = nil; @@ -749,7 +749,7 @@ getclock() char buf[32]; buf[0] = '\0'; - pread(clockfd, buf, sizeof buf, 0); + sys_pread(clockfd, buf, sizeof buf, 0); return atoi(buf); } diff --git a/sys/src/cmd/acme/rows.c b/sys/src/cmd/acme/rows.c index 4fdb873..013d6fa 100644 --- a/sys/src/cmd/acme/rows.c +++ b/sys/src/cmd/acme/rows.c @@ -431,7 +431,7 @@ rowdump(Row *row, char *file) } } Bterm(b); - close(fd); + sys_close(fd); free(b); fbuffree(r); @@ -682,7 +682,7 @@ rowload(Row *row, char *file, int initing) free(r); Bterm(bout); free(bout); - close(fd); + sys_close(fd); goto Rescue2; } Bputrune(bout, rune); @@ -690,7 +690,7 @@ rowload(Row *row, char *file, int initing) Bterm(bout); free(bout); textload(&w->body, 0, buf, 1); - close(fd); + sys_close(fd); w->body.file->mod = TRUE; for(n=0; nbody.file->ntext; n++) w->body.file->text[n]->w->dirty = TRUE; diff --git a/sys/src/cmd/acme/text.c b/sys/src/cmd/acme/text.c index 0de76c5..1271f3c 100644 --- a/sys/src/cmd/acme/text.c +++ b/sys/src/cmd/acme/text.c @@ -203,7 +203,7 @@ textload(Text *t, uint32_t q0, char *file, int setqid) warning(nil, "empty directory name\n"); return 0; } - fd = open(file, OREAD); + fd = sys_open(file, OREAD); if(fd < 0){ warning(nil, "can't open %s: %r\n", file); return 0; @@ -265,7 +265,7 @@ textload(Text *t, uint32_t q0, char *file, int setqid) t->file->mtime = d->mtime; t->file->qidpath = d->qid.path; } - close(fd); + sys_close(fd); rp = fbufalloc(); for(q=q0; qfile, q0, r, n); m = snprint(s, BUFSIZE, "%.*S", n, r); - if(write(w->rdselfd, s, m) != m){ + if(jehanne_write(w->rdselfd, s, m) != m){ warning(nil, "can't write temp file for pipe command %r\n"); break; } @@ -244,7 +244,7 @@ xfidclose(Xfid *x) } break; case QWrdsel: - close(w->rdselfd); + sys_close(w->rdselfd); w->rdselfd = 0; break; case QWwrsel: @@ -355,12 +355,12 @@ xfidread(Xfid *x) break; case QWrdsel: - seek(w->rdselfd, off, 0); + sys_seek(w->rdselfd, off, 0); n = x->count; if(n > BUFSIZE) n = BUFSIZE; b = fbufalloc(); - n = read(w->rdselfd, b, n); + n = jehanne_read(w->rdselfd, b, n); if(n < 0){ respond(x, &fc, "I/O error in temp file"); break; diff --git a/sys/src/cmd/auth/as.c b/sys/src/cmd/auth/as.c index f805063..a2fd801 100644 --- a/sys/src/cmd/auth/as.c +++ b/sys/src/cmd/auth/as.c @@ -118,7 +118,7 @@ static int caphashfd; void initcap(void) { - caphashfd = open("#¤/caphash", OCEXEC|OWRITE); + caphashfd = sys_open("#¤/caphash", OCEXEC|OWRITE); if(caphashfd < 0) fprint(2, "%s: opening #¤/caphash: %r\n", argv0); } @@ -152,7 +152,7 @@ mkcap(char *from, char *to) /* give the kernel the hash */ key[-1] = '@'; - if(write(caphashfd, hash, SHA1dlen) < 0){ + if(jehanne_write(caphashfd, hash, SHA1dlen) < 0){ free(cap); return nil; } @@ -165,11 +165,11 @@ usecap(char *cap) { int fd, rv; - fd = open("#¤/capuse", OWRITE); + fd = sys_open("#¤/capuse", OWRITE); if(fd < 0) return -1; - rv = write(fd, cap, strlen(cap)); - close(fd); + rv = jehanne_write(fd, cap, strlen(cap)); + sys_close(fd); return rv; } diff --git a/sys/src/cmd/auth/asn12dsa.c b/sys/src/cmd/auth/asn12dsa.c index 4d2bd76..8ed8e98 100644 --- a/sys/src/cmd/auth/asn12dsa.c +++ b/sys/src/cmd/auth/asn12dsa.c @@ -49,7 +49,7 @@ main(int argc, char **argv) fd = 0; if(argc == 1){ - if((fd = open(*argv, OREAD)) < 0) + if((fd = sys_open(*argv, OREAD)) < 0) sysfatal("open %s: %r", *argv); } @@ -59,7 +59,7 @@ main(int argc, char **argv) buf = realloc(buf, tot+8192); if(buf == nil) sysfatal("realloc: %r"); - if((n = read(fd, buf+tot, 8192)) < 0) + if((n = jehanne_read(fd, buf+tot, 8192)) < 0) sysfatal("read: %r"); if(n == 0) break; @@ -76,6 +76,6 @@ main(int argc, char **argv) key->secret); if(s == nil) sysfatal("smprint: %r"); - write(1, s, strlen(s)); + jehanne_write(1, s, strlen(s)); exits(0); } diff --git a/sys/src/cmd/auth/asn12rsa.c b/sys/src/cmd/auth/asn12rsa.c index ff598d2..dc5d874 100644 --- a/sys/src/cmd/auth/asn12rsa.c +++ b/sys/src/cmd/auth/asn12rsa.c @@ -55,7 +55,7 @@ main(int argc, char **argv) else file = "#d/0"; - if((fd = open(file, OREAD)) < 0) + if((fd = sys_open(file, OREAD)) < 0) sysfatal("open %s: %r", file); buf = nil; tot = 0; @@ -63,7 +63,7 @@ main(int argc, char **argv) buf = realloc(buf, tot+8192); if(buf == nil) sysfatal("realloc: %r"); - if((n = read(fd, buf+tot, 8192)) < 0) + if((n = jehanne_read(fd, buf+tot, 8192)) < 0) sysfatal("read: %r"); if(n == 0) break; @@ -81,6 +81,6 @@ main(int argc, char **argv) key->kp, key->kq, key->c2); if(s == nil) sysfatal("smprint: %r"); - write(1, s, strlen(s)); + jehanne_write(1, s, strlen(s)); exits(0); } diff --git a/sys/src/cmd/auth/authsrv.c b/sys/src/cmd/auth/authsrv.c index 6619ce3..2e917ac 100644 --- a/sys/src/cmd/auth/authsrv.c +++ b/sys/src/cmd/auth/authsrv.c @@ -85,7 +85,7 @@ main(int argc, char *argv[]) if(argc >= 1) getraddr(argv[argc-1]); - alarm(10*60*1000); /* kill a connection after 10 minutes */ + sys_alarm(10*60*1000); /* kill a connection after 10 minutes */ private(); initkeyseed(); @@ -151,7 +151,7 @@ pak1(char *u, Keyslot *k) authpak_hash(k, k->id); } authpak_new(&p, k, y, 0); - if(write(1, y, PAKYLEN) != PAKYLEN) + if(jehanne_write(1, y, PAKYLEN) != PAKYLEN) exits(0); if(readn(0, y, PAKYLEN) != PAKYLEN) exits(0); @@ -164,7 +164,7 @@ pak(Ticketreq *tr) { static uint8_t ok[1] = {AuthOK}; - if(write(1, ok, 1) != 1) + if(jehanne_write(1, ok, 1) != 1) exits(0); /* invalidate pak keys */ @@ -235,7 +235,7 @@ ticketrequest(Ticketreq *tr) n += convT2M(&t, tbuf+n, sizeof(tbuf)-n, &hkey); t.num = AuthTs; n += convT2M(&t, tbuf+n, sizeof(tbuf)-n, &akey); - if(write(1, tbuf, n) != n) + if(jehanne_write(1, tbuf, n) != n) exits(0); syslog(0, AUTHLOG, "tr-ok %s@%s(%s) -> %s@%s", tr->uid, tr->hostid, raddr, tr->uid, tr->authid); @@ -272,7 +272,7 @@ challengebox(Ticketreq *tr) buf[0] = AuthOK; chal = nfastrand(MAXNETCHAL); sprint(buf+1, "%lud", chal); - if(write(1, buf, NETCHLEN+1) != NETCHLEN+1) + if(jehanne_write(1, buf, NETCHLEN+1) != NETCHLEN+1) exits(0); if(readn(0, buf, NETCHLEN) != NETCHLEN) exits(0); @@ -314,7 +314,7 @@ changepasswd(Ticketreq *tr) n = 0; tbuf[n++] = AuthOK; n += convT2M(&t, tbuf+n, sizeof(tbuf)-n, &ukey); - if(write(1, tbuf, n) != n) + if(jehanne_write(1, tbuf, n) != n) exits(0); /* loop trying passwords out */ @@ -363,7 +363,7 @@ changepasswd(Ticketreq *tr) succeed(tr->uid); prbuf[0] = AuthOK; - if(write(1, prbuf, 1) != 1) + if(jehanne_write(1, prbuf, 1) != 1) exits(0); } @@ -540,7 +540,7 @@ vnc(Ticketreq *tr) genrandom(chal+6, VNCchallen); chal[0] = AuthOKvar; sprint((char*)chal+1, "%-5d", VNCchallen); - if(write(1, chal, sizeof(chal)) != sizeof(chal)) + if(jehanne_write(1, chal, sizeof(chal)) != sizeof(chal)) exits(0); /* @@ -596,7 +596,7 @@ chap(Ticketreq *tr) * Create a challenge and send it. */ genrandom((uint8_t*)chal, sizeof(chal)); - if(write(1, chal, sizeof(chal)) != sizeof(chal)) + if(jehanne_write(1, chal, sizeof(chal)) != sizeof(chal)) exits(0); /* @@ -701,7 +701,7 @@ mschap(Ticketreq *tr) * Create a challenge and send it. */ genrandom(chal, sizeof(chal)); - if(write(1, chal, sizeof(chal)) != sizeof(chal)) + if(jehanne_write(1, chal, sizeof(chal)) != sizeof(chal)) exits(0); /* @@ -838,7 +838,7 @@ mschap(Ticketreq *tr) sha1(hash2, 16, 0, s); sha1(chal, 8, digest, s); - if(write(1, digest, 16) != 16) + if(jehanne_write(1, digest, 16) != 16) exits(0); } @@ -990,7 +990,7 @@ replyerror(char *fmt, ...) va_end(arg); buf[AERRLEN] = 0; buf[0] = AuthErr; - write(1, buf, AERRLEN+1); + jehanne_write(1, buf, AERRLEN+1); syslog(0, AUTHLOG, buf+1); } @@ -1080,7 +1080,7 @@ tickauthreply(Ticketreq *tr, Authkey *key) genrandom(a.rand, NONCELEN); a.num = AuthAc; n += convA2M(&a, buf+n, sizeof(buf)-n, &t); - if(write(1, buf, n) != n) + if(jehanne_write(1, buf, n) != n) exits(0); } diff --git a/sys/src/cmd/auth/challenge.c b/sys/src/cmd/auth/challenge.c index d2db1e6..e29dfaa 100644 --- a/sys/src/cmd/auth/challenge.c +++ b/sys/src/cmd/auth/challenge.c @@ -41,7 +41,7 @@ main(int argc, char **argv) if(argc != 1) usage(); - if((afd = open("/mnt/factotum/rpc", ORDWR)) < 0) + if((afd = sys_open("/mnt/factotum/rpc", ORDWR)) < 0) sysfatal("open /mnt/factotum/rpc: %r"); rpc = auth_allocrpc(afd); @@ -53,14 +53,14 @@ main(int argc, char **argv) print("challenge: %s\n", c->chal); print("user:"); - n = read(0, bufu, sizeof bufu); + n = jehanne_read(0, bufu, sizeof bufu); if(n > 0){ bufu[n-1] = '\0'; c->user = bufu; } print("response: "); - n = read(0, buf, sizeof buf); + n = jehanne_read(0, buf, sizeof buf); if(n < 0) sysfatal("read: %r"); if(n == 0) diff --git a/sys/src/cmd/auth/changeuser.c b/sys/src/cmd/auth/changeuser.c index 6628f1a..0e2c5fa 100644 --- a/sys/src/cmd/auth/changeuser.c +++ b/sys/src/cmd/auth/changeuser.c @@ -123,10 +123,10 @@ install(char *db, char *u, Authkey *key, int32_t t, int newkey) if(!exists(db, u)){ sprint(buf, "%s/%s", db, u); - fd = create(buf, OREAD, 0777|DMDIR); + fd = sys_create(buf, OREAD, 0777|DMDIR); if(fd < 0) error("can't create user %s: %r", u); - close(fd); + sys_close(fd); } if(newkey){ @@ -137,10 +137,10 @@ install(char *db, char *u, Authkey *key, int32_t t, int newkey) if(t == -1) return; sprint(buf, "%s/%s/expire", db, u); - fd = open(buf, OWRITE); + fd = sys_open(buf, OWRITE); if(fd < 0 || fprint(fd, "%ld", t) < 0) error("can't write expiration time"); - close(fd); + sys_close(fd); } int diff --git a/sys/src/cmd/auth/convkeys.c b/sys/src/cmd/auth/convkeys.c index 1d10b51..7492336 100644 --- a/sys/src/cmd/auth/convkeys.c +++ b/sys/src/cmd/auth/convkeys.c @@ -72,7 +72,7 @@ main(int argc, char *argv[]) getpass(&nkey, nil, 0, 1); } - fd = open(file, ORDWR); + fd = sys_open(file, ORDWR); if(fd < 0) error("can't open %s: %r\n", file); d = dirfstat(fd); @@ -82,12 +82,12 @@ main(int argc, char *argv[]) p = malloc(len); if(p == nil) error("out of memory"); - if(read(fd, p, len) != len) + if(jehanne_read(fd, p, len) != len) error("can't read key file: %r\n"); len = convert(&p, len); - if(pwrite(fd, p, len, 0) != len) + if(sys_pwrite(fd, p, len, 0) != len) error("can't write key file: %r\n"); - close(fd); + sys_close(fd); exits(nil); } diff --git a/sys/src/cmd/auth/cron.c b/sys/src/cmd/auth/cron.c index bb5c6d4..81eb671 100644 --- a/sys/src/cmd/auth/cron.c +++ b/sys/src/cmd/auth/cron.c @@ -153,7 +153,7 @@ mklock(char *file) free(dir); /* reopen in case it wasn't a lock file at last open */ - close(fd); + sys_close(fd); } for (try = 0; try < 65 && (fd = openlock(file)) < 0; try++) sleep(10*1000); @@ -244,8 +244,8 @@ main(int argc, char *argv[]) && j->time.mon & t.mon) rexec(&users[i], j); } - seek(lock, 0, 0); - write(lock, "x", 1); /* keep the lock alive */ + sys_seek(lock, 0, 0); + jehanne_write(lock, "x", 1); /* keep the lock alive */ /* * if we're not at next minute yet, sleep until a second past * (to allow for sleep intervals being approximate), @@ -265,13 +265,13 @@ createuser(void) user = getuser(); snprint(file, sizeof file, "/cron/%s", user); - fd = create(file, OREAD, 0755|DMDIR); + fd = sys_create(file, OREAD, 0755|DMDIR); if(fd < 0) fatal("couldn't create %s: %r", file); nulldir(&d); d.gid = user; dirfwstat(fd, &d); - close(fd); + sys_close(fd); snprint(file, sizeof file, "/cron/%s/cron", user); fd = ocreate(file, OREAD, 0644); if(fd < 0) @@ -279,7 +279,7 @@ createuser(void) nulldir(&d); d.gid = user; dirfwstat(fd, &d); - close(fd); + sys_close(fd); } void @@ -290,7 +290,7 @@ readalljobs(void) char file[128]; int i, n, fd; - fd = open("/cron", OREAD); + fd = sys_open("/cron", OREAD); if(fd < 0) fatal("can't open /cron: %r"); while((n = dirread(fd, &d)) > 0){ @@ -314,7 +314,7 @@ readalljobs(void) } free(d); } - close(fd); + sys_close(fd); } /* @@ -441,7 +441,7 @@ getname(char **namep) *namep = strdup(buf); if(*namep == 0){ clog("internal error: strdup failure"); - _exits(0); + sys__exits(0); } while(*savec == ' ' || *savec == '\t') savec++; @@ -553,7 +553,7 @@ rexec(User *user, Job *j) { char buf[8*1024]; - switch(rfork(RFPROC|RFNOWAIT|RFNAMEG|RFENVG|RFFDG)){ + switch(sys_rfork(RFPROC|RFNOWAIT|RFNAMEG|RFENVG|RFFDG)){ case 0: break; case -1: @@ -564,23 +564,23 @@ rexec(User *user, Job *j) if(!mkcmd(j->cmd, buf, sizeof buf)){ clog("internal error: cmd buffer overflow"); - _exits(0); + sys__exits(0); } if(becomeuser(user->name) < 0){ clog("%s: can't change uid for %s on %s: %r", user->name, j->cmd, j->host); - _exits(0); + sys__exits(0); } clog("%s: ran '%s' on %s", user->name, j->cmd, j->host); - close(0); - close(1); - close(2); - open("/dev/null", OREAD); - open("/dev/null", OWRITE); - open("/dev/null", OWRITE); + sys_close(0); + sys_close(1); + sys_close(2); + sys_open("/dev/null", OREAD); + sys_open("/dev/null", OWRITE); + sys_open("/dev/null", OWRITE); if(strcmp(j->host, "local") == 0){ putenv(ENV_SERVICE, "rx"); @@ -590,7 +590,7 @@ rexec(User *user, Job *j) } clog("%s: exec failed for %s on %s: %r", user->name, j->cmd, j->host); - _exits(0); + sys__exits(0); } void * @@ -635,7 +635,7 @@ static int caphashfd; void initcap(void) { - caphashfd = open("#¤/caphash", OCEXEC|OWRITE); + caphashfd = sys_open("#¤/caphash", OCEXEC|OWRITE); if(caphashfd < 0) fprint(2, "%s: opening #¤/caphash: %r\n", argv0); } @@ -670,7 +670,7 @@ mkcap(char *from, char *to) /* give the kernel the hash */ key[-1] = '@'; - if(write(caphashfd, hash, SHA1dlen) < 0){ + if(jehanne_write(caphashfd, hash, SHA1dlen) < 0){ free(cap); return nil; } @@ -683,11 +683,11 @@ usecap(char *cap) { int fd, rv; - fd = open("#¤/capuse", OWRITE); + fd = sys_open("#¤/capuse", OWRITE); if(fd < 0) return -1; - rv = write(fd, cap, strlen(cap)); - close(fd); + rv = jehanne_write(fd, cap, strlen(cap)); + sys_close(fd); return rv; } diff --git a/sys/src/cmd/auth/debug.c b/sys/src/cmd/auth/debug.c index 7f64a8f..aa00e07 100644 --- a/sys/src/cmd/auth/debug.c +++ b/sys/src/cmd/auth/debug.c @@ -66,10 +66,10 @@ readcons(char *prompt, char *def, int raw, char *buf, int nbuf) int fdin, fdout, ctl, n, m; char line[10]; - fdin = open("/dev/cons", OREAD); + fdin = sys_open("/dev/cons", OREAD); if(fdin < 0) fdin = 0; - fdout = open("/dev/cons", OWRITE); + fdout = sys_open("/dev/cons", OWRITE); if(fdout < 0) fdout = 1; if(def != nil) @@ -77,22 +77,22 @@ readcons(char *prompt, char *def, int raw, char *buf, int nbuf) else fprint(fdout, "%s: ", prompt); if(raw){ - ctl = open("/dev/consctl", OWRITE); + ctl = sys_open("/dev/consctl", OWRITE); if(ctl >= 0) - write(ctl, "rawon", 5); + jehanne_write(ctl, "rawon", 5); } else ctl = -1; m = 0; for(;;){ - n = read(fdin, line, 1); + n = jehanne_read(fdin, line, 1); if(n == 0){ - close(ctl); + sys_close(ctl); werrstr("readcons: EOF"); return nil; } if(n < 0){ - close(ctl); + sys_close(ctl); werrstr("can't read cons"); return nil; } @@ -100,9 +100,9 @@ readcons(char *prompt, char *def, int raw, char *buf, int nbuf) exits(0); if(n == 0 || line[0] == '\n' || line[0] == '\r'){ if(raw){ - write(ctl, "rawoff", 6); - write(fdout, "\n", 1); - close(ctl); + jehanne_write(ctl, "rawoff", 6); + jehanne_write(fdout, "\n", 1); + sys_close(ctl); } buf[m] = '\0'; if(buf[0]=='\0' && def) @@ -192,7 +192,7 @@ authdialfutz(char *dom, char *user, char *proto) fd = authdial(nil, dom); if(fd >= 0){ print("\tsuccessfully dialed auth server\n"); - close(fd); + sys_close(fd); authfutz(dom, user, proto); return; } @@ -215,7 +215,7 @@ authdialfutz(char *dom, char *user, char *proto) fd = dial(addr=netmkaddr("$auth", nil, "ticket"), 0, 0, 0); if(fd >= 0){ print("\tdial %s succeeded\n", addr); - close(fd); + sys_close(fd); return; } print("\tdial %s failed: %r\n", addr); @@ -236,14 +236,14 @@ getpakkeys(int fd, Ticketreq *tr, Authkey *akey, Authkey *hkey) authpak_hash(akey, tr->authid); authpak_new(&p, akey, y, 1); - if(write(fd, y, PAKYLEN) != PAKYLEN + if(jehanne_write(fd, y, PAKYLEN) != PAKYLEN || readn(fd, y, PAKYLEN) != PAKYLEN || authpak_finish(&p, akey, y)) goto out; authpak_hash(hkey, tr->hostid); authpak_new(&p, hkey, y, 1); - if(write(fd, y, PAKYLEN) != PAKYLEN + if(jehanne_write(fd, y, PAKYLEN) != PAKYLEN || readn(fd, y, PAKYLEN) != PAKYLEN || authpak_finish(&p, hkey, y)) goto out; @@ -287,13 +287,13 @@ authfutz(char *dom, char *user, char *proto) if(strcmp(proto, "dp9ik") == 0 && getpakkeys(fd, &tr, &booteskey, &key) < 0){ print("\tgetpakkeys failed: %r\n"); - close(fd); + sys_close(fd); return; } if((n = _asgetticket(fd, &tr, tbuf, sizeof(tbuf))) < 0){ print("\t_asgetticket failed: %r\n"); - close(fd); + sys_close(fd); return; } m = convM2T(tbuf, n, &t, &key); @@ -337,13 +337,13 @@ authfutz(char *dom, char *user, char *proto) if(strcmp(proto, "dp9ik") == 0 && getpakkeys(fd, &tr, &booteskey, &key) < 0){ print("\tgetpakkeys failed: %r\n"); - close(fd); + sys_close(fd); return; } if((n = _asgetticket(fd, &tr, tbuf, sizeof(tbuf))) < 0){ print("\t_asgetticket failed: %r\n"); - close(fd); + sys_close(fd); return; } m = convM2T(tbuf, n, &t, &key); diff --git a/sys/src/cmd/auth/dsa2pub.c b/sys/src/cmd/auth/dsa2pub.c index 9497a36..3f2f669 100644 --- a/sys/src/cmd/auth/dsa2pub.c +++ b/sys/src/cmd/auth/dsa2pub.c @@ -54,6 +54,6 @@ main(int argc, char **argv) key->pub.p, key->pub.q, key->pub.alpha, key->pub.key); if(s == nil) sysfatal("smprint: %r"); - write(1, s, strlen(s)); + jehanne_write(1, s, strlen(s)); exits(nil); } diff --git a/sys/src/cmd/auth/dsagen.c b/sys/src/cmd/auth/dsagen.c index 95c549c..74799d6 100644 --- a/sys/src/cmd/auth/dsagen.c +++ b/sys/src/cmd/auth/dsagen.c @@ -54,7 +54,7 @@ main(int argc, char **argv) if(s == nil) sysfatal("smprint: %r"); - if(write(1, s, strlen(s)) != strlen(s)) + if(jehanne_write(1, s, strlen(s)) != strlen(s)) sysfatal("write: %r"); exits(nil); diff --git a/sys/src/cmd/auth/factotum/apop.c b/sys/src/cmd/auth/factotum/apop.c index 1d3fb67..bbaa6a9 100644 --- a/sys/src/cmd/auth/factotum/apop.c +++ b/sys/src/cmd/auth/factotum/apop.c @@ -205,7 +205,7 @@ apopclose(Fsstate *fss) s = fss->ps; if(s->asfd >= 0){ - close(s->asfd); + sys_close(s->asfd); s->asfd = -1; } if(s->key != nil){ @@ -243,16 +243,16 @@ dochal(State *s) s->asfd = _authreq(&s->tr, &s->k); if(s->asfd < 0) goto err; - alarm(30*1000); + sys_alarm(30*1000); n = _asrdresp(s->asfd, s->chal, sizeof s->chal); - alarm(0); + sys_alarm(0); if(n <= 5) goto err; return 0; err: if(s->asfd >= 0) - close(s->asfd); + sys_close(s->asfd); s->asfd = -1; return -1; } @@ -271,22 +271,22 @@ doreply(State *s, char *user, char *response) genrandom((uint8_t*)s->tr.chal, CHALLEN); safecpy(s->tr.uid, user, sizeof(s->tr.uid)); - alarm(30*1000); + sys_alarm(30*1000); if(_asrequest(s->asfd, &s->tr) < 0){ - alarm(0); + sys_alarm(0); goto err; } - if(write(s->asfd, response, MD5dlen*2) != MD5dlen*2){ - alarm(0); + if(jehanne_write(s->asfd, response, MD5dlen*2) != MD5dlen*2){ + sys_alarm(0); goto err; } n = _asgetresp(s->asfd, &s->t, &a, &s->k); - alarm(0); + sys_alarm(0); if(n < 0){ /* leave connection open so we can try again */ return -1; } - close(s->asfd); + sys_close(s->asfd); s->asfd = -1; if(s->t.num != AuthTs @@ -305,7 +305,7 @@ doreply(State *s, char *user, char *response) return 0; err: if(s->asfd >= 0) - close(s->asfd); + sys_close(s->asfd); s->asfd = -1; return -1; } diff --git a/sys/src/cmd/auth/factotum/chap.c b/sys/src/cmd/auth/factotum/chap.c index eeee23b..e4593dd 100644 --- a/sys/src/cmd/auth/factotum/chap.c +++ b/sys/src/cmd/auth/factotum/chap.c @@ -140,7 +140,7 @@ chapclose(Fsstate *fss) s = fss->ps; if(s->asfd >= 0){ - close(s->asfd); + sys_close(s->asfd); s->asfd = -1; } free(s); @@ -334,9 +334,9 @@ dochal(State *s) if(s->asfd < 0) goto err; - alarm(30*1000); + sys_alarm(30*1000); n = readn(s->asfd, s->chal, sizeof s->chal); - alarm(0); + sys_alarm(0); if(n != sizeof s->chal) goto err; @@ -344,7 +344,7 @@ dochal(State *s) err: if(s->asfd >= 0) - close(s->asfd); + sys_close(s->asfd); s->asfd = -1; return -1; } @@ -355,22 +355,22 @@ doreply(State *s, uint8_t *reply, int nreply) int n; Authenticator a; - alarm(30*1000); - if(write(s->asfd, reply, nreply) != nreply){ - alarm(0); + sys_alarm(30*1000); + if(jehanne_write(s->asfd, reply, nreply) != nreply){ + sys_alarm(0); goto err; } n = _asgetresp(s->asfd, &s->t, &a, &s->k); if(n < 0){ - alarm(0); + sys_alarm(0); /* leave connection open so we can try again */ return -1; } s->nsecret = readn(s->asfd, s->secret, sizeof s->secret); - alarm(0); + sys_alarm(0); if(s->nsecret < 0) s->nsecret = 0; - close(s->asfd); + sys_close(s->asfd); s->asfd = -1; if(s->t.num != AuthTs @@ -389,7 +389,7 @@ doreply(State *s, uint8_t *reply, int nreply) return 0; err: if(s->asfd >= 0) - close(s->asfd); + sys_close(s->asfd); s->asfd = -1; return -1; } diff --git a/sys/src/cmd/auth/factotum/fgui.c b/sys/src/cmd/auth/factotum/fgui.c index b64ac2f..6942339 100644 --- a/sys/src/cmd/auth/factotum/fgui.c +++ b/sys/src/cmd/auth/factotum/fgui.c @@ -27,7 +27,7 @@ struct RequestType char *file; /* file to read requests from */ void (*f)(Request*); /* request handler */ void (*r)(Controlset*); /* resize handler */ - int fd; /* fd = open(file, ORDWR) */ + int fd; /* fd = sys_open(file, ORDWR) */ Channel *rc; /* channel requests are multiplexed to */ Controlset *cs; }; @@ -140,7 +140,7 @@ readreq(void *a) Request r; Attr **l; - rt->fd = open(rt->file, ORDWR); + rt->fd = sys_open(rt->file, ORDWR); if(rt->fd < 0) sysfatal("opening %s: %r", rt->file); rt->cs = nil; @@ -151,7 +151,7 @@ readreq(void *a) r.rt = rt; for(;;){ - n = read(rt->fd, buf, Requestlen-1); + n = jehanne_read(rt->fd, buf, Requestlen-1); if(n < 0) break; buf[n] = 0; @@ -270,11 +270,11 @@ unhide(void) { int wctl; - wctl = open("/dev/wctl", OWRITE); + wctl = sys_open("/dev/wctl", OWRITE); if(wctl < 0) return; fprint(wctl, "unhide"); - close(wctl); + sys_close(wctl); } static void hide(void) @@ -282,7 +282,7 @@ hide(void) int wctl; int tries; - wctl = open("/dev/wctl", OWRITE); + wctl = sys_open("/dev/wctl", OWRITE); if(wctl < 0) return; for(tries = 0; tries < 10; tries++){ @@ -290,7 +290,7 @@ hide(void) break; sleep(100); } - close(wctl); + sys_close(wctl); } /* @@ -805,10 +805,10 @@ needkey(Request *r) } /* enter the new key */ - fd = open("/mnt/factotum/ctl", OWRITE); + fd = sys_open("/mnt/factotum/ctl", OWRITE); if(fd >= 0){ fprint(fd, "key %A", r->a); - close(fd); + sys_close(fd); } teardownneedkey(r); diff --git a/sys/src/cmd/auth/factotum/fs.c b/sys/src/cmd/auth/factotum/fs.c index 24b5154..b3e2112 100644 --- a/sys/src/cmd/auth/factotum/fs.c +++ b/sys/src/cmd/auth/factotum/fs.c @@ -134,7 +134,7 @@ main(int argc, char **argv) fmtinstall('H', encodefmt); ring = emalloc(sizeof(*ring)); - notify(notifyf); + sys_notify(notifyf); if(gflag){ if(argc != 1) @@ -181,7 +181,7 @@ main(int argc, char **argv) if(fork() == 0){ int fd; - if((fd = open(smprint("%s/factotum/ctl", mtpt), OWRITE)) < 0) + if((fd = sys_open(smprint("%s/factotum/ctl", mtpt), OWRITE)) < 0) sysfatal("can't open factotum: %r"); dup(fd, 1); execl("/bin/auth/secstore", "secstore", "-G", "factotum", nil); @@ -203,7 +203,7 @@ private(void) char buf[64]; snprint(buf, sizeof(buf), "#p/%d/ctl", getpid()); - fd = open(buf, OWRITE); + fd = sys_open(buf, OWRITE); if(fd < 0){ fprint(2, pmsg, argv0); return; @@ -212,15 +212,15 @@ private(void) fprint(2, pmsg, argv0); if(fprint(fd, "noswap") < 0) fprint(2, smsg, argv0); - close(fd); + sys_close(fd); } static void notifyf(void* _, char *s) { if(strncmp(s, "interrupt", 9) == 0 || strncmp(s, "alarm", 5) == 0) - noted(NCONT); - noted(NDFLT); + sys_noted(NCONT); + sys_noted(NDFLT); } enum diff --git a/sys/src/cmd/auth/factotum/p9cr.c b/sys/src/cmd/auth/factotum/p9cr.c index b384415..e4cc8ae 100644 --- a/sys/src/cmd/auth/factotum/p9cr.c +++ b/sys/src/cmd/auth/factotum/p9cr.c @@ -73,7 +73,7 @@ p9crclose(Fsstate *fss) s = fss->ps; if(s->asfd >= 0){ - close(s->asfd); + sys_close(s->asfd); s->asfd = -1; } free(s); @@ -293,14 +293,14 @@ p9crwrite(Fsstate *fss, void *va, uint32_t n) memset(resp, 0, sizeof resp); memmove(resp, data, n); - alarm(30*1000); - if(write(s->asfd, resp, s->challen) != s->challen){ - alarm(0); + sys_alarm(30*1000); + if(jehanne_write(s->asfd, resp, s->challen) != s->challen){ + sys_alarm(0); return failure(fss, Easproto); } /* get ticket plus authenticator from auth server */ ret = _asgetresp(s->asfd, &s->t, &a, &s->k); - alarm(0); + sys_alarm(0); if(ret < 0) return failure(fss, nil); @@ -341,9 +341,9 @@ getchal(State *s, Fsstate *fss) s->asfd = _authreq(&s->tr, &s->k); if(s->asfd < 0) return failure(fss, Easproto); - alarm(30*1000); + sys_alarm(30*1000); n = _asrdresp(s->asfd, s->chal, s->challen); - alarm(0); + sys_alarm(0); if(n <= 0){ if(n == 0) werrstr("_asrdresp short read"); diff --git a/sys/src/cmd/auth/factotum/p9sk1.c b/sys/src/cmd/auth/factotum/p9sk1.c index 3226312..f16b406 100644 --- a/sys/src/cmd/auth/factotum/p9sk1.c +++ b/sys/src/cmd/auth/factotum/p9sk1.c @@ -555,15 +555,15 @@ getastickets(State *s, Ticketreq *tr, uint8_t *y, char *tbuf, int tbuflen) asfd = _authdial(dom); if(asfd < 0) return -1; - alarm(30*1000); + sys_alarm(30*1000); if(y != nil){ rv = -1; s->tr.type = AuthPAK; - if(_asrequest(asfd, tr) != 0 || write(asfd, y, PAKYLEN) != PAKYLEN) + if(_asrequest(asfd, tr) != 0 || jehanne_write(asfd, y, PAKYLEN) != PAKYLEN) goto Out; authpak_new(&s->p, &s->k, (uint8_t*)tbuf, 1); - if(write(asfd, tbuf, PAKYLEN) != PAKYLEN) + if(jehanne_write(asfd, tbuf, PAKYLEN) != PAKYLEN) goto Out; if(_asrdresp(asfd, tbuf, 2*PAKYLEN) != 2*PAKYLEN) @@ -576,8 +576,8 @@ getastickets(State *s, Ticketreq *tr, uint8_t *y, char *tbuf, int tbuflen) s->tr.type = AuthTreq; rv = _asgetticket(asfd, tr, tbuf, tbuflen); Out: - alarm(0); - close(asfd); + sys_alarm(0); + sys_close(asfd); return rv; } diff --git a/sys/src/cmd/auth/factotum/util.c b/sys/src/cmd/auth/factotum/util.c index 1341d41..8ffbdf6 100644 --- a/sys/src/cmd/auth/factotum/util.c +++ b/sys/src/cmd/auth/factotum/util.c @@ -23,13 +23,13 @@ bindnetcs(void) int srvfd; if(access("/net/tcp", AEXIST) < 0) - bind("#I", "/net", MBEFORE); + sys_bind("#I", "/net", MBEFORE); if(access("/net/cs", AEXIST) < 0){ - if((srvfd = open("#s/cs", ORDWR)) >= 0){ - if(mount(srvfd, -1, "/net", MBEFORE, "", '9') >= 0) + if((srvfd = sys_open("#s/cs", ORDWR)) >= 0){ + if(sys_mount(srvfd, -1, "/net", MBEFORE, "", '9') >= 0) return 0; - close(srvfd); + sys_close(srvfd); } return -1; } @@ -44,7 +44,7 @@ netndbauthaddr(void) char *b, *p, *e; int fd, n, m, i; - if((fd = open("/net/ndb", OREAD)) < 0) + if((fd = sys_open("/net/ndb", OREAD)) < 0) return; m = 0; b = nil; @@ -52,11 +52,11 @@ netndbauthaddr(void) if((p = realloc(b, m+CHUNK+1)) == nil) break; b = p; - if((n = read(fd, b+m, CHUNK)) <= 0) + if((n = jehanne_read(fd, b+m, CHUNK)) <= 0) break; m += n; } - close(fd); + sys_close(fd); if(b == nil) return; b[m] = '\0'; @@ -90,7 +90,7 @@ _authdial(char *authdom) { int i, fd; - alarm(30*1000); + sys_alarm(30*1000); if(bindnetcs()>=0) fd = authdial(nil, authdom); else { @@ -115,7 +115,7 @@ _authdial(char *authdom) fd = dial(netmkaddr(authaddr[i], "il", "566"), 0, 0, 0); } } - alarm(0); + sys_alarm(0); return fd; } @@ -127,20 +127,20 @@ _authreq(Ticketreq *tr, Authkey *k) fd = _authdial(tr->authdom); if(fd < 0) return -1; - alarm(30*1000); + sys_alarm(30*1000); if(tsmemcmp(k->aes, zeros, AESKEYLEN) != 0){ if(_asgetpakkey(fd, tr, k) < 0){ - alarm(0); - close(fd); + sys_alarm(0); + sys_close(fd); return -1; } } if(_asrequest(fd, tr) < 0){ - alarm(0); - close(fd); + sys_alarm(0); + sys_close(fd); return -1; } - alarm(0); + sys_alarm(0); return fd; } @@ -155,7 +155,7 @@ promptforkey(char *params) Attr *a, *attr; char *def; - fd = open("/dev/cons", ORDWR); + fd = sys_open("/dev/cons", ORDWR); if(fd < 0) sysfatal("opening /dev/cons: %r"); @@ -191,7 +191,7 @@ promptforkey(char *params) a->type = AttrNameval; } fprint(fd, "!\n"); - close(fd); + sys_close(fd); return attr; } @@ -204,12 +204,12 @@ sendkey(Attr *attr) int fd, rv; char buf[1024]; - fd = open("/mnt/factotum/ctl", ORDWR); + fd = sys_open("/mnt/factotum/ctl", ORDWR); if(fd < 0) sysfatal("opening /mnt/factotum/ctl: %r"); rv = fprint(fd, "key %A\n", attr); - read(fd, buf, sizeof buf); - close(fd); + jehanne_read(fd, buf, sizeof buf); + sys_close(fd); return rv; } @@ -329,7 +329,7 @@ failure(Fsstate *s, char *fmt, ...) vsnprint(e, sizeof e, fmt, arg); va_end(arg); strecpy(s->err, s->err+sizeof(s->err), e); - errstr(e, sizeof e); + sys_errstr(e, sizeof e); } flog("%d: failure %s", s->seqnum, s->err); return RpcFailure; @@ -630,7 +630,7 @@ static int caphashfd; void initcap(void) { - caphashfd = open("#¤/caphash", OWRITE); + caphashfd = sys_open("#¤/caphash", OWRITE); // if(caphashfd < 0) // fprint(2, "%s: opening #¤/caphash: %r\n", argv0); } @@ -664,7 +664,7 @@ mkcap(char *from, char *to) /* give the kernel the hash */ key[-1] = '@'; - if(write(caphashfd, hash, SHA1dlen) < 0){ + if(jehanne_write(caphashfd, hash, SHA1dlen) < 0){ free(cap); return nil; } @@ -767,10 +767,10 @@ readcons(char *prompt, char *def, int raw) char line[10]; char *s; - fdin = open("/dev/cons", OREAD); + fdin = sys_open("/dev/cons", OREAD); if(fdin < 0) fdin = 0; - fdout = open("/dev/cons", OWRITE); + fdout = sys_open("/dev/cons", OWRITE); if(fdout < 0) fdout = 1; if(def != nil) @@ -778,20 +778,20 @@ readcons(char *prompt, char *def, int raw) else fprint(fdout, "%s: ", prompt); if(raw){ - ctl = open("/dev/consctl", OWRITE); + ctl = sys_open("/dev/consctl", OWRITE); if(ctl >= 0) - write(ctl, "rawon", 5); + jehanne_write(ctl, "rawon", 5); } else ctl = -1; s = estrdup(""); for(;;){ - n = read(fdin, line, 1); + n = jehanne_read(fdin, line, 1); if(n == 0){ Error: - close(fdin); - close(fdout); + sys_close(fdin); + sys_close(fdout); if(ctl >= 0) - close(ctl); + sys_close(ctl); free(s); return nil; } @@ -801,12 +801,12 @@ readcons(char *prompt, char *def, int raw) goto Error; if(n == 0 || line[0] == '\n' || line[0] == '\r'){ if(raw){ - write(ctl, "rawoff", 6); - write(fdout, "\n", 1); + jehanne_write(ctl, "rawoff", 6); + jehanne_write(fdout, "\n", 1); } - close(ctl); - close(fdin); - close(fdout); + sys_close(ctl); + sys_close(fdin); + sys_close(fdout); if(*s == 0 && def != nil) s = estrappend(s, "%s", def); return s; @@ -1006,12 +1006,12 @@ writehostowner(char *owner) if((s = strchr(owner,'@')) != nil) *s = 0; - fd = open("#c/hostowner", OWRITE); + fd = sys_open("#c/hostowner", OWRITE); if(fd >= 0){ if(fprint(fd, "%s", owner) < 0) fprint(2, "factotum: setting #c/hostowner to %q: %r\n", owner); - close(fd); + sys_close(fd); } } diff --git a/sys/src/cmd/auth/factotum/wep.c b/sys/src/cmd/auth/factotum/wep.c index be24078..afece33 100644 --- a/sys/src/cmd/auth/factotum/wep.c +++ b/sys/src/cmd/auth/factotum/wep.c @@ -124,8 +124,8 @@ wepwrite(Fsstate *fss, void *va, uint32_t n) goto out; rv = RpcOk; out: - close(fd); - close(cfd); + sys_close(fd); + sys_close(cfd); return rv; } diff --git a/sys/src/cmd/auth/guard.srv.c b/sys/src/cmd/auth/guard.srv.c index e9163c3..ea7992a 100644 --- a/sys/src/cmd/auth/guard.srv.c +++ b/sys/src/cmd/auth/guard.srv.c @@ -74,7 +74,7 @@ main(int argc, char *argv[]) getraddr(argv[argc-1]); argv0 = "guard"; - notify(catchalarm); + sys_notify(catchalarm); /* * read the host and client and get their keys @@ -88,13 +88,13 @@ main(int argc, char *argv[]) chal = nfastrand(MAXNETCHAL); sprint(buf, "challenge: %lud\nresponse: ", chal); n = strlen(buf) + 1; - if(write(1, buf, n) != n){ + if(jehanne_write(1, buf, n) != n){ if(debug) syslog(0, AUTHLOG, "g-fail %s@%s: %r sending chal", user, raddr); exits("replying to server"); } - alarm(3*60*1000); + sys_alarm(3*60*1000); werrstr(""); if(readarg(0, resp, sizeof resp) < 0){ if(debug) @@ -102,14 +102,14 @@ main(int argc, char *argv[]) user, raddr); fail(0); } - alarm(0); + sys_alarm(0); /* remove password login from guard.research.bell-labs.com, sucre, etc. */ // if(!findkey(KEYDB, user, ukey) || !netcheck(ukey, chal, resp)) if(!finddeskey(NETKEYDB, user, ukey) || !netcheck(ukey, chal, resp)) if((err = secureidcheck(user, resp)) != nil){ print("NO %s", err); - write(1, "NO", 2); + jehanne_write(1, "NO", 2); if(debug) { char *r; @@ -131,7 +131,7 @@ main(int argc, char *argv[]) } fail(user); } - write(1, "OK", 2); + jehanne_write(1, "OK", 2); if(debug) syslog(0, AUTHLOG, "g-ok %s@%s", user, raddr); succeed(user); @@ -154,11 +154,11 @@ getraddr(char *dir) char file[128]; snprint(file, sizeof(file), "%s/remote", dir); - fd = open(file, OREAD); + fd = sys_open(file, OREAD); if(fd < 0) return; - n = read(fd, raddr, sizeof(raddr)-1); - close(fd); + n = jehanne_read(fd, raddr, sizeof(raddr)-1); + sys_close(fd); if(n <= 0) return; raddr[n] = 0; diff --git a/sys/src/cmd/auth/keyfs.c b/sys/src/cmd/auth/keyfs.c index 2c15394..4e39fa9 100644 --- a/sys/src/cmd/auth/keyfs.c +++ b/sys/src/cmd/auth/keyfs.c @@ -212,16 +212,16 @@ main(int argc, char *argv[]) } } - switch(rfork(RFPROC|RFNAMEG|RFNOTEG|RFNOWAIT|RFENVG|RFFDG)){ + switch(sys_rfork(RFPROC|RFNAMEG|RFNOTEG|RFNOWAIT|RFENVG|RFFDG)){ case 0: - close(p[0]); + sys_close(p[0]); io(p[1], p[1]); exits(0); case -1: error("fork"); default: - close(p[1]); - if(mount(p[0], -1, mntpt, MREPL|MCREATE, "", '9') < 0) + sys_close(p[1]); + if(sys_mount(p[0], -1, mntpt, MREPL|MCREATE, "", '9') < 0) error("can't mount: %r"); exits(0); } @@ -788,11 +788,11 @@ writeusers(void) fprint(2, "keyfs: can't write keys file\n"); return; } - if(write(fd, buf, p - buf) != (p - buf)) + if(jehanne_write(fd, buf, p - buf) != (p - buf)) fprint(2, "keyfs: can't write keys file\n"); free(buf); - close(fd); + sys_close(fd); newkeys(); } @@ -866,17 +866,17 @@ readusers(void) Dir *d; /* read file into an array */ - fd = open(userkeys, OREAD); + fd = sys_open(userkeys, OREAD); if(fd < 0) return 0; d = dirfstat(fd); if(d == nil){ - close(fd); + sys_close(fd); return 0; } buf = emalloc(d->length); n = readn(fd, buf, d->length); - close(fd); + sys_close(fd); free(d); if(n != d->length){ free(buf); @@ -1075,7 +1075,7 @@ io(int in, int out) thdr.ename = err; } n = convS2M(&thdr, mdata, messagesize); - if(write(out, mdata, n) != n) + if(jehanne_write(out, mdata, n) != n) error("mount write"); now = time(0); @@ -1138,13 +1138,13 @@ warning(void) char buf[64]; snprint(buf, sizeof buf, "-%s", warnarg); - switch(rfork(RFPROC|RFNAMEG|RFNOTEG|RFNOWAIT|RFENVG|RFFDG)){ + switch(sys_rfork(RFPROC|RFNAMEG|RFNOTEG|RFNOWAIT|RFENVG|RFFDG)){ case 0: - i = open("/sys/log/auth", OWRITE); + i = sys_open("/sys/log/auth", OWRITE); if(i >= 0){ dup(i, 2); - seek(2, 0, 2); - close(i); + sys_seek(2, 0, 2); + sys_close(i); } execl("/bin/auth/warning", "warning", warnarg, nil); error("can't exec warning"); diff --git a/sys/src/cmd/auth/lib/error.c b/sys/src/cmd/auth/lib/error.c index adb0109..c1267bf 100644 --- a/sys/src/cmd/auth/lib/error.c +++ b/sys/src/cmd/auth/lib/error.c @@ -31,6 +31,6 @@ error(char *fmt, ...) s = vseprint(s, buf + sizeof(buf), fmt, arg); va_end(arg); *s++ = '\n'; - write(2, buf, s - buf); + jehanne_write(2, buf, s - buf); exits(buf); } diff --git a/sys/src/cmd/auth/lib/getexpiration.c b/sys/src/cmd/auth/lib/getexpiration.c index 5c04d91..a5a487c 100644 --- a/sys/src/cmd/auth/lib/getexpiration.c +++ b/sys/src/cmd/auth/lib/getexpiration.c @@ -54,13 +54,13 @@ getexpiration(char *db, char *u) /* read current expiration (if any) */ snprint(buf, sizeof buf, "%s/%s/expire", db, u); - fd = open(buf, OREAD); + fd = sys_open(buf, OREAD); buf[0] = 0; if(fd >= 0){ - n = read(fd, buf, sizeof(buf)-1); + n = jehanne_read(fd, buf, sizeof(buf)-1); if(n > 0) buf[n-1] = 0; - close(fd); + sys_close(fd); } if(buf[0]){ diff --git a/sys/src/cmd/auth/lib/log.c b/sys/src/cmd/auth/lib/log.c index c8ecfd4..2da3bd5 100644 --- a/sys/src/cmd/auth/lib/log.c +++ b/sys/src/cmd/auth/lib/log.c @@ -26,11 +26,11 @@ record(char *db, char *user, char *msg) int fd; snprint(buf, sizeof buf, "%s/%s/log", db, user); - fd = open(buf, OWRITE); + fd = sys_open(buf, OWRITE); if(fd < 0) return; - write(fd, msg, strlen(msg)); - close(fd); + jehanne_write(fd, msg, strlen(msg)); + sys_close(fd); return; } diff --git a/sys/src/cmd/auth/lib/private.c b/sys/src/cmd/auth/lib/private.c index 65a5b99..037bb54 100644 --- a/sys/src/cmd/auth/lib/private.c +++ b/sys/src/cmd/auth/lib/private.c @@ -30,7 +30,7 @@ private(void) char buf[64]; snprint(buf, sizeof(buf), "#p/%d/ctl", getpid()); - fd = open(buf, OWRITE); + fd = sys_open(buf, OWRITE); if(fd < 0){ fprint(2, pmsg, argv0); return; @@ -39,5 +39,5 @@ private(void) fprint(2, pmsg, argv0); if(fprint(fd, "noswap") < 0) fprint(2, smsg, argv0); - close(fd); + sys_close(fd); } diff --git a/sys/src/cmd/auth/lib/readarg.c b/sys/src/cmd/auth/lib/readarg.c index 6f4a514..758c8a6 100644 --- a/sys/src/cmd/auth/lib/readarg.c +++ b/sys/src/cmd/auth/lib/readarg.c @@ -27,7 +27,7 @@ readarg(int fd, char *arg, int len) i = 0; memset(arg, 0, len); - while(read(fd, buf, 1) == 1){ + while(jehanne_read(fd, buf, 1) == 1){ if(i < len - 1) arg[i++] = *buf; if(*buf == '\0'){ diff --git a/sys/src/cmd/auth/lib/readln.c b/sys/src/cmd/auth/lib/readln.c index bc10913..da13c3d 100644 --- a/sys/src/cmd/auth/lib/readln.c +++ b/sys/src/cmd/auth/lib/readln.c @@ -80,22 +80,22 @@ readln(char *prompt, char *line, int len, int raw) char *p; int fdin, fdout, ctl, n, nr; - fdin = open("/dev/cons", OREAD); - fdout = open("/dev/cons", OWRITE); + fdin = sys_open("/dev/cons", OREAD); + fdout = sys_open("/dev/cons", OWRITE); fprint(fdout, "%s", prompt); if(raw){ - ctl = open("/dev/consctl", OWRITE); + ctl = sys_open("/dev/consctl", OWRITE); if(ctl < 0) error("couldn't set raw mode"); - write(ctl, "rawon", 5); + jehanne_write(ctl, "rawon", 5); } else ctl = -1; nr = 0; p = line; for(;;){ - n = read(fdin, p, 1); + n = jehanne_read(fdin, p, 1); if(n < 0){ - close(ctl); + sys_close(ctl); error("can't read cons\n"); } if(*p == 0x7f) @@ -103,10 +103,10 @@ readln(char *prompt, char *line, int len, int raw) if(n == 0 || *p == '\n' || *p == '\r'){ *p = '\0'; if(raw){ - write(ctl, "rawoff", 6); - write(fdout, "\n", 1); + jehanne_write(ctl, "rawoff", 6); + jehanne_write(fdout, "\n", 1); } - close(ctl); + sys_close(ctl); return; } if(*p == '\b'){ diff --git a/sys/src/cmd/auth/lib/readn.c b/sys/src/cmd/auth/lib/readn.c index 1ae49af..a99e3e8 100644 --- a/sys/src/cmd/auth/lib/readn.c +++ b/sys/src/cmd/auth/lib/readn.c @@ -27,7 +27,7 @@ readn(int fd, char *buf, int len) int m, n; for(n = 0; n < len; n += m){ - m = read(fd, buf+n, len-n); + m = jehanne_read(fd, buf+n, len-n); if(m <= 0) return -1; } diff --git a/sys/src/cmd/auth/lib/readwrite.c b/sys/src/cmd/auth/lib/readwrite.c index 0d3b7b9..d47a5b3 100644 --- a/sys/src/cmd/auth/lib/readwrite.c +++ b/sys/src/cmd/auth/lib/readwrite.c @@ -24,13 +24,13 @@ readfile(char *file, char *buf, int n) { int fd; - fd = open(file, OREAD); + fd = sys_open(file, OREAD); if(fd < 0){ werrstr("%s: %r", file); return -1; } - n = read(fd, buf, n); - close(fd); + n = jehanne_read(fd, buf, n); + sys_close(fd); return n; } @@ -39,11 +39,11 @@ writefile(char *file, char *buf, int n) { int fd; - fd = open(file, OWRITE); + fd = sys_open(file, OWRITE); if(fd < 0) return -1; - n = write(fd, buf, n); - close(fd); + n = jehanne_write(fd, buf, n); + sys_close(fd); return n; } diff --git a/sys/src/cmd/auth/lib/wrbio.c b/sys/src/cmd/auth/lib/wrbio.c index ce97c8e..9e2f9b5 100644 --- a/sys/src/cmd/auth/lib/wrbio.c +++ b/sys/src/cmd/auth/lib/wrbio.c @@ -26,13 +26,13 @@ wrbio(char *file, Acctbio *a) char buf[1024]; int i, fd, n; - fd = open(file, OWRITE); + fd = sys_open(file, OWRITE); if(fd < 0){ fd = ocreate(file, OWRITE, 0660); if(fd < 0) error("can't create %s", file); } - if(seek(fd, 0, 2) < 0) + if(sys_seek(fd, 0, 2) < 0) error("can't seek %s", file); if(a->postid == 0) @@ -54,6 +54,6 @@ wrbio(char *file, Acctbio *a) } n += snprint(buf+n, sizeof(buf)-n, "\n"); - write(fd, buf, n); - close(fd); + jehanne_write(fd, buf, n); + sys_close(fd); } diff --git a/sys/src/cmd/auth/login.c b/sys/src/cmd/auth/login.c index 2eb89d3..ef7c1ad 100644 --- a/sys/src/cmd/auth/login.c +++ b/sys/src/cmd/auth/login.c @@ -26,26 +26,26 @@ readln(char *prompt, char *line, int len, int raw) char *p; int fdin, fdout, ctl, n, nr; - fdin = open("/dev/cons", OREAD); - fdout = open("/dev/cons", OWRITE); + fdin = sys_open("/dev/cons", OREAD); + fdout = sys_open("/dev/cons", OWRITE); fprint(fdout, "%s", prompt); if(raw){ - ctl = open("/dev/consctl", OWRITE); + ctl = sys_open("/dev/consctl", OWRITE); if(ctl < 0){ fprint(2, "login: couldn't set raw mode"); exits("readln"); } - write(ctl, "rawon", 5); + jehanne_write(ctl, "rawon", 5); } else ctl = -1; nr = 0; p = line; for(;;){ - n = read(fdin, p, 1); + n = jehanne_read(fdin, p, 1); if(n < 0){ - close(ctl); - close(fdin); - close(fdout); + sys_close(ctl); + sys_close(fdin); + sys_close(fdout); fprint(2, "login: can't read cons"); exits("readln"); } @@ -54,12 +54,12 @@ readln(char *prompt, char *line, int len, int raw) if(n == 0 || *p == '\n' || *p == '\r'){ *p = '\0'; if(raw){ - write(ctl, "rawoff", 6); - write(fdout, "\n", 1); + jehanne_write(ctl, "rawoff", 6); + jehanne_write(fdout, "\n", 1); } - close(ctl); - close(fdin); - close(fdout); + sys_close(ctl); + sys_close(fdin); + sys_close(fdout); return; } if(*p == '\b'){ @@ -91,7 +91,7 @@ setenv(char *var, char *val) print("init: can't open %s\n", buf); else{ fprint(fd, val); - close(fd); + sys_close(fd); } } @@ -104,11 +104,11 @@ chuid(AuthInfo *ai) int rv, fd; /* change uid */ - fd = open("#¤/capuse", OWRITE); + fd = sys_open("#¤/capuse", OWRITE); if(fd < 0) sysfatal("can't change uid: %r"); - rv = write(fd, ai->cap, strlen(ai->cap)); - close(fd); + rv = jehanne_write(fd, ai->cap, strlen(ai->cap)); + sys_close(fd); if(rv < 0) sysfatal("can't change uid: %r"); } @@ -122,11 +122,11 @@ mountfactotum(char *srvname) int fd; /* mount it */ - fd = open(srvname, ORDWR); + fd = sys_open(srvname, ORDWR); if(fd < 0) sysfatal("opening factotum: %r"); - mount(fd, -1, "/mnt", MBEFORE, "", '9'); - close(fd); + sys_mount(fd, -1, "/mnt", MBEFORE, "", '9'); + sys_close(fd); } /* @@ -186,11 +186,11 @@ startfactotum(char *user, char *password, char *srvname) mountfactotum(srvname); /* write in new key */ - fd = open("/mnt/factotum/ctl", ORDWR); + fd = sys_open("/mnt/factotum/ctl", ORDWR); if(fd < 0) sysfatal("opening factotum: %r"); fprint(fd, "key proto=p9sk1 dom=%s user=%q !password=%q", getauthdom(), user, password); - close(fd); + sys_close(fd); } void @@ -222,7 +222,7 @@ main(int argc, char *argv[]) if(argc != 1) usage(); - rfork(RFENVG|RFNAMEG); + sys_rfork(RFENVG|RFNAMEG); service = getenv(ENV_SERVICE); if(strcmp(service, "cpu") == 0) @@ -257,7 +257,7 @@ main(int argc, char *argv[]) cputype = getenv(ENV_CPUTYPE); sysname = getenv(ENV_SYSNAME); tz = getenv("timezone"); - rfork(RFCENVG); + sys_rfork(RFCENVG); setenv(ENV_SERVICE, "con"); setenv(ENV_USER, user); snprint(home, sizeof(home), "/usr/%s", user); diff --git a/sys/src/cmd/auth/netkey.c b/sys/src/cmd/auth/netkey.c index a49488d..196bb2c 100644 --- a/sys/src/cmd/auth/netkey.c +++ b/sys/src/cmd/auth/netkey.c @@ -52,7 +52,7 @@ main(int argc, char *argv[]) for(;;){ print("challenge: "); - n = read(0, buf, sizeof buf - 1); + n = jehanne_read(0, buf, sizeof buf - 1); if(n <= 0) exits(0); buf[n] = '\0'; diff --git a/sys/src/cmd/auth/newns.c b/sys/src/cmd/auth/newns.c index 87e91f2..a8b8d36 100644 --- a/sys/src/cmd/auth/newns.c +++ b/sys/src/cmd/auth/newns.c @@ -41,7 +41,7 @@ main(int argc, char **argv) char *nsfile, err[ERRMAX]; int add; - rfork(RFNAMEG); + sys_rfork(RFNAMEG); add = 0; nsfile = "/lib/namespace"; ARGBEGIN{ @@ -64,11 +64,11 @@ main(int argc, char **argv) addns(getuser(), nsfile); else newns(getuser(), nsfile); - exec(argv[0], argv); + sys_exec(argv[0], argv); if(!rooted(argv[0])){ rerrstr(err, sizeof err); - exec(smprint("/cmd/%s", argv[0]), argv); - errstr(err, sizeof err); + sys_exec(smprint("/cmd/%s", argv[0]), argv); + sys_errstr(err, sizeof err); } sysfatal("exec: %s: %r", argv[0]); } diff --git a/sys/src/cmd/auth/none.c b/sys/src/cmd/auth/none.c index dcf32e2..67ec4cf 100644 --- a/sys/src/cmd/auth/none.c +++ b/sys/src/cmd/auth/none.c @@ -40,27 +40,27 @@ main(int argc, char *argv[]) usage(); }ARGEND - if (rfork(RFENVG|RFNAMEG) < 0) + if (sys_rfork(RFENVG|RFNAMEG) < 0) sysfatal("can't make new pgrp"); - fd = open("#c/user", OWRITE); + fd = sys_open("#c/user", OWRITE); if (fd < 0) sysfatal("can't open #c/user"); - if (write(fd, "none", strlen("none")) < 0) + if (jehanne_write(fd, "none", strlen("none")) < 0) sysfatal("can't become none"); - close(fd); + sys_close(fd); if (newns("none", namespace) < 0) sysfatal("can't build namespace"); if (argc > 0) { strecpy(cmd, cmd+sizeof cmd, argv[0]); - exec(cmd, &argv[0]); + sys_exec(cmd, &argv[0]); if (strncmp(cmd, "/", 1) != 0 && strncmp(cmd, "./", 2) != 0 && strncmp(cmd, "../", 3) != 0) { snprint(cmd, sizeof cmd, "/bin/%s", argv[0]); - exec(cmd, &argv[0]); + sys_exec(cmd, &argv[0]); } } else { strcpy(cmd, "/bin/rc"); diff --git a/sys/src/cmd/auth/passwd.c b/sys/src/cmd/auth/passwd.c index d79fd8f..4f751c7 100644 --- a/sys/src/cmd/auth/passwd.c +++ b/sys/src/cmd/auth/passwd.c @@ -71,7 +71,7 @@ main(int argc, char **argv) if(_asgetpakkey(fd, &tr, &key) < 0){ Retry: try++; - close(fd); + sys_close(fd); fd = authdial(nil, s); if(fd < 0) error("authdial: %r"); @@ -121,13 +121,13 @@ Retry: } pr.num = AuthPass; n = convPR2M(&pr, buf, sizeof(buf), &t); - if(write(fd, buf, n) != n) + if(jehanne_write(fd, buf, n) != n) error("AS protocol botch: %r"); if(_asrdresp(fd, buf, 0) == 0) break; fprint(2, "passwd: refused: %r\n"); } - close(fd); + sys_close(fd); exits(0); } diff --git a/sys/src/cmd/auth/pemdecode.c b/sys/src/cmd/auth/pemdecode.c index 9d88ab1..30f0b9e 100644 --- a/sys/src/cmd/auth/pemdecode.c +++ b/sys/src/cmd/auth/pemdecode.c @@ -47,7 +47,7 @@ main(int argc, char **argv) else file = "#d/0"; - if((fd = open(file, OREAD)) < 0) + if((fd = sys_open(file, OREAD)) < 0) sysfatal("open %s: %r", file); buf = nil; tot = 0; @@ -55,7 +55,7 @@ main(int argc, char **argv) buf = realloc(buf, tot+8192); if(buf == nil) sysfatal("realloc: %r"); - if((n = read(fd, buf+tot, 8192)) < 0) + if((n = jehanne_read(fd, buf+tot, 8192)) < 0) sysfatal("read: %r"); if(n == 0) break; @@ -65,7 +65,7 @@ main(int argc, char **argv) bin = decodePEM(buf, tag, &len, nil); if(bin == nil) sysfatal("cannot extract section '%s' from pem", tag); - if((n=write(1, bin, len)) != len) + if((n=jehanne_write(1, bin, len)) != len) sysfatal("writing %d bytes got %ld: %r", len, n); exits(0); } diff --git a/sys/src/cmd/auth/pemencode.c b/sys/src/cmd/auth/pemencode.c index bfc58d4..10b7df1 100644 --- a/sys/src/cmd/auth/pemencode.c +++ b/sys/src/cmd/auth/pemencode.c @@ -50,7 +50,7 @@ main(int argc, char **argv) else file = "#d/0"; - if((fd = open(file, OREAD)) < 0) + if((fd = sys_open(file, OREAD)) < 0) sysfatal("open %s: %r", file); buf = nil; tot = 0; @@ -58,7 +58,7 @@ main(int argc, char **argv) buf = realloc(buf, tot+8192); if(buf == nil) sysfatal("realloc: %r"); - if((n = read(fd, buf+tot, 8192)) < 0) + if((n = jehanne_read(fd, buf+tot, 8192)) < 0) sysfatal("read: %r"); if(n == 0) break; diff --git a/sys/src/cmd/auth/respond.c b/sys/src/cmd/auth/respond.c index dc23c44..8ea6664 100644 --- a/sys/src/cmd/auth/respond.c +++ b/sys/src/cmd/auth/respond.c @@ -35,7 +35,7 @@ main(int argc, char **argv) n = auth_respond(argv[1], strlen(argv[1]), buf, sizeof buf-1, auth_getkey, "%s", argv[0]); if(n < 0) sysfatal("auth_respond: %r"); - write(1, buf, n); + jehanne_write(1, buf, n); print("\n"); } diff --git a/sys/src/cmd/auth/rsa2csr.c b/sys/src/cmd/auth/rsa2csr.c index a4ff162..01359f3 100644 --- a/sys/src/cmd/auth/rsa2csr.c +++ b/sys/src/cmd/auth/rsa2csr.c @@ -54,6 +54,6 @@ main(int argc, char **argv) if(cert == nil) sysfatal("X509rsareq: %r"); - write(1, cert, len); + jehanne_write(1, cert, len); exits(0); } diff --git a/sys/src/cmd/auth/rsa2pub.c b/sys/src/cmd/auth/rsa2pub.c index b2efe2b..2bd1be7 100644 --- a/sys/src/cmd/auth/rsa2pub.c +++ b/sys/src/cmd/auth/rsa2pub.c @@ -51,6 +51,6 @@ main(int argc, char **argv) mpsignif(key->pub.n), key->pub.ek, key->pub.n); if(s == nil) sysfatal("smprint: %r"); - write(1, s, strlen(s)); + jehanne_write(1, s, strlen(s)); exits(nil); } diff --git a/sys/src/cmd/auth/rsa2x509.c b/sys/src/cmd/auth/rsa2x509.c index 97c93cb..4e7ed3c 100644 --- a/sys/src/cmd/auth/rsa2x509.c +++ b/sys/src/cmd/auth/rsa2x509.c @@ -57,6 +57,6 @@ main(int argc, char **argv) if(cert == nil) sysfatal("X509rsagen: %r"); - write(1, cert, len); + jehanne_write(1, cert, len); exits(0); } diff --git a/sys/src/cmd/auth/rsafill.c b/sys/src/cmd/auth/rsafill.c index d65f764..e9227a9 100644 --- a/sys/src/cmd/auth/rsafill.c +++ b/sys/src/cmd/auth/rsafill.c @@ -56,6 +56,6 @@ main(int argc, char **argv) key->kp, key->kq, key->c2); if(s == nil) sysfatal("smprint: %r"); - write(1, s, strlen(s)); + jehanne_write(1, s, strlen(s)); exits(nil); } diff --git a/sys/src/cmd/auth/rsagen.c b/sys/src/cmd/auth/rsagen.c index 514326c..10b508d 100644 --- a/sys/src/cmd/auth/rsagen.c +++ b/sys/src/cmd/auth/rsagen.c @@ -65,7 +65,7 @@ main(int argc, char **argv) if(s == nil) sysfatal("smprint: %r"); - if(write(1, s, strlen(s)) != strlen(s)) + if(jehanne_write(1, s, strlen(s)) != strlen(s)) sysfatal("write: %r"); exits(nil); diff --git a/sys/src/cmd/auth/secstore/SConn.c b/sys/src/cmd/auth/secstore/SConn.c index 21d9fc0..1ca841e 100644 --- a/sys/src/cmd/auth/secstore/SConn.c +++ b/sys/src/cmd/auth/secstore/SConn.c @@ -94,7 +94,7 @@ SC_read(SConn *conn, uint8_t *buf, int n) uint8_t count[2], digest[SHA1dlen]; int len, nr; - if(read(ss->fd, count, 2) != 2 || (count[0]&0x80) == 0){ + if(jehanne_read(ss->fd, count, 2) != 2 || (count[0]&0x80) == 0){ snprint((char*)buf,n,"!SC_read invalid count"); return -1; } @@ -145,7 +145,7 @@ SC_write(SConn *conn, uint8_t *buf, int n) len += SHA1dlen; count[0] = 0x80 | len>>8; count[1] = len; - if(write(ss->fd, count, 2) != 2){ + if(jehanne_write(ss->fd, count, 2) != 2){ werrstr("!SC_write invalid count"); return -1; } @@ -154,13 +154,13 @@ SC_write(SConn *conn, uint8_t *buf, int n) rc4(&ss->out.rc4, digest, SHA1dlen); memcpy(enc, buf, n); rc4(&ss->out.rc4, enc, n); - if(write(ss->fd, digest, SHA1dlen) != SHA1dlen || + if(jehanne_write(ss->fd, digest, SHA1dlen) != SHA1dlen || write(ss->fd, enc, n) != n){ werrstr("!SC_write error on send"); return -1; } }else{ - if(write(ss->fd, buf, n) != n){ + if(jehanne_write(ss->fd, buf, n) != n){ werrstr("!SC_write error on send"); return -1; } diff --git a/sys/src/cmd/auth/secstore/dirls.c b/sys/src/cmd/auth/secstore/dirls.c index 801b655..d15a525 100644 --- a/sys/src/cmd/auth/secstore/dirls.c +++ b/sys/src/cmd/auth/secstore/dirls.c @@ -28,11 +28,11 @@ ls(char *p, Dir **dirbuf) if((db = dirstat(p)) == nil || !(db->qid.type & QTDIR) || - (fd = open(p, OREAD)) < 0 ) + (fd = sys_open(p, OREAD)) < 0 ) return -1; free(db); n = dirreadall(fd, dirbuf); - close(fd); + sys_close(fd); return n; } @@ -48,15 +48,15 @@ sha1file(char *pfx, char *nm) len = strlen(pfx)+1+strlen(nm)+1; tmp = emalloc(len); snprint(tmp, len, "%s/%s", pfx, nm); - if((fd = open(tmp, OREAD)) < 0){ + if((fd = sys_open(tmp, OREAD)) < 0){ free(tmp); return nil; } free(tmp); s = nil; - while((n = read(fd, buf, sizeof buf)) > 0) + while((n = jehanne_read(fd, buf, sizeof buf)) > 0) s = sha1(buf, n, nil, s); - close(fd); + sys_close(fd); sha1(nil, 0, digest, s); return digest; } diff --git a/sys/src/cmd/auth/secstore/secstore.c b/sys/src/cmd/auth/secstore/secstore.c index 8d2c989..321e3bd 100644 --- a/sys/src/cmd/auth/secstore/secstore.c +++ b/sys/src/cmd/auth/secstore/secstore.c @@ -91,7 +91,7 @@ getfile(SConn *conn, char *gf, uint8_t **buf, uint32_t *buflen, uint8_t *key, in return -1; } if(buf == nil) - write(1, s, n); + jehanne_write(1, s, n); else memmove(*buf + i, s, n); } @@ -132,7 +132,7 @@ getfile(SConn *conn, char *gf, uint8_t **buf, uint32_t *buflen, uint8_t *key, in n = ibw - ibr - CHK; if(n > 0){ if(buf == nil){ - nw = write(fd, ibr, n); + nw = jehanne_write(fd, ibr, n); if(nw != n){ fprint(2, "secstore: write error on %s", gf); return -1; @@ -149,7 +149,7 @@ getfile(SConn *conn, char *gf, uint8_t **buf, uint32_t *buflen, uint8_t *key, in ibr = ib; } if(buf == nil) - close(fd); + sys_close(fd); n = ibw-ibr; if(n != CHK || memcmp(ib, "XXXXXXXXXXXXXXXX", CHK) != 0){ fprint(2, "secstore: decrypted file failed to authenticate!\n"); @@ -183,12 +183,12 @@ putfile(SConn *conn, char *pf, uint8_t *buf, uint32_t len, uint8_t *key, int nke if(buf == nil){ /* get file size */ - if((fd = open(pf, OREAD)) < 0){ + if((fd = sys_open(pf, OREAD)) < 0){ fprint(2, "secstore: can't open %s: %r\n", pf); return -1; } - len = seek(fd, 0, 2); - seek(fd, 0, 0); + len = sys_seek(fd, 0, 2); + sys_seek(fd, 0, 0); } else fd = -1; if(len > MAXFILESIZE){ @@ -207,7 +207,7 @@ putfile(SConn *conn, char *pf, uint8_t *buf, uint32_t len, uint8_t *key, int nke memcpy(b, IV, ivo); for(done = 0; !done; ){ if(buf == nil){ - n = read(fd, b+ivo, Maxmsg-ivo); + n = jehanne_read(fd, b+ivo, Maxmsg-ivo); if(n < 0){ fprint(2, "secstore: read error on %s: %r\n", pf); @@ -237,7 +237,7 @@ putfile(SConn *conn, char *pf, uint8_t *buf, uint32_t len, uint8_t *key, int nke } if(buf == nil) - close(fd); + sys_close(fd); fprint(2, "secstore: saved %ld bytes\n", len); return 0; @@ -278,11 +278,11 @@ cmd(AuthConn *c, char **gf, int *Gflag, char **pf, char **rf) while(len>0){ memnext = (uint8_t*)strchr((char*)memcur, '\n'); if(memnext){ - write(1, memcur, memnext-memcur+1); + jehanne_write(1, memcur, memnext-memcur+1); len -= memnext-memcur+1; memcur = memnext+1; }else{ - write(1, memcur, len); + jehanne_write(1, memcur, len); break; } } diff --git a/sys/src/cmd/auth/secstore/secstored.c b/sys/src/cmd/auth/secstore/secstored.c index 288d8dd..8886623 100644 --- a/sys/src/cmd/auth/secstore/secstored.c +++ b/sys/src/cmd/auth/secstore/secstored.c @@ -86,7 +86,7 @@ getfile(SConn *conn, char *id, char *gf) /* send file size */ s = emalloc(Maxmsg); snprint(s, Maxmsg, "%s/store/%s/%s", SECSTORE_DIR, id, gf); - gd = open(s, OREAD); + gd = sys_open(s, OREAD); if(gd < 0){ syslog(0, LOG, "can't open %s: %r", s); free(s); @@ -120,7 +120,7 @@ getfile(SConn *conn, char *id, char *gf) /* send file in Maxmsg chunks */ while(len > 0){ - n = read(gd, s, Maxmsg); + n = jehanne_read(gd, s, Maxmsg); if(n <= 0){ syslog(0, LOG, "read error on %s: %r", gf); free(s); @@ -129,7 +129,7 @@ getfile(SConn *conn, char *id, char *gf) conn->write(conn, (uint8_t*)s, n); len -= n; } - close(gd); + sys_close(gd); free(s); return 0; } @@ -168,14 +168,14 @@ putfile(SConn *conn, char *id, char *pf) syslog(0, LOG, "empty file chunk"); return -1; } - nw = write(pd, s, n); + nw = jehanne_write(pd, s, n); if(nw != n){ syslog(0, LOG, "write error on %s: %r", pf); return -1; } len -= n; } - close(pd); + sys_close(pd); return 0; } @@ -200,7 +200,7 @@ removefile(SConn *conn, char *id, char *f) } free(d); - if(remove(buf) < 0){ + if(sys_remove(buf) < 0){ snprint(buf, sizeof buf, "remove failed: %r"); writerr(conn, buf); return -1; @@ -216,15 +216,15 @@ remoteIP(char *ldir) char rp[100], ap[500]; snprint(rp, sizeof rp, "%s/remote", ldir); - fd = open(rp, OREAD); + fd = sys_open(rp, OREAD); if(fd < 0) return strdup("?!?"); - n = read(fd, ap, sizeof ap); + n = jehanne_read(fd, ap, sizeof ap); if(n <= 0 || n == sizeof ap){ fprint(2, "secstored: error %d reading %s: %r\n", n, rp); return strdup("?!?"); } - close(fd); + sys_close(fd); ap[n--] = 0; if(ap[n] == '\n') ap[n] = 0; @@ -361,7 +361,7 @@ main(int argc, char **argv) }ARGEND; if(!verbose) - switch(rfork(RFNOTEG|RFPROC|RFFDG)) { + switch(sys_rfork(RFNOTEG|RFPROC|RFFDG)) { case -1: sysfatal("fork: %r"); case 0: @@ -381,7 +381,7 @@ main(int argc, char **argv) switch(fork()){ case -1: fprint(2, "secstore forking: %r\n"); - close(lcfd); + sys_close(lcfd); break; case 0: /* @@ -397,14 +397,14 @@ main(int argc, char **argv) db = ndbcat(db, db2); if((dfd = accept(lcfd, ldir)) < 0) exits("can't accept"); - alarm(30*60*1000); /* 30 min */ + sys_alarm(30*60*1000); /* 30 min */ remote = remoteIP(ldir); syslog(0, LOG, "secstore from %s", remote); free(remote); dologin(dfd, S, forceSTA); exits(nil); default: - close(lcfd); + sys_close(lcfd); break; } } diff --git a/sys/src/cmd/auth/secstore/secuser.c b/sys/src/cmd/auth/secstore/secuser.c index d24cbd8..6bf1250 100644 --- a/sys/src/cmd/auth/secstore/secuser.c +++ b/sys/src/cmd/auth/secstore/secuser.c @@ -36,7 +36,7 @@ ensure_exists(char *f, uint32_t perm) fd = ocreate(f, OREAD, perm); if(fd < 0) sysfatal("unable to create %s: %r", f); - close(fd); + sys_close(fd); } @@ -214,7 +214,7 @@ main(int argc, char **argv) sysfatal("can't write password file: %r"); else{ print("change written\n"); - if(isnew && create(home, OREAD, DMDIR | 0775L) < 0) + if(isnew && sys_create(home, OREAD, DMDIR | 0775L) < 0) sysfatal("unable to create %s: %r", home); } @@ -228,7 +228,7 @@ userinput(char *buf, int blen) int n; for(;;){ - n = read(0, buf, blen); + n = jehanne_read(0, buf, blen); if(n<=0) exits("read error"); if(buf[n-1]=='\n'){ diff --git a/sys/src/cmd/auth/secstore/util.c b/sys/src/cmd/auth/secstore/util.c index f063183..82a2a3e 100644 --- a/sys/src/cmd/auth/secstore/util.c +++ b/sys/src/cmd/auth/secstore/util.c @@ -55,10 +55,10 @@ getpassm(char *prompt) static int cons, consctl; /* closing & reopening fails in ssh environment */ if(cons == 0){ /* first time? */ - cons = open("/dev/cons", ORDWR); + cons = sys_open("/dev/cons", ORDWR); if(cons < 0) sysfatal("couldn't open cons"); - consctl = open("/dev/consctl", OWRITE); + consctl = sys_open("/dev/consctl", OWRITE); if(consctl < 0) sysfatal("couldn't set raw mode via consctl"); } @@ -67,7 +67,7 @@ getpassm(char *prompt) nr = 0; p = line; for(;;){ - n = read(cons, p, 1); + n = jehanne_read(cons, p, 1); if(n < 0){ fprint(consctl, "rawoff"); fprint(cons, "\n"); diff --git a/sys/src/cmd/auth/secureidcheck.c b/sys/src/cmd/auth/secureidcheck.c index 9d91e2c..1be6c17 100644 --- a/sys/src/cmd/auth/secureidcheck.c +++ b/sys/src/cmd/auth/secureidcheck.c @@ -177,16 +177,16 @@ rpc(char *dest, Secret *shared, Packet *req) * increased timeout from 4sec to 15sec because * corporate server really takes that int32_t. */ - alarm(15000); - m = write(fd, buf, n); + sys_alarm(15000); + m = jehanne_write(fd, buf, n); if(m != n){ syslog(0, AUTHLOG, "%s: rpc write err %d %d: %r", dest, m, n); m = -1; break; } - m = read(fd, buf2, sizeof buf2); - alarm(0); + m = jehanne_read(fd, buf2, sizeof buf2); + sys_alarm(0); if(m < 0){ syslog(0, AUTHLOG, "%s rpc read err %d: %r", dest, m); break; /* failure */ @@ -199,7 +199,7 @@ rpc(char *dest, Secret *shared, Packet *req) break; syslog(0, AUTHLOG, "%s bad rpc chksum", dest); } - close(fd); + sys_close(fd); if(m <= 0) return nil; diff --git a/sys/src/cmd/auth/warning.c b/sys/src/cmd/auth/warning.c index 3c45601..0c94cfc 100644 --- a/sys/src/cmd/auth/warning.c +++ b/sys/src/cmd/auth/warning.c @@ -81,13 +81,13 @@ dodir(Fs *f) complain("can't chdir to %s: %r", f->keys); return; } - fd = open(".", OREAD); + fd = sys_open(".", OREAD); if(fd < 0){ complain("can't open %s: %r\n", f->keys); return; } nfiles = dirreadall(fd, &dirbuf); - close(fd); + sys_close(fd); for(i = 0; i < nfiles; i++) douser(f, dirbuf[i].name); } @@ -226,7 +226,7 @@ mail(Fs *f, char *rcvr, char *user, int32_t et) default: if(debug) fprint(2, "started %d\n", pid); - close(pfd[0]); + sys_close(pfd[0]); ct = ctime(et); p = strchr(ct, '\n'); *p = '.'; @@ -239,13 +239,13 @@ mail(Fs *f, char *rcvr, char *user, int32_t et) else p = f->keys; sprint(buf, "/adm/warn.%s", p); - fd = open(buf, OREAD); + fd = sys_open(buf, OREAD); if(fd >= 0){ - while((i = read(fd, buf, sizeof(buf))) > 0) - write(pfd[1], buf, i); - close(fd); + while((i = jehanne_read(fd, buf, sizeof(buf))) > 0) + jehanne_write(pfd[1], buf, i); + sys_close(fd); } - close(pfd[1]); + sys_close(pfd[1]); /* wait for warning to be mailed */ for(;;){ @@ -272,8 +272,8 @@ mail(Fs *f, char *rcvr, char *user, int32_t et) newns("none", 0); dup(pfd[0], 0); - close(pfd[0]); - close(pfd[1]); + sys_close(pfd[0]); + sys_close(pfd[1]); putenv("upasname", "netkeys"); if(debug){ print("\nto %s\n", rcvr); @@ -299,7 +299,7 @@ complain(char *fmt, ...) s = vseprint(s, buf + sizeof(buf) / sizeof(*buf), fmt, arg); va_end(arg); *s++ = '\n'; - write(2, buf, s - buf); + jehanne_write(2, buf, s - buf); } int32_t @@ -308,13 +308,13 @@ readnumfile(char *file) int fd, n; char buf[64]; - fd = open(file, OREAD); + fd = sys_open(file, OREAD); if(fd < 0){ complain("can't open %s: %r", file); return 0; } - n = read(fd, buf, sizeof(buf)-1); - close(fd); + n = jehanne_read(fd, buf, sizeof(buf)-1); + sys_close(fd); if(n < 0){ complain("can't read %s: %r", file); return 0; @@ -328,11 +328,11 @@ writenumfile(char *file, int32_t num) { int fd; - fd = open(file, OWRITE); + fd = sys_open(file, OWRITE); if(fd < 0){ complain("can't open %s: %r", file); return; } fprint(fd, "%ld", num); - close(fd); + sys_close(fd); } diff --git a/sys/src/cmd/awk/popen.c b/sys/src/cmd/awk/popen.c index 8a7cdbb..37fc7b0 100644 --- a/sys/src/cmd/awk/popen.c +++ b/sys/src/cmd/awk/popen.c @@ -58,17 +58,17 @@ popen(char *cmd, int mode) return nil; case 0: /* myside and hisside reverse roles in child */ - close(myside); + sys_close(myside); dup(hisside, tst(0, 1)); for (i=NSYSFILE; i0) - if(write(1, buf, n)!=n) + while((n=jehanne_read(f, buf, (int32_t)sizeof buf))>0) + if(jehanne_write(1, buf, n)!=n) sysfatal("write error copying %s: %r", s); if(n < 0) sysfatal("error reading %s: %r", s); @@ -32,12 +32,12 @@ main(int argc, char *argv[]) if(argc == 1) cat(0, ""); else for(i=1; i= 0) buf[n] = '\0'; if ((lp = strchr(buf, '[')) == nil || (rp = strrchr(buf, ']')) == nil) { @@ -143,9 +143,9 @@ procsetname(char *fmt, ...) if (cmdname == nil) return; snprint(buf, sizeof buf, "#p/%d/args", getpid()); - if((fd = open(buf, OWRITE)) >= 0){ - write(fd, cmdname, strlen(cmdname)+1); - close(fd); + if((fd = sys_open(buf, OWRITE)) >= 0){ + jehanne_write(fd, cmdname, strlen(cmdname)+1); + sys_close(fd); } free(cmdname); } @@ -160,17 +160,17 @@ main(int argc, char **argv) quotefmtinstall(); origargs = procgetname(); /* see if we should use a larger message size */ - fd = open("/dev/draw", OREAD); + fd = sys_open("/dev/draw", OREAD); if(fd > 0){ ms = iounit(fd); if(msgsize < ms+IOHDRSZ) msgsize = ms+IOHDRSZ; - close(fd); + sys_close(fd); } user = getuser(); if(user == nil) - fatal(1, "can't read user name"); + fatal(1, "can't jehanne_read user name"); ARGBEGIN{ case 'a': p = EARGF(usage()); @@ -259,9 +259,9 @@ main(int argc, char **argv) } /* Begin serving the gnot namespace */ - close(0); + sys_close(0); dup(data, 0); - close(data); + sys_close(data); sprint(buf, "%d", msgsize); ac = 0; @@ -275,7 +275,7 @@ main(int argc, char **argv) av[ac++] = patternfile; } av[ac] = nil; - exec(exportfs, av); + sys_exec(exportfs, av); fatal(1, "starting exportfs"); } @@ -308,7 +308,7 @@ remoteside(int old) char user[MaxStr], home[MaxStr], buf[MaxStr], xdir[MaxStr], cmd[MaxStr]; int i, n, fd, badchdir, gotcmd; - rfork(RFENVG); + sys_rfork(RFENVG); putenv(ENV_SERVICE, "cpu"); fd = 0; @@ -356,28 +356,28 @@ remoteside(int old) writestr(fd, "FS", "FS", 0); writestr(fd, "/", "exportfs dir", 0); - n = read(fd, buf, sizeof(buf)); + n = jehanne_read(fd, buf, sizeof(buf)); if(n != 2 || buf[0] != 'O' || buf[1] != 'K') exits("remote tree"); /* make sure buffers are big by doing fversion explicitly; pick a huge number; other side will trim */ strcpy(buf, VERSION9P); - if(fversion(fd, 64*1024, buf, sizeof buf) < 0) + if(sys_fversion(fd, 64*1024, buf, sizeof buf) < 0) exits("fversion failed"); - if(mount(fd, -1, "/mnt/term", MCREATE|MREPL, "", '9') < 0) + if(sys_mount(fd, -1, "/mnt/term", MCREATE|MREPL, "", '9') < 0) exits("mount failed"); - close(fd); + sys_close(fd); /* the remote noteproc uses the mount so it must follow it */ rmtnoteproc(); for(i = 0; i < 3; i++) - close(i); + sys_close(i); - if(open("/mnt/term/dev/cons", OREAD) != 0) + if(sys_open("/mnt/term/dev/cons", OREAD) != 0) exits("open stdin"); - if(open("/mnt/term/dev/cons", OWRITE) != 1) + if(sys_open("/mnt/term/dev/cons", OWRITE) != 1) exits("open stdout"); dup(1, 2); @@ -435,7 +435,7 @@ writestr(int fd, char *str, char *thing, int ignore) int l, n; l = strlen(str); - n = write(fd, str, l+1); + n = jehanne_write(fd, str, l+1); if(!ignore && n < 0) fatal(1, "writing network: %s", thing); } @@ -446,7 +446,7 @@ readstr(int fd, char *str, int len) int n; while(len) { - n = read(fd, str, 1); + n = jehanne_read(fd, str, 1); if(n < 0) return -1; if(*str == '\0') @@ -466,7 +466,7 @@ readln(char *buf, int n) n--; /* room for \0 */ p = buf; for(i=0; i 0){ - if(write(fd, buf, n) != n){ - close(fd); + if(jehanne_write(fd, buf, n) != n){ + sys_close(fd); return -1; } } return 0; } -/* match a note read request with a note, reply to the request */ +/* match a note jehanne_read request with a note, reply to the request */ int kick(int fd) { @@ -950,7 +950,7 @@ notefs(int fd) Fid *fid, *nfid; int doreply; - rfork(RFNOTEG); + sys_rfork(RFNOTEG); fmtinstall('F', fcallfmt); for(n = 0; n < Nfid; n++){ @@ -1086,7 +1086,7 @@ err: postnote(PNGROUP, exportpid, "kill"); if(dbg) fprint(2, "postnote PNGROUP %d: %r\n", exportpid); - close(fd); + sys_close(fd); } char notebuf[ERRMAX]; @@ -1101,11 +1101,11 @@ catcher(void *v, char *text) n = sizeof(notebuf)-1; memmove(notebuf, text, n); notebuf[n] = '\0'; - noted(NCONT); + sys_noted(NCONT); } /* - * mount in /dev a note file for the remote side to read. + * mount in /dev a note file for the remote side to jehanne_read. */ void lclnoteproc(int netfd) @@ -1121,7 +1121,7 @@ lclnoteproc(int netfd) } /* new proc mounts and returns to start exportfs */ - switch(pid = rfork(RFPROC|RFNAMEG|RFFDG|RFMEM)){ + switch(pid = sys_rfork(RFPROC|RFNAMEG|RFFDG|RFMEM)){ default: exportpid = pid; break; @@ -1129,28 +1129,28 @@ lclnoteproc(int netfd) fprint(2, "cpu: can't start note proc: rfork: %r\n"); return; case 0: - close(pfd[0]); - if(mount(pfd[1], -1, "/dev", MBEFORE, "", '9') < 0) + sys_close(pfd[0]); + if(sys_mount(pfd[1], -1, "/dev", MBEFORE, "", '9') < 0) fprint(2, "cpu: can't mount note proc: %r\n"); - close(pfd[1]); + sys_close(pfd[1]); return; } - close(netfd); - close(pfd[1]); + sys_close(netfd); + sys_close(pfd[1]); /* new proc listens for note file system rpc's */ - switch(rfork(RFPROC|RFNAMEG|RFMEM)){ + switch(sys_rfork(RFPROC|RFNAMEG|RFMEM)){ case -1: fprint(2, "cpu: can't start note proc: rfork1: %r\n"); - _exits(0); + sys__exits(0); case 0: notefs(pfd[0]); - _exits(0); + sys__exits(0); } /* original proc waits for notes */ - notify(catcher); + sys_notify(catcher); w = nil; for(;;) { *notebuf = 0; diff --git a/sys/src/cmd/dd.c b/sys/src/cmd/dd.c index da7c892..d83a2cb 100644 --- a/sys/src/cmd/dd.c +++ b/sys/src/cmd/dd.c @@ -207,7 +207,7 @@ main(int argc, char *argv[]) if(conv == null && cflag&(LCASE|UCASE)) conv = cnull; if(ifile) - ibf = open(ifile, OREAD); + ibf = sys_open(ifile, OREAD); else ibf = dup(0, -1); if(ibf < 0) { @@ -218,7 +218,7 @@ main(int argc, char *argv[]) if(dotrunc) obf = ocreate(ofile, OWRITE, 0664); else - obf = open(ofile, OWRITE); + obf = sys_open(ofile, OWRITE); if(obf < 0) { fprint(2, "dd: create %s: %r\n", ofile); exits("create"); @@ -257,14 +257,14 @@ main(int argc, char *argv[]) if(signal(SIGINT, SIG_IGN) != SIG_IGN) signal(SIGINT, term); */ - seek(obf, obs*oseekn, 1); - seek(ibf, ibs*iseekn, 1); + sys_seek(obf, obs*oseekn, 1); + sys_seek(ibf, ibs*iseekn, 1); if(iseekb) - seek(ibf, iseekb, 0); + sys_seek(ibf, iseekb, 0); if(oseekb) - seek(obf, oseekb, 0); + sys_seek(obf, oseekb, 0); while(skip) { - read(ibf, ibuf, ibs); + jehanne_read(ibf, ibuf, ibs); skip--; } @@ -276,7 +276,7 @@ loop: if(cflag&(NERR|SYNC)) for(ip=ibuf+ibs; ip>ibuf;) *--ip = 0; - ibc = read(ibf, ibuf, ibs); + ibc = jehanne_read(ibf, ibuf, ibs); } if(ibc == -1) { perror("read"); @@ -288,7 +288,7 @@ loop: for(c=0; c 0) ++nopr; diff --git a/sys/src/cmd/disk/format.c b/sys/src/cmd/disk/format.c index c4a8875..c92ed35 100644 --- a/sys/src/cmd/disk/format.c +++ b/sys/src/cmd/disk/format.c @@ -214,7 +214,7 @@ fatal(char *fmt, ...) va_end(arg); fprint(2, "format: %s\n", err); if(fflag && file) - remove(file); + sys_remove(file); exits(err); } @@ -279,7 +279,7 @@ main(int argc, char **argv) if(fflag) { if((fd = ocreate(argv[0], ORDWR, 0666)) >= 0) { file = argv[0]; - close(fd); + sys_close(fd); disk = opendisk(argv[0], 0, 0); } } @@ -296,8 +296,8 @@ main(int argc, char **argv) type = "3½HD"; break; case Tfloppy: - seek(disk->ctlfd, 0, 0); - n = read(disk->ctlfd, buf, 10); + sys_seek(disk->ctlfd, 0, 0); + n = jehanne_read(disk->ctlfd, buf, 10); if(n <= 0 || n >= 10) fatal("reading floppy type"); buf[n] = 0; @@ -347,8 +347,8 @@ sanitycheck(Disk *disk) return; bad = 0; - if(dos && nresrv < 2 && seek(disk->fd, disk->secsize, 0) == disk->secsize - && read(disk->fd, buf, sizeof(buf)) >= 5 && strncmp(buf, "part ", 5) == 0) { + if(dos && nresrv < 2 && sys_seek(disk->fd, disk->secsize, 0) == disk->secsize + && jehanne_read(disk->fd, buf, sizeof(buf)) >= 5 && strncmp(buf, "part ", 5) == 0) { fprint(2, "there's a plan9 partition on the disk\n" "and you didn't specify -r 2 (or greater).\n" @@ -381,7 +381,7 @@ getdriveno(Disk *disk) if(disk->type != Tsd) return 0x80; /* first hard disk */ - if(fd2path(disk->fd, buf, sizeof(buf)) < 0) + if(sys_fd2path(disk->fd, buf, sizeof(buf)) < 0) return 0x80; /* @@ -411,7 +411,7 @@ writen(int fd, void *buf, int32_t n) m = n - tot; if(m > 8192) m = 8192; - if(write(fd, (uint8_t*)buf+tot, m) != m) + if(jehanne_write(fd, (uint8_t*)buf+tot, m) != m) break; } return tot; @@ -484,10 +484,10 @@ dosfs(int dofat, int dopbs, Disk *disk, char *label, int argc, char *argv[], int if((d = dirfstat(disk->wfd)) == nil) fatal("fstat disk: %r"); if(commit && d->length < disk->size) { - if(seek(disk->wfd, disk->size-1, 0) < 0) + if(sys_seek(disk->wfd, disk->size-1, 0) < 0) fatal("seek to 9: %r"); - if(write(disk->wfd, "9", 1) < 0) - fatal("writing 9: @%lld %r", seek(disk->wfd, 0LL, 1)); + if(jehanne_write(disk->wfd, "9", 1) < 0) + fatal("writing 9: @%lld %r", sys_seek(disk->wfd, 0LL, 1)); } free(d); } @@ -495,9 +495,9 @@ dosfs(int dofat, int dopbs, Disk *disk, char *label, int argc, char *argv[], int /* * Start with initial sector from disk */ - if(seek(disk->fd, 0, 0) < 0) + if(sys_seek(disk->fd, 0, 0) < 0) fatal("seek to boot sector: %r\n"); - if(commit && read(disk->fd, buf, secsize) != secsize) + if(commit && jehanne_read(disk->fd, buf, secsize) != secsize) fatal("reading boot sector: %r"); if(dofat) @@ -523,15 +523,15 @@ dosfs(int dofat, int dopbs, Disk *disk, char *label, int argc, char *argv[], int fatal("out of memory"); if(pbs){ - if((sysfd = open(pbs, OREAD)) < 0) + if((sysfd = sys_open(pbs, OREAD)) < 0) fatal("open %s: %r", pbs); - if((npbs = read(sysfd, pbsbuf, secsize)) < 0) + if((npbs = jehanne_read(sysfd, pbsbuf, secsize)) < 0) fatal("read %s: %r", pbs); if(npbs > secsize-2) fatal("boot block too large"); - close(sysfd); + sys_close(sysfd); } else { memmove(pbsbuf, bootprog, sizeof(bootprog)); @@ -662,9 +662,9 @@ if(chatty) print("try %d fatbits => %d clusters of %d\n", fatbits, clusters, clu buf[secsize-1] = 0xAA; if(commit) { - if(seek(disk->wfd, 0, 0) < 0) + if(sys_seek(disk->wfd, 0, 0) < 0) fatal("seek to boot sector: %r\n"); - if(write(disk->wfd, buf, secsize) != secsize) + if(jehanne_write(disk->wfd, buf, secsize) != secsize) fatal("writing boot sector: %r"); } @@ -679,9 +679,9 @@ if(chatty) print("try %d fatbits => %d clusters of %d\n", fatbits, clusters, clu /* * allocate an in memory fat */ - if(seek(disk->wfd, nresrv*secsize, 0) < 0) + if(sys_seek(disk->wfd, nresrv*secsize, 0) < 0) fatal("seek to fat: %r\n"); -if(chatty) print("fat @%lluX\n", seek(disk->wfd, 0, 1)); +if(chatty) print("fat @%lluX\n", sys_seek(disk->wfd, 0, 1)); fat = malloc(fatsecs*secsize); if(fat == 0) fatal("out of memory"); @@ -698,9 +698,9 @@ if(chatty) print("fat @%lluX\n", seek(disk->wfd, 0, 1)); fat[7] = 0xff; } fatlast = 1; - if(seek(disk->wfd, 2*fatsecs*secsize, 1) < 0) /* 2 fats */ + if(sys_seek(disk->wfd, 2*fatsecs*secsize, 1) < 0) /* 2 fats */ fatal("seek to root: %r"); -if(chatty) print("root @%lluX\n", seek(disk->wfd, 0LL, 1)); +if(chatty) print("root @%lluX\n", sys_seek(disk->wfd, 0LL, 1)); if(fatbits == 32){ /* @@ -723,9 +723,9 @@ if(chatty) print("root @%lluX\n", seek(disk->wfd, 0LL, 1)); if(root == 0) fatal("out of memory"); memset(root, 0, rootsecs*secsize); - if(seek(disk->wfd, rootsecs*secsize, 1) < 0) /* rootsecs */ + if(sys_seek(disk->wfd, rootsecs*secsize, 1) < 0) /* rootsecs */ fatal("seek to files: %r"); -if(chatty) print("files @%lluX\n", seek(disk->wfd, 0LL, 1)); +if(chatty) print("files @%lluX\n", sys_seek(disk->wfd, 0LL, 1)); /* * Now positioned at the Files Area. @@ -738,7 +738,7 @@ if(chatty) print("files @%lluX\n", seek(disk->wfd, 0LL, 1)); /* * Open the file and get its length. */ - if((sysfd = open(*argv, OREAD)) < 0) + if((sysfd = sys_open(*argv, OREAD)) < 0) fatal("open %s: %r", *argv); if((d = dirfstat(sysfd)) == nil) fatal("stat %s: %r", *argv); @@ -764,12 +764,12 @@ if(chatty) print("files @%lluX\n", seek(disk->wfd, 0LL, 1)); if(readn(sysfd, buf, d->length) != d->length) fatal("read %s: %r", *argv); memset(buf+d->length, 0, length-d->length); -if(chatty) print("%s @%lluX\n", d->name, seek(disk->wfd, 0LL, 1)); +if(chatty) print("%s @%lluX\n", d->name, sys_seek(disk->wfd, 0LL, 1)); if(commit && writen(disk->wfd, buf, length) != length) fatal("write %s: %r", *argv); free(buf); - close(sysfd); + sys_close(sysfd); /* * Allocate the FAT clusters. @@ -812,19 +812,19 @@ fprint(2, "add %s at clust %lux\n", d->name, x); PUTLONG(fi->freeclust, clusters - fatlast); PUTLONG(fi->nextfree, fatlast); - if(seek(disk->wfd, (nresrv-1)*secsize, 0) < 0) + if(sys_seek(disk->wfd, (nresrv-1)*secsize, 0) < 0) fatal("seek to fatinfo: %r\n"); - if(write(disk->wfd, fi, secsize) < 0) + if(jehanne_write(disk->wfd, fi, secsize) < 0) fatal("writing fat #1: %r"); free(fi); } - if(seek(disk->wfd, nresrv*secsize, 0) < 0) + if(sys_seek(disk->wfd, nresrv*secsize, 0) < 0) fatal("seek to fat #1: %r"); - if(write(disk->wfd, fat, fatsecs*secsize) < 0) + if(jehanne_write(disk->wfd, fat, fatsecs*secsize) < 0) fatal("writing fat #1: %r"); - if(write(disk->wfd, fat, fatsecs*secsize) < 0) + if(jehanne_write(disk->wfd, fat, fatsecs*secsize) < 0) fatal("writing fat #2: %r"); - if(write(disk->wfd, root, rootsecs*secsize) < 0) + if(jehanne_write(disk->wfd, root, rootsecs*secsize) < 0) fatal("writing root: %r"); } diff --git a/sys/src/cmd/disk/mkext.c b/sys/src/cmd/disk/mkext.c index 5c060d1..6b8e16c 100644 --- a/sys/src/cmd/disk/mkext.c +++ b/sys/src/cmd/disk/mkext.c @@ -158,7 +158,7 @@ mkdirs(char *name, char *namep) return; *p = 0; fd = ocreate(buf, OREAD, 0775|DMDIR); - close(fd); + sys_close(fd); *p = '/'; } } @@ -181,7 +181,7 @@ mkdir(char *name, uint32_t mode, uint32_t mtime, char *uid, char *gid) } free(d); } - close(fd); + sys_close(fd); d = &xd; nulldir(d); diff --git a/sys/src/cmd/disk/mkfs.c b/sys/src/cmd/disk/mkfs.c index 974bd34..fb9202b 100644 --- a/sys/src/cmd/disk/mkfs.c +++ b/sys/src/cmd/disk/mkfs.c @@ -181,7 +181,7 @@ copy(Dir *d) int64_t tot, len; Dir nd; - f = open(oldfile, OREAD); + f = sys_open(oldfile, OREAD); if(f < 0){ warn("can't open %q: %r", oldfile); return; @@ -198,7 +198,7 @@ copy(Dir *d) t = ocreate(cptmp, OWRITE, 0666); if(t < 0){ warn("can't create %q: %r", newfile); - close(f); + sys_close(f); return; } } @@ -209,7 +209,7 @@ copy(Dir *d) /* don't read beyond d->length */ if (len > buflen) len = buflen; - n = read(f, buf, len); + n = jehanne_read(f, buf, len); if(n <= 0) { if(n < 0 && nowarnyet) { warn("can't read %q: %r", oldfile); @@ -226,18 +226,18 @@ copy(Dir *d) if(Bwrite(&bout, buf, n) != n) error("write error: %r"); }else if(memcmp(buf, zbuf, n) == 0){ - if(seek(t, n, 1) < 0) + if(sys_seek(t, n, 1) < 0) error("can't write zeros to %q: %r", newfile); needwrite = 1; }else{ - if(write(t, buf, n) < n) + if(jehanne_write(t, buf, n) < n) error("can't write %q: %r", newfile); needwrite = 0; } } - close(f); + sys_close(f); if(needwrite){ - if(seek(t, -1, 1) < 0 || write(t, zbuf, 1) != 1) + if(sys_seek(t, -1, 1) < 0 || jehanne_write(t, zbuf, 1) != 1) error("can't write zero at end of %q: %r", newfile); } if(tot != d->length){ @@ -252,7 +252,7 @@ copy(Dir *d) } if(fskind == Archive) return; - remove(newfile); + sys_remove(newfile); nulldir(&nd); nd.mode = d->mode; nd.gid = d->gid; @@ -263,7 +263,7 @@ copy(Dir *d) nulldir(&nd); nd.uid = d->uid; dirfwstat(t, &nd); - close(t); + sys_close(t); } void @@ -300,7 +300,7 @@ mkdir(Dir *d) nulldir(&nd); nd.uid = d->uid; dirfwstat(fd, &nd); - close(fd); + sys_close(fd); } void diff --git a/sys/src/cmd/disk/prep/edit.c b/sys/src/cmd/disk/prep/edit.c index 48de592..ec1ab83 100644 --- a/sys/src/cmd/disk/prep/edit.c +++ b/sys/src/cmd/disk/prep/edit.c @@ -407,7 +407,7 @@ rdctlpart(Edit *edit) disk = edit->disk; edit->nctlpart = 0; - seek(disk->ctlfd, 0, 0); + sys_seek(disk->ctlfd, 0, 0); if(readn(disk->ctlfd, buf, sizeof buf) <= 0) { return; } diff --git a/sys/src/cmd/disk/prep/fdisk.c b/sys/src/cmd/disk/prep/fdisk.c index b00b8de..e65b937 100644 --- a/sys/src/cmd/disk/prep/fdisk.c +++ b/sys/src/cmd/disk/prep/fdisk.c @@ -378,7 +378,7 @@ putle32(void* v, uint32_t i) static void diskread(Disk *disk, void *data, int ndata, uint32_t sec, uint32_t off) { - if(seek(disk->fd, (int64_t)sec*disk->secsize+off, 0) != (int64_t)sec*disk->secsize+off) + if(sys_seek(disk->fd, (int64_t)sec*disk->secsize+off, 0) != (int64_t)sec*disk->secsize+off) sysfatal("diskread seek %lud.%lud: %r", (uint32_t)sec, (uint32_t)off); if(readn(disk->fd, data, ndata) != ndata) @@ -390,9 +390,9 @@ static int diskwrite(Disk *disk, void *data, int ndata, uint32_t sec, uint32_t off) { written = 1; - if(seek(disk->wfd, (int64_t)sec*disk->secsize+off, 0) != (int64_t)sec*disk->secsize+off) + if(sys_seek(disk->wfd, (int64_t)sec*disk->secsize+off, 0) != (int64_t)sec*disk->secsize+off) goto Error; - if(write(disk->wfd, data, ndata) != ndata) + if(jehanne_write(disk->wfd, data, ndata) != ndata) goto Error; return 0; diff --git a/sys/src/cmd/disk/prep/prep.c b/sys/src/cmd/disk/prep/prep.c index e244842..53bafbb 100644 --- a/sys/src/cmd/disk/prep/prep.c +++ b/sys/src/cmd/disk/prep/prep.c @@ -319,7 +319,7 @@ rdpart(Edit *edit) Disk *disk; disk = edit->disk; - seek(disk->fd, disk->secsize, 0); + sys_seek(disk->fd, disk->secsize, 0); if(jehanne_readn(disk->fd, osecbuf, disk->secsize) != disk->secsize) return; osecbuf[disk->secsize] = '\0'; @@ -465,12 +465,12 @@ restore(Edit *edit, int ctlfd) offset = edit->disk->offset; jehanne_fprint(2, "attempting to restore partitions to previous state\n"); - if(seek(edit->disk->wfd, edit->disk->secsize, 0) != 0){ + if(sys_seek(edit->disk->wfd, edit->disk->secsize, 0) != 0){ jehanne_fprint(2, "cannot restore: error seeking on disk\n"); jehanne_exits("inconsistent"); } - if(write(edit->disk->wfd, osecbuf, edit->disk->secsize) != edit->disk->secsize){ + if(jehanne_write(edit->disk->wfd, osecbuf, edit->disk->secsize) != edit->disk->secsize){ jehanne_fprint(2, "cannot restore: couldn't write old partition table to disk\n"); jehanne_exits("inconsistent"); } @@ -502,12 +502,12 @@ wrpart(Edit *edit) n += jehanne_snprint(secbuf+n, disk->secsize-n, "part %s %lld %lld\n", edit->part[i]->name, edit->part[i]->start, edit->part[i]->end); - if(seek(disk->wfd, disk->secsize, 0) != disk->secsize){ + if(sys_seek(disk->wfd, disk->secsize, 0) != disk->secsize){ jehanne_fprint(2, "error seeking %d %lld on disk: %r\n", disk->wfd, disk->secsize); jehanne_exits("seek"); } - if(write(disk->wfd, secbuf, disk->secsize) != disk->secsize){ + if(jehanne_write(disk->wfd, secbuf, disk->secsize) != disk->secsize){ jehanne_fprint(2, "error writing partition table to disk\n"); restore(edit, -1); } @@ -526,8 +526,8 @@ checkfat(Disk *disk) { uint8_t buf[32]; - if(seek(disk->fd, disk->secsize, 0) < 0 - || read(disk->fd, buf, sizeof(buf)) < sizeof(buf)) + if(sys_seek(disk->fd, disk->secsize, 0) < 0 + || jehanne_read(disk->fd, buf, sizeof(buf)) < sizeof(buf)) return; if(buf[0] != 0xEB || buf[1] != 0x3C || buf[2] != 0x90) diff --git a/sys/src/cmd/disk/rofs/mkrofs.c b/sys/src/cmd/disk/rofs/mkrofs.c index f8e8a80..57bc16c 100644 --- a/sys/src/cmd/disk/rofs/mkrofs.c +++ b/sys/src/cmd/disk/rofs/mkrofs.c @@ -157,7 +157,7 @@ paqFile(char *name, Dir *dir) uint8_t *block, *pointer; uint32_t offset; - fd = open(name, OREAD); + fd = sys_open(name, OREAD); if(fd < 0) { warn("could not open file: %s: %r", name); return nil; @@ -169,7 +169,7 @@ paqFile(char *name, Dir *dir) n = 0; tot = 0; for(;;) { - nn = read(fd, block+n, blocksize-n); + nn = jehanne_read(fd, block+n, blocksize-n); if(nn < 0) { warn("read failed: %s: %r", name); goto Err; @@ -197,13 +197,13 @@ paqFile(char *name, Dir *dir) offset = writeBlock(pointer, PointerBlock); - close(fd); + sys_close(fd); free(pointer); free(block); dir->length = tot; return paqDirAlloc(dir, offset); Err: - close(fd); + sys_close(fd); free(pointer); free(block); return nil; @@ -219,14 +219,14 @@ paqDir(char *name, Dir *dir) char *nname; uint32_t offset; - fd = open(name, OREAD); + fd = sys_open(name, OREAD); if(fd < 0) { warn("could not open directory: %s: %r", name); return nil; } ndir = dirreadall(fd, &dirs); - close(fd); + sys_close(fd); if(ndir < 0) { warn("could not read directory: %s: %r", name); diff --git a/sys/src/cmd/disk/rofs/rofs.c b/sys/src/cmd/disk/rofs/rofs.c index 11cbb87..6a250c8 100644 --- a/sys/src/cmd/disk/rofs/rofs.c +++ b/sys/src/cmd/disk/rofs/rofs.c @@ -259,16 +259,16 @@ main(int argc, char *argv[]) if(debug) fmtinstall('F', fcallfmt); - switch(rfork(RFFDG|RFPROC|RFNAMEG|RFNOTEG)){ + switch(sys_rfork(RFFDG|RFPROC|RFNAMEG|RFNOTEG)){ case -1: sysfatal("fork"); case 0: - close(pfd[0]); + sys_close(pfd[0]); io(pfd[1]); break; default: - close(pfd[1]); /* don't deadlock if child fails */ - if(mnt && mount(pfd[0], -1, mntpoint, MREPL|MCREATE, "", '9') < 0) + sys_close(pfd[1]); /* don't deadlock if child fails */ + if(mnt && sys_mount(pfd[0], -1, mntpoint, MREPL|MCREATE, "", '9') < 0) sysfatal("mount %s: %r", mntpoint); } exits(0); @@ -858,7 +858,7 @@ io(int fd) n = convS2M(&thdr, mdata, mesgsize); if(n == 0) sysfatal("convS2M sysfatal on write"); - if(write(fd, mdata, n) != n) + if(jehanne_write(fd, mdata, n) != n) sysfatal("mount write"); } } diff --git a/sys/src/cmd/dossrv/devio.c b/sys/src/cmd/dossrv/devio.c index 95d4cec..1df4a58 100644 --- a/sys/src/cmd/dossrv/devio.c +++ b/sys/src/cmd/dossrv/devio.c @@ -21,7 +21,7 @@ deverror(char *name, Xfs *xf, int32_t addr, int32_t n, int32_t nret) errno = Eio; if(nret < 0){ chat("%s errstr=\"%r\"...", name); - close(xf->dev); + sys_close(xf->dev); xf->dev = -1; return -1; } @@ -36,7 +36,7 @@ devread(Xfs *xf, int32_t addr, void *buf, int32_t n) if(xf->dev < 0) return -1; - nread = pread(xf->dev, buf, n, xf->offset+(int64_t)addr*Sectorsize); + nread = sys_pread(xf->dev, buf, n, xf->offset+(int64_t)addr*Sectorsize); if (nread == n) return 0; return deverror("read", xf, addr, n, nread); @@ -52,7 +52,7 @@ devwrite(Xfs *xf, int32_t addr, void *buf, int32_t n) if(xf->dev < 0) return -1; - nwrite = pwrite(xf->dev, buf, n, xf->offset+(int64_t)addr*Sectorsize); + nwrite = sys_pwrite(xf->dev, buf, n, xf->offset+(int64_t)addr*Sectorsize); if (nwrite == n) return 0; return deverror("write", xf, addr, n, nwrite); @@ -65,8 +65,8 @@ devcheck(Xfs *xf) if(xf->dev < 0) return -1; - if(pread(xf->dev, buf, Sectorsize, 0) != Sectorsize){ - close(xf->dev); + if(sys_pread(xf->dev, buf, Sectorsize, 0) != Sectorsize){ + sys_close(xf->dev); xf->dev = -1; return -1; } diff --git a/sys/src/cmd/dossrv/xfile.c b/sys/src/cmd/dossrv/xfile.c index 592d7ac..bce3ad5 100644 --- a/sys/src/cmd/dossrv/xfile.c +++ b/sys/src/cmd/dossrv/xfile.c @@ -71,11 +71,11 @@ getxfs(char *user, char *name) omode = OREAD; else omode = ORDWR; - fd = open(name, omode); + fd = sys_open(name, omode); if(fd < 0 && omode==ORDWR){ omode = OREAD; - fd = open(name, omode); + fd = sys_open(name, omode); } if(fd < 0){ @@ -86,7 +86,7 @@ getxfs(char *user, char *name) dir = jehanne_dirfstat(fd); if(dir == nil){ errno = Eio; - close(fd); + sys_close(fd); return 0; } @@ -110,14 +110,14 @@ getxfs(char *user, char *name) chat("incref \"%s\", dev=%d...", xf->name, xf->dev); ++xf->ref; unmlock(&xlock); - close(fd); + sys_close(fd); return xf; } if(fxf == nil){ fxf = jehanne_malloc(sizeof(Xfs)); if(fxf == nil){ unmlock(&xlock); - close(fd); + sys_close(fd); errno = Enomem; return nil; } @@ -149,7 +149,7 @@ refxfs(Xfs *xf, int delta) jehanne_free(xf->ptr); purgebuf(xf); if(xf->dev >= 0){ - close(xf->dev); + sys_close(xf->dev); xf->dev = -1; } } diff --git a/sys/src/cmd/dossrv/xfssrv.c b/sys/src/cmd/dossrv/xfssrv.c index aa2225a..8f960e8 100644 --- a/sys/src/cmd/dossrv/xfssrv.c +++ b/sys/src/cmd/dossrv/xfssrv.c @@ -100,27 +100,27 @@ main(int argc, char **argv) pipefd[0] = 0; pipefd[1] = 1; }else{ - close(0); - close(1); - open("/dev/null", OREAD); - open("/dev/null", OWRITE); + sys_close(0); + sys_close(1); + sys_open("/dev/null", OREAD); + sys_open("/dev/null", OWRITE); if(jehanne_pipe(pipefd) < 0) panic("pipe"); srvfd = jehanne_ocreate(srvfile, OWRITE|ORCLOSE, 0600); if(srvfd < 0) panic(srvfile); jehanne_fprint(srvfd, "%d", pipefd[0]); - close(pipefd[0]); + sys_close(pipefd[0]); jehanne_atexit(rmservice); jehanne_fprint(2, "%s: serving %s\n", argv0, srvfile); } srvfd = pipefd[1]; - switch(rfork(RFNOWAIT|RFNOTEG|RFFDG|RFPROC|RFNAMEG)){ + switch(sys_rfork(RFNOWAIT|RFNOTEG|RFFDG|RFPROC|RFNAMEG)){ case -1: panic("fork"); default: - _exits(0); + sys__exits(0); case 0: break; } @@ -128,8 +128,8 @@ main(int argc, char **argv) iotrack_init(); if(!chatty){ - close(2); - open("#c/cons", OWRITE); + sys_close(2); + sys_open("#c/cons", OWRITE); } io(srvfd); @@ -182,7 +182,7 @@ io(int srvfd) n = convS2M(rep, mdata, sizeof mdata); if(n == 0) panic("convS2M error on write"); - if(write(srvfd, mdata, n) != n) + if(jehanne_write(srvfd, mdata, n) != n) panic("mount write"); } chat("server shut down"); @@ -191,7 +191,7 @@ io(int srvfd) void rmservice(void) { - remove(srvfile); + sys_remove(srvfile); } char * @@ -200,7 +200,7 @@ xerrstr(int e) if (e < 0 || e >= sizeof errmsg/sizeof errmsg[0]) return "no such error"; if(e == Eerrstr){ - errstr(errbuf, sizeof errbuf); + sys_errstr(errbuf, sizeof errbuf); return errbuf; } return errmsg[e]; diff --git a/sys/src/cmd/du.c b/sys/src/cmd/du.c index 3b33328..e3d89a2 100644 --- a/sys/src/cmd/du.c +++ b/sys/src/cmd/du.c @@ -188,17 +188,17 @@ dirval(Dir *d, int64_t size) void readfile(char *name) { - int n, fd = open(name, OREAD); + int n, fd = sys_open(name, OREAD); if(fd < 0) { warn(name); return; } - while ((n = read(fd, readbuf, blocksize)) > 0) + while ((n = jehanne_read(fd, readbuf, blocksize)) > 0) continue; if (n < 0) warn(name); - close(fd); + sys_close(fd); } int64_t @@ -234,7 +234,7 @@ du(char *name, Dir *dir) if((dir->qid.type&QTDIR) == 0) return dirval(dir, blkmultiple(dir->length)); - fd = open(name, OREAD); + fd = sys_open(name, OREAD); if(fd < 0) return warn(name); nk = 0; @@ -267,7 +267,7 @@ du(char *name, Dir *dir) } if(n < 0) warn(name); - close(fd); + sys_close(fd); return dirval(dir, nk); } diff --git a/sys/src/cmd/echo.c b/sys/src/cmd/echo.c index 67861d5..8c19ae7 100644 --- a/sys/src/cmd/echo.c +++ b/sys/src/cmd/echo.c @@ -40,7 +40,7 @@ main(int argc, char *argv[]) if(!nflag) *p++ = '\n'; - if(write(1, buf, p-buf) < 0){ + if(jehanne_write(1, buf, p-buf) < 0){ fprint(2, "echo: write error: %r\n"); exits("write error"); } diff --git a/sys/src/cmd/ed.c b/sys/src/cmd/ed.c index cb243b6..139e764 100644 --- a/sys/src/cmd/ed.c +++ b/sys/src/cmd/ed.c @@ -134,7 +134,7 @@ static Rune la; static Rune lr; #undef read -extern int read(int, void*, int); +extern int jehanne_read(int, void*, int); void main(int argc, char *argv[]) @@ -144,7 +144,7 @@ main(int argc, char *argv[]) chartorune(&la, "a"); chartorune(&lr, "r"); Binit(&bcons, 0, OREAD); - notify(notifyf); + sys_notify(notifyf); ARGBEGIN { case 'o': oflag = 1; @@ -327,7 +327,7 @@ commands(void) case 'r': filename(c); caseread: - if((io=open(file, OREAD)) < 0) { + if((io=sys_open(file, OREAD)) < 0) { lastc = '\n'; error(file); } @@ -380,8 +380,8 @@ commands(void) } filename(c); if(!wrapp || - ((io = open(file, OWRITE)) == -1) || - ((seek(io, 0L, 2)) == -1)) + ((io = sys_open(file, OWRITE)) == -1) || + ((sys_seek(io, 0L, 2)) == -1)) if((io = ocreate(file, OWRITE, 0666)) < 0) error(file); Binit(&iobuf, io, OWRITE); @@ -630,7 +630,7 @@ exfile(int om) if(om == OWRITE) if(Bflush(&iobuf) < 0) error(Q); - close(io); + sys_close(io); io = -1; if(vflag) { putd(); @@ -647,7 +647,7 @@ error1(char *s) listf = 0; listn = 0; count = 0; - seek(0, 0, 2); + sys_seek(0, 0, 2); pflag = 0; if(globp) lastc = '\n'; @@ -660,7 +660,7 @@ error1(char *s) break; } if(io > 0) { - close(io); + sys_close(io); io = -1; } putchr(L'?'); @@ -696,7 +696,7 @@ notifyf(void *a, char *s) { if(strcmp(s, "interrupt") == 0){ if(rescuing || waiting) - noted(NCONT); + sys_noted(NCONT); putchr(L'\n'); lastc = '\n'; error1(Q); @@ -704,7 +704,7 @@ notifyf(void *a, char *s) } if(strcmp(s, "hangup") == 0){ if(rescuing) - noted(NDFLT); + sys_noted(NDFLT); rescue(); } fprint(2, "ed: note: %s\n", s); @@ -942,7 +942,7 @@ quit(void) fchange = 0; error(Q); } - remove(tfname); + sys_remove(tfname); exits(0); } @@ -1048,7 +1048,7 @@ putline(void) void blkio(int b, uint8_t *buf, int32_t (*iofcn)(int, void *, int32_t)) { - seek(tfile, b*BLKSIZE, 0); + sys_seek(tfile, b*BLKSIZE, 0); if((*iofcn)(tfile, buf, BLKSIZE) != BLKSIZE) { error(T); } @@ -1057,7 +1057,7 @@ blkio(int b, uint8_t *buf, int32_t (*iofcn)(int, void *, int32_t)) static int32_t writewrap(int a, void *b, int32_t c) { - return write(a, (const void *)b, c); + return jehanne_write(a, (const void *)b, c); } Rune* @@ -1087,7 +1087,7 @@ getblock(int atl, int iof) blkio(iblock, ibuff, writewrap); ichanged = 0; iblock = bno; - blkio(bno, ibuff, read); + blkio(bno, ibuff, jehanne_read); return (Rune*)(ibuff+off); } if(oblock >= 0) @@ -1101,7 +1101,7 @@ init(void) { int *markp; - close(tfile); + sys_close(tfile); tline = 2; for(markp = names; markp < &names[26]; ) *markp++ = 0; @@ -1569,7 +1569,7 @@ putchr(int ac) if(c == '\n' || lp >= &line[sizeof(line)-5]) { linp = line; - write(oflag? 2: 1, line, lp-line); + jehanne_write(oflag? 2: 1, line, lp-line); return; } linp = lp; diff --git a/sys/src/cmd/exportfs/exportfs.c b/sys/src/cmd/exportfs/exportfs.c index 253d60f..7ef7fe3 100644 --- a/sys/src/cmd/exportfs/exportfs.c +++ b/sys/src/cmd/exportfs/exportfs.c @@ -218,7 +218,7 @@ main(int argc, char **argv) } if(srvfdfile){ - if((srvfd = open(srvfdfile, ORDWR)) < 0) + if((srvfd = sys_open(srvfdfile, ORDWR)) < 0) sysfatal("open '%s': %r", srvfdfile); } @@ -237,7 +237,7 @@ main(int argc, char **argv) dup(fd, 0); dup(fd, 1); - close(fd); + sys_close(fd); } exclusions(); @@ -245,7 +245,7 @@ main(int argc, char **argv) if(dbg) { n = ocreate(dbfile, OWRITE|OTRUNC, 0666); dup(n, DFD); - close(n); + sys_close(n); } if(srvfd >= 0 && srv){ @@ -255,7 +255,7 @@ main(int argc, char **argv) DEBUG(DFD, "exportfs: started\n"); - rfork(RFNOTEG); + sys_rfork(RFNOTEG); if(messagesize == 0){ messagesize = iounit(netfd); @@ -277,7 +277,7 @@ main(int argc, char **argv) } else if(srv) { if(chdir(srv) < 0) { - errstr(ebuf, sizeof ebuf); + sys_errstr(ebuf, sizeof ebuf); fprint(0, "chdir(\"%s\"): %s\n", srv, ebuf); DEBUG(DFD, "chdir(\"%s\"): %s\n", srv, ebuf); exits(ebuf); @@ -288,16 +288,16 @@ main(int argc, char **argv) else { noteconn(netfd); buf[0] = 0; - n = read(0, buf, sizeof(buf)-1); + n = jehanne_read(0, buf, sizeof(buf)-1); if(n < 0) { - errstr(buf, sizeof buf); + sys_errstr(buf, sizeof buf); fprint(0, "read(0): %s\n", buf); DEBUG(DFD, "read(0): %s\n", buf); exits(buf); } buf[n] = 0; if(chdir(buf) < 0) { - errstr(ebuf, sizeof ebuf); + sys_errstr(ebuf, sizeof ebuf); fprint(0, "chdir(%d:\"%s\"): %s\n", n, buf, ebuf); DEBUG(DFD, "chdir(%d:\"%s\"): %s\n", n, buf, ebuf); exits(ebuf); @@ -309,7 +309,7 @@ main(int argc, char **argv) DEBUG(DFD, "exportfs: %s\n", buf); - if(srv == nil && srvfd == -1 && write(0, "OK", 2) != 2) + if(srv == nil && srvfd == -1 && jehanne_write(0, "OK", 2) != 2) fatal("open ack write"); if (readn(netfd, &initial, sizeof(uint32_t)) < sizeof(uint32_t)) @@ -323,7 +323,7 @@ main(int argc, char **argv) p = buf; while (p - buf < sizeof buf) { - if ((n = read(netfd, p, 1)) < 0) + if ((n = jehanne_read(netfd, p, 1)) < 0) fatal("can't read impo arguments: %r\n"); if (n == 0) @@ -373,7 +373,7 @@ main(int argc, char **argv) if(readn(netfd, key, 4) != 4) fatal("can't read key part; %r\n"); - if(write(netfd, key+12, 4) != 4) + if(jehanne_write(netfd, key+12, 4) != 4) fatal("can't write key part; %r\n"); /* scramble into two secrets */ @@ -483,7 +483,7 @@ reply(Fcall *r, Fcall *t, char *err) if(data == nil) fatal(Enomem); n = convS2M(t, data, messagesize); - if(write(netfd, data, n)!=n){ + if(jehanne_write(netfd, data, n)!=n){ syslog(0, "exportfs", "short write: %r"); fatal("mount write"); } @@ -513,7 +513,7 @@ freefid(int nr) if(f->nr == nr) { if(f->mid) { sprint(buf, "/mnt/exportfs/%d", f->mid); - unmount(0, buf); + sys_unmount(0, buf); psmap[f->mid] = 0; } if(f->f) { @@ -911,17 +911,17 @@ filter(int fd, char *cmd) snprint(buf, sizeof(buf), "%s/local", devdir); buf[sizeof buf - 1] = '\0'; - if ((lfd = open(buf, OREAD)) < 0) + if ((lfd = sys_open(buf, OREAD)) < 0) sysfatal("filter: cannot open %s: %r", buf); - if ((len = read(lfd, newport, sizeof newport - 1)) < 0) + if ((len = jehanne_read(lfd, newport, sizeof newport - 1)) < 0) sysfatal("filter: cannot read %s: %r", buf); - close(lfd); + sys_close(lfd); newport[len] = '\0'; if ((s = strchr(newport, '\n')) != nil) *s = '\0'; - if ((nb = write(fd, newport, len)) < 0) + if ((nb = jehanne_write(fd, newport, len)) < 0) sysfatal("getport; cannot write port; %r"); assert(nb == len); @@ -937,7 +937,7 @@ filter(int fd, char *cmd) if(pipe(p) < 0) fatal("pipe"); - switch(rfork(RFNOWAIT|RFPROC|RFFDG)) { + switch(sys_rfork(RFNOWAIT|RFPROC|RFFDG)) { case -1: fatal("rfork record module"); case 0: @@ -945,13 +945,13 @@ filter(int fd, char *cmd) fatal("filter: cannot dup to 1; %r\n"); if (dup(p[0], 0) < 0) fatal("filter: cannot dup to 0; %r\n"); - close(p[0]); - close(p[1]); - exec(file, argv); + sys_close(p[0]); + sys_close(p[1]); + sys_exec(file, argv); fatal("exec record module"); default: - close(fd); - close(p[0]); + sys_close(fd); + sys_close(p[0]); } return p[1]; } diff --git a/sys/src/cmd/exportfs/exportsrv.c b/sys/src/cmd/exportfs/exportsrv.c index 35d9127..111c0d2 100644 --- a/sys/src/cmd/exportfs/exportsrv.c +++ b/sys/src/cmd/exportfs/exportsrv.c @@ -112,11 +112,11 @@ Xattach(Fsrpc *t) sprint(buf, "/mnt/exportfs/%d", i); nfd = dup(srvfd, -1); if(amount(nfd, buf, MREPL|MCREATE, t->work.aname) < 0){ - errstr(buf, sizeof buf); + sys_errstr(buf, sizeof buf); reply(&t->work, &rhdr, buf); t->busy = 0; freefid(t->work.fid); - close(nfd); + sys_close(nfd); return; } psmap[i] = 1; @@ -142,7 +142,7 @@ clonefid(Fid *f, int new) if(n == 0) fatal("inconsistent fids"); if(n->fid >= 0) - close(n->fid); + sys_close(n->fid); freefid(new); n = newfid(new); if(n == 0) @@ -195,7 +195,7 @@ Xwalk(Fsrpc *t) wf = file(f->f, t->work.wname[i]); if(wf == 0){ - errstr(err, sizeof err); + sys_errstr(err, sizeof err); e = err; break; } @@ -228,7 +228,7 @@ Xclunk(Fsrpc *t) } if(f->fid >= 0) - close(f->fid); + sys_close(f->fid); freefid(t->work.fid); reply(&t->work, &rhdr, 0); @@ -260,7 +260,7 @@ Xstat(Fsrpc *t) } if(d == nil) { - errstr(err, sizeof err); + sys_errstr(err, sizeof err); reply(&t->work, &rhdr, err); t->busy = 0; return; @@ -314,7 +314,7 @@ Xcreate(Fsrpc *t) f->fid = ocreate(path, t->work.mode, t->work.perm); free(path); if(f->fid < 0) { - errstr(err, sizeof err); + sys_errstr(err, sizeof err); reply(&t->work, &rhdr, err); t->busy = 0; return; @@ -322,7 +322,7 @@ Xcreate(Fsrpc *t) nf = file(f->f, t->work.name); if(nf == 0) { - errstr(err, sizeof err); + sys_errstr(err, sizeof err); reply(&t->work, &rhdr, err); t->busy = 0; return; @@ -358,9 +358,9 @@ Xremove(Fsrpc *t) path = makepath(f->f, ""); DEBUG(DFD, "\tremove: %s\n", path); - if(remove(path) < 0) { + if(sys_remove(path) < 0) { free(path); - errstr(err, sizeof err); + sys_errstr(err, sizeof err); reply(&t->work, &rhdr, err); t->busy = 0; return; @@ -369,7 +369,7 @@ Xremove(Fsrpc *t) f->f->inval = 1; if(f->fid >= 0) - close(f->fid); + sys_close(f->fid); freefid(t->work.fid); reply(&t->work, &rhdr, 0); @@ -447,9 +447,9 @@ procsetname(char *fmt, ...) if (cmdname == nil) return; snprint(buf, sizeof buf, "#p/%d/args", getpid()); - if((fd = open(buf, OWRITE)) >= 0){ - write(fd, cmdname, strlen(cmdname)+1); - close(fd); + if((fd = sys_open(buf, OWRITE)) >= 0){ + jehanne_write(fd, cmdname, strlen(cmdname)+1); + sys_close(fd); } free(cmdname); } @@ -481,7 +481,7 @@ slave(Fsrpc *f) if(p->busy == 0) { f->pid = p->pid; p->busy = 1; - pid = (uintptr_t)rendezvous((void*)p->pid, f); + pid = (uintptr_t)sys_rendezvous((void*)p->pid, f); if(pid != p->pid) fatal("rendezvous sync fail"); return; @@ -491,7 +491,7 @@ slave(Fsrpc *f) if(++nproc > MAXPROC) fatal("too many procs"); - pid = rfork(RFPROC|RFMEM); + pid = sys_rfork(RFPROC|RFMEM); switch(pid) { case -1: fatal("rfork"); @@ -516,7 +516,7 @@ slave(Fsrpc *f) p->next = Proclist; Proclist = p; - rendezvous((void*)pid, p); + sys_rendezvous((void*)pid, p); } } } @@ -529,14 +529,14 @@ blockingslave(void) Proc *m; uintptr_t pid; - notify(flushaction); + sys_notify(flushaction); pid = getpid(); - m = rendezvous((void*)pid, 0); + m = sys_rendezvous((void*)pid, 0); for(;;) { - p = rendezvous((void*)pid, (void*)pid); + p = sys_rendezvous((void*)pid, (void*)pid); if(p == (void*)~0) /* Interrupted */ continue; @@ -580,20 +580,20 @@ openmount(int sfd) if(pipe(p) < 0) return -1; - switch(rfork(RFPROC|RFMEM|RFNOWAIT|RFNAMEG|RFFDG)){ + switch(sys_rfork(RFPROC|RFMEM|RFNOWAIT|RFNAMEG|RFFDG)){ case -1: return -1; default: - close(sfd); - close(p[0]); + sys_close(sfd); + sys_close(p[0]); return p[1]; case 0: break; } - close(p[1]); + sys_close(p[1]); arg[0] = "exportfs"; snprint(fdbuf, sizeof fdbuf, "-S/fd/%d", sfd); @@ -602,12 +602,12 @@ openmount(int sfd) arg[2] = mbuf; arg[3] = nil; - close(0); - close(1); + sys_close(0); + sys_close(1); dup(p[0], 0); dup(p[0], 1); - exec("/cmd/exportfs", arg); - _exits("whoops: exec failed"); + sys_exec("/cmd/exportfs", arg); + sys__exits("whoops: exec failed"); return -1; } @@ -627,7 +627,7 @@ slaveopen(Fsrpc *p) return; } if(f->fid >= 0) { - close(f->fid); + sys_close(f->fid); f->fid = -1; } @@ -640,12 +640,12 @@ slaveopen(Fsrpc *p) return; } /* There is a race here I ignore because there are no locks */ - f->fid = open(path, work->mode); + f->fid = sys_open(path, work->mode); free(path); p->canint = 0; if(f->fid < 0 || (d = dirfstat(f->fid)) == nil) { Error: - errstr(err, sizeof err); + sys_errstr(err, sizeof err); reply(work, &rhdr, err); return; } @@ -693,11 +693,11 @@ slaveread(Fsrpc *p) if(patternfile != nil && (f->f->qid.type&QTDIR)) r = preaddir(f, (uint8_t*)data, n, work->offset); else - r = pread(f->fid, data, n, work->offset); + r = sys_pread(f->fid, data, n, work->offset); p->canint = 0; if(r < 0) { free(data); - errstr(err, sizeof err); + sys_errstr(err, sizeof err); reply(work, &rhdr, err); return; } @@ -730,10 +730,10 @@ slavewrite(Fsrpc *p) p->canint = 1; if(p->flushtag != NOTAG) return; - n = pwrite(f->fid, work->data, n, work->offset); + n = sys_pwrite(f->fid, work->data, n, work->offset); p->canint = 0; if(n < 0) { - errstr(err, sizeof err); + sys_errstr(err, sizeof err); reply(work, &rhdr, err); return; } @@ -760,7 +760,7 @@ flushaction(void *a, char *cause) exits("noted"); } if(strncmp(cause, "kill", 4) == 0) - noted(NDFLT); + sys_noted(NDFLT); - noted(NCONT); + sys_noted(NCONT); } diff --git a/sys/src/cmd/exportfs/pattern.c b/sys/src/cmd/exportfs/pattern.c index e3d4df3..6024802 100644 --- a/sys/src/cmd/exportfs/pattern.c +++ b/sys/src/cmd/exportfs/pattern.c @@ -112,7 +112,7 @@ preaddir(Fid *f, uint8_t *data, int n, int64_t offset) DEBUG(DFD, "\tpreaddir n=%d wo=%lld fo=%lld\n", n, offset, f->offset); if(offset == 0 && f->offset != 0){ - if(seek(f->fid, 0, 0) != 0) + if(sys_seek(f->fid, 0, 0) != 0) return -1; f->offset = f->cdir = f->ndir = 0; free(f->dir); diff --git a/sys/src/cmd/fcp.c b/sys/src/cmd/fcp.c index 739d3af..41ee5fd 100644 --- a/sys/src/cmd/fcp.c +++ b/sys/src/cmd/fcp.c @@ -124,7 +124,7 @@ copy(char *from, char *to, int todir) return; } mode &= 0777; - fdf=open(from, OREAD); + fdf=sys_open(from, OREAD); if(fdf<0){ fprint(2, "fcp: can't open %s: %r\n", from); free(dirb); @@ -134,7 +134,7 @@ copy(char *from, char *to, int todir) fdt=ocreate(to, OWRITE, mode); if(fdt<0){ fprint(2, "fcp: can't create %s: %r\n", to); - close(fdf); + sys_close(fdf); free(dirb); failed = 1; return; @@ -153,8 +153,8 @@ copy(char *from, char *to, int todir) fprint(2, "fcp: warning: can't wstat %s: %r\n", to); } free(dirb); - close(fdf); - close(fdt); + sys_close(fdf); + sys_close(fdt); } int @@ -166,9 +166,9 @@ copy1(int fdf, int fdt, char *from, char *to) n = 0; off = 0; for(i=0; i 0) { empty = 0; @@ -150,7 +150,7 @@ loop0: } } if (n <= 0) { - close(fid); + sys_close(fid); if (flag & Cflag) { if (flag & Hflag) Bprint(&bout, "%s:", file); diff --git a/sys/src/cmd/hget.c b/sys/src/cmd/hget.c index 0e6451e..eb7da4a 100644 --- a/sys/src/cmd/hget.c +++ b/sys/src/cmd/hget.c @@ -182,7 +182,7 @@ main(int argc, char **argv) if(out.fd < 0) sysfatal("creating %s: %r", ofile); } else { - out.fd = open(ofile, OWRITE); + out.fd = sys_open(ofile, OWRITE); if(out.fd < 0) sysfatal("can't open %s: %r", ofile); r.start = d->length; @@ -323,7 +323,7 @@ catch(void *v, char *c) d.mtime = note.mtime; if(dirfwstat(note.fd, &d) < 0) sysfatal("catch: can't dirfwstat: %r"); - noted(NDFLT); + sys_noted(NDFLT); } int @@ -364,13 +364,13 @@ dohttp(URL *u, URL *px, Range *r, Out *out, int32_t mtime) tfd = tlsClient(fd, &conn); if(tfd < 0){ fprint(2, "tlsClient: %r\n"); - close(fd); + sys_close(fd); return Error; } /* BUG: check cert here? */ if(conn.cert) free(conn.cert); - close(fd); + sys_close(fd); fd = tfd; } @@ -414,15 +414,15 @@ dohttp(URL *u, URL *px, Range *r, Out *out, int32_t mtime) tm->year+1900, tm->hour, tm->min, tm->sec); } } - if((cfd = open("/mnt/webcookies/http", ORDWR)) >= 0){ + if((cfd = sys_open("/mnt/webcookies/http", ORDWR)) >= 0){ if(fprint(cfd, "http://%s%s", u->host, u->page) > 0){ - while((n = read(cfd, buf, sizeof buf)) > 0){ + while((n = jehanne_read(cfd, buf, sizeof buf)) > 0){ if(debug) - write(2, buf, n); - write(fd, buf, n); + jehanne_write(2, buf, n); + jehanne_write(fd, buf, n); } }else{ - close(cfd); + sys_close(cfd); cfd = -1; } } @@ -438,8 +438,8 @@ dohttp(URL *u, URL *px, Range *r, Out *out, int32_t mtime) switch(code){ case Error: /* connection timed out */ case Eof: - close(fd); - close(cfd); + sys_close(fd); + sys_close(cfd); return code; case 200: /* OK */ @@ -510,9 +510,9 @@ dohttp(URL *u, URL *px, Range *r, Out *out, int32_t mtime) } rv = httpheaders(fd, cfd, u, r); - close(cfd); + sys_close(cfd); if(rv != 0){ - close(fd); + sys_close(fd); return rv; } @@ -531,7 +531,7 @@ dohttp(URL *u, URL *px, Range *r, Out *out, int32_t mtime) if(ofile != nil && u->mtime != 0){ note.fd = out->fd; note.mtime = u->mtime; - notify(catch); + sys_notify(catch); } tot = 0; @@ -548,8 +548,8 @@ dohttp(URL *u, URL *px, Range *r, Out *out, int32_t mtime) fprint(2, "%ld %ld\n", r->start+tot, r->end); } } - notify(nil); - close(fd); + sys_notify(nil); + sys_close(fd); if(ofile != nil && u->mtime != 0){ Dir d; @@ -559,7 +559,7 @@ dohttp(URL *u, URL *px, Range *r, Out *out, int32_t mtime) d.mtime = u->mtime; if(dirfwstat(out->fd, &d) < 0) fprint(2, "couldn't set mtime: %r\n"); - errstr(err, sizeof err); + sys_errstr(err, sizeof err); } return tot; @@ -889,7 +889,7 @@ doftp(URL *u, URL *px, Range *r, Out *out, int32_t mtime) /* if file is up to date and the right size, stop */ if(ftprestart(ctl, out, u, r, mtime) > 0){ - close(ctl); + sys_close(ctl); return Eof; } @@ -902,22 +902,22 @@ doftp(URL *u, URL *px, Range *r, Out *out, int32_t mtime) } /* fork */ - switch(pid = rfork(RFPROC|RFFDG|RFMEM)){ + switch(pid = sys_rfork(RFPROC|RFFDG|RFMEM)){ case -1: - close(data); + sys_close(data); return terminateftp(ctl, Error); case 0: ftpxfer(data, out, r); - close(data); - _exits(0); + sys_close(data); + sys__exits(0); default: - close(data); + sys_close(data); break; } /* wait for reply message */ rv = ftprcode(ctl, msg, sizeof(msg)); - close(ctl); + sys_close(ctl); /* wait for process to terminate */ w = nil; @@ -960,7 +960,7 @@ ftpcmd(int ctl, char *fmt, ...) fprint(2, "%d -> %s\n", ctl, buf); *s++ = '\r'; *s++ = '\n'; - if(write(ctl, buf, s - buf) != s - buf) + if(jehanne_write(ctl, buf, s - buf) != s - buf) return -1; return 0; } @@ -1173,7 +1173,7 @@ active(int ctl, URL *u) /* get a local address/port of the annoucement */ if(getaddrport(dir, ipaddr, port) < 0){ - close(afd); + sys_close(afd); return Error; } @@ -1181,7 +1181,7 @@ active(int ctl, URL *u) ftpcmd(ctl, "PORT %d,%d,%d,%d,%d,%d", ipaddr[0], ipaddr[1], ipaddr[2], ipaddr[3], port[0], port[1]); if(ftprcode(ctl, msg, sizeof(msg)) != Success){ - close(afd); + sys_close(afd); werrstr("active: %s", msg); return Error; } @@ -1189,7 +1189,7 @@ active(int ctl, URL *u) /* tell remote to send a file */ ftpcmd(ctl, "RETR %s", u->page); if(ftprcode(ctl, msg, sizeof(msg)) != Extra){ - close(afd); + sys_close(afd); werrstr("RETR: %s", msg); return Server; } @@ -1197,17 +1197,17 @@ active(int ctl, URL *u) /* wait for a connection */ lcfd = listen(dir, ldir); if(lcfd < 0){ - close(afd); + sys_close(afd); return Error; } dfd = accept(lcfd, ldir); if(dfd < 0){ - close(afd); - close(lcfd); + sys_close(afd); + sys_close(lcfd); return Error; } - close(afd); - close(lcfd); + sys_close(afd); + sys_close(lcfd); return dfd; } @@ -1221,7 +1221,7 @@ ftpxfer(int in, Out *out, Range *r) vtime = 0; for(n = 0;;n += i){ - i = read(in, buf, sizeof(buf)); + i = jehanne_read(in, buf, sizeof(buf)); if(i == 0) break; if(i < 0) @@ -1240,7 +1240,7 @@ ftpxfer(int in, Out *out, Range *r) int terminateftp(int ctl, int rv) { - close(ctl); + sys_close(ctl); return rv; } @@ -1274,7 +1274,7 @@ readline(int fd, char *buf, int len) for(p = buf;;){ if(b.rp >= b.wp){ - n = read(fd, b.wp, sizeof(b.buf)/2); + n = jehanne_read(fd, b.wp, sizeof(b.buf)/2); if(n < 0) return -1; if(n == 0){ @@ -1336,7 +1336,7 @@ readibuf(int fd, char *buf, int len) b.rp += n; return n; } - return read(fd, buf, len); + return jehanne_read(fd, buf, len); } int @@ -1361,11 +1361,11 @@ getaddrport(char *dir, uint8_t *ipaddr, uint8_t *port) char *p; snprint(buf, sizeof(buf), "%s/local", dir); - fd = open(buf, OREAD); + fd = sys_open(buf, OREAD); if(fd < 0) return -1; - i = read(fd, buf, sizeof(buf)-1); - close(fd); + i = jehanne_read(fd, buf, sizeof(buf)-1); + sys_close(fd); if(i <= 0) return -1; buf[i] = 0; @@ -1412,7 +1412,7 @@ setoffset(Out *out, int offset) out->offset = offset; out->written = offset; if(ofile != nil) - if(seek(out->fd, offset, 0) != offset) + if(sys_seek(out->fd, offset, 0) != offset) sysfatal("seek: %r"); } @@ -1454,7 +1454,7 @@ output(Out *out, char *buf, int nb) } if(n > 0){ out->hiwat = md5((uint8_t*)buf, n, nil, out->hiwat); - n = write(out->fd, buf, n); + n = jehanne_write(out->fd, buf, n); if(n > 0){ out->offset += n; out->written += n; diff --git a/sys/src/cmd/hjfs/auth.c b/sys/src/cmd/hjfs/auth.c index 5a69ae6..e68e092 100644 --- a/sys/src/cmd/hjfs/auth.c +++ b/sys/src/cmd/hjfs/auth.c @@ -238,7 +238,7 @@ userssave(Fs *fs, Chan *ch) } *p++ = '\n'; if(ch == nil) - write(2, buf, p - buf); + jehanne_write(2, buf, p - buf); else if(chanwrite(ch, buf, p - buf, off) < p - buf) goto err; off += p - buf; diff --git a/sys/src/cmd/hjfs/dev.c b/sys/src/cmd/hjfs/dev.c index 1050ec8..f03dbc7 100644 --- a/sys/src/cmd/hjfs/dev.c +++ b/sys/src/cmd/hjfs/dev.c @@ -54,7 +54,7 @@ devwork(void *v) if(b->op & BWRITE){ memset(buf, 0, sizeof(buf)); pack(b, buf); - if(pwrite(d->fd, buf, BLOCK, b->off*BLOCK) < BLOCK){ + if(sys_pwrite(d->fd, buf, BLOCK, b->off*BLOCK) < BLOCK){ dprint("write: %r\n"); b->error = Eio; } @@ -62,7 +62,7 @@ devwork(void *v) int n, m; for(n = 0; n < BLOCK; n += m){ - m = pread(d->fd, buf+n, BLOCK-n, b->off*BLOCK+n); + m = sys_pread(d->fd, buf+n, BLOCK-n, b->off*BLOCK+n); if(m < 0) dprint("read: %r\n"); if(m <= 0) @@ -89,7 +89,7 @@ newdev(char *file) Buf *b; d = emalloc(sizeof(*d)); - d->fd = open(file, ORDWR); + d->fd = sys_open(file, ORDWR); if(d->fd < 0){ free(d); return nil; @@ -97,7 +97,7 @@ newdev(char *file) dir = dirfstat(d->fd); if(dir == nil){ error: - close(d->fd); + sys_close(d->fd); free(d); return nil; } diff --git a/sys/src/cmd/hjfs/main.c b/sys/src/cmd/hjfs/main.c index 6536909..fe2fea4 100644 --- a/sys/src/cmd/hjfs/main.c +++ b/sys/src/cmd/hjfs/main.c @@ -151,7 +151,7 @@ threadmain(int argc, char **argv) break; default: usage(); } ARGEND; - rfork(RFNOTEG); + sys_rfork(RFNOTEG); bufinit(nbuf); if(file == nil) sysfatal("no default file"); diff --git a/sys/src/cmd/hmi/console/cga.c b/sys/src/cmd/hmi/console/cga.c index b847752..a7d6dea 100644 --- a/sys/src/cmd/hmi/console/cga.c +++ b/sys/src/cmd/hmi/console/cga.c @@ -97,10 +97,10 @@ cgaflush(int device) w = 1; /* 0 must mean eof, thus this is the default */ if((dirp = dirfstat(device)) != nil){ if(dirp->length == 0) - w = pwrite(device, CGA, Width*Height, 0); + w = sys_pwrite(device, CGA, Width*Height, 0); free(dirp); } else { - w = pwrite(device, CGA, Width*Height, 0); + w = sys_pwrite(device, CGA, Width*Height, 0); } return w; } @@ -117,8 +117,8 @@ writecga(int conswrites, int device) debug("writecga %d: started\n", pid); do { - r = read(conswrites, buf, ScreenBufferSize); - debug("writecga %d: read(conswrites) returns %d\n", pid, r); + r = jehanne_read(conswrites, buf, ScreenBufferSize); + debug("writecga %d: jehanne_read(conswrites) returns %d\n", pid, r); for(i = 0; i < r; i++) cgaputc(buf[i]); w = cgaflush(device); @@ -126,10 +126,10 @@ writecga(int conswrites, int device) } while(r > 0 && w > 0); - close(conswrites); - debug("writecga %d: close(%d)\n", pid, conswrites); - close(device); - debug("writecga %d: close(%d)\n", pid, device); + sys_close(conswrites); + debug("writecga %d: sys_close(%d)\n", pid, conswrites); + sys_close(device); + debug("writecga %d: sys_close(%d)\n", pid, device); debug("writecga %d: shut down (r = %d, w = %d)\n", pid, r, w); if(r < 0) diff --git a/sys/src/cmd/hmi/console/comconsole.c b/sys/src/cmd/hmi/console/comconsole.c index 8b50cd3..0152b82 100644 --- a/sys/src/cmd/hmi/console/comconsole.c +++ b/sys/src/cmd/hmi/console/comconsole.c @@ -35,11 +35,11 @@ opencom(char *file) { int fd; - if((fd = open(file, ORDWR)) <= 0) + if((fd = sys_open(file, ORDWR)) <= 0) sysfatal("open: %r"); dup(fd, 0); dup(fd, 1); - close(fd); + sys_close(fd); } void main(int argc, char *argv[]) @@ -76,19 +76,19 @@ main(int argc, char *argv[]) exits(0); } else { debug("%s %d: mounting cons for %s\n", argv0, getpid(), argv[0]); - if(mount(fd, -1, "/dev", MBEFORE, "", devmnt) == -1) + if(sys_mount(fd, -1, "/dev", MBEFORE, "", devmnt) == -1) sysfatal("mount (%s): %r", argv[0]); - debug("%s (%d): all services started, ready to exec(%s)\n", argv0, getpid(), argv[0]); + debug("%s (%d): all services started, ready to sys_exec(%s)\n", argv0, getpid(), argv[0]); /* become the requested program */ - rfork(RFNOTEG|RFREND|RFCFDG); + sys_rfork(RFNOTEG|RFREND|RFCFDG); - fd = open("/dev/cons", OREAD); - fd = open("/dev/cons", OWRITE); + fd = sys_open("/dev/cons", OREAD); + fd = sys_open("/dev/cons", OWRITE); if(dup(fd, 2) != 2) sysfatal("bad FDs: %r"); - exec(argv[1], argv+1); + sys_exec(argv[1], argv+1); sysfatal("exec %s: %r", argv[1]); } } diff --git a/sys/src/cmd/hmi/console/keyboard.c b/sys/src/cmd/hmi/console/keyboard.c index 0bfafed..5c3d82f 100644 --- a/sys/src/cmd/hmi/console/keyboard.c +++ b/sys/src/cmd/hmi/console/keyboard.c @@ -316,8 +316,8 @@ readkeyboard(int src, int consreads) { produced = 0; w = 0; - r = read(src, ibuf, KeyboardBufferSize); - debug("readkeyboard %d: read(%d) returns %d\n", pid, src, r); + r = jehanne_read(src, ibuf, KeyboardBufferSize); + debug("readkeyboard %d: jehanne_read(%d) returns %d\n", pid, src, r); for(i = 0; i < r; ++i){ scan = keybscan(ibuf[i], obuf+produced, ScreenBufferSize-produced); if(scan == -1){ @@ -330,17 +330,17 @@ readkeyboard(int src, int consreads) } } if(produced){ - w = write(consreads, obuf, produced); - debug("readkeyboard %d: write(consreads) returns %d\n", pid, w); + w = jehanne_write(consreads, obuf, produced); + debug("readkeyboard %d: jehanne_write(consreads) returns %d\n", pid, w); } } while(r > 0 && w == produced); debug("readkeyboard %d: shut down (r = %d, w = %d)\n", pid, r, w); - close(src); - debug("readkeyboard %d: close(%d)\n", pid, src); - close(consreads); - debug("readkeyboard %d: close(%d)\n", pid, consreads); + sys_close(src); + debug("readkeyboard %d: sys_close(%d)\n", pid, src); + sys_close(consreads); + debug("readkeyboard %d: sys_close(%d)\n", pid, consreads); if(r < 0) exits("read"); diff --git a/sys/src/cmd/hmi/console/passthrough.c b/sys/src/cmd/hmi/console/passthrough.c index 875cfa6..a7caa08 100644 --- a/sys/src/cmd/hmi/console/passthrough.c +++ b/sys/src/cmd/hmi/console/passthrough.c @@ -37,20 +37,20 @@ passthrough(int input, int output) do { w = 0; - r = read(input, buf, IODATASZ); - //debug("%s (%d): read(%d) returns %d\n", name, pid, input, r); + r = jehanne_read(input, buf, IODATASZ); + //debug("%s (%d): jehanne_read(%d) returns %d\n", name, pid, input, r); if(r > 0){ - w = write(output, buf, r); - //debug("%s (%d): write(%d, buf, %d) returns %d\n", name, pid, output, r, w); + w = jehanne_write(output, buf, r); + //debug("%s (%d): jehanne_write(%d, buf, %d) returns %d\n", name, pid, output, r, w); } //debug("%s (%d): r = %d, w = %d\n", name, pid, r, w); } while(r > 0 && w == r); - close(input); - debug("%s (%d): close(%d)\n", name, pid, input); - close(output); - debug("%s (%d): close(%d)\n", name, pid, output); + sys_close(input); + debug("%s (%d): sys_close(%d)\n", name, pid, input); + sys_close(output); + debug("%s (%d): sys_close(%d)\n", name, pid, output); debug("%s (%d) shut down (r = %d, w = %d)\n", name, pid, r, w); if(r < 0) diff --git a/sys/src/cmd/hmi/console/pipeconsole.c b/sys/src/cmd/hmi/console/pipeconsole.c index fcd0b10..3db5444 100644 --- a/sys/src/cmd/hmi/console/pipeconsole.c +++ b/sys/src/cmd/hmi/console/pipeconsole.c @@ -61,20 +61,20 @@ main(int argc, char *argv[]) fd = servecons(passthrough, passthrough, &devmnt); debug("%s %d: mounting cons for %s\n", argv0, getpid(), argv[0]); - if(mount(fd, -1, "/dev", MBEFORE, "", devmnt) == -1) + if(sys_mount(fd, -1, "/dev", MBEFORE, "", devmnt) == -1) sysfatal("mount (%s): %r", argv[0]); - debug("%s (%d): all services started, ready to exec(%s)\n", argv0, getpid(), argv[0]); + debug("%s (%d): all services started, ready to sys_exec(%s)\n", argv0, getpid(), argv[0]); /* become the requested program */ - rfork(RFNOTEG|RFREND|RFCFDG); + sys_rfork(RFNOTEG|RFREND|RFCFDG); if(posix){ - fd = open("/dev/tty", OREAD); - fd = open("/dev/tty", OWRITE); + fd = sys_open("/dev/tty", OREAD); + fd = sys_open("/dev/tty", OWRITE); } else { - fd = open("/dev/cons", OREAD); - fd = open("/dev/cons", OWRITE); + fd = sys_open("/dev/cons", OREAD); + fd = sys_open("/dev/cons", OWRITE); } if(dup(fd, 2) != 2) sysfatal("bad FDs: %r"); diff --git a/sys/src/cmd/hmi/console/screenconsole.c b/sys/src/cmd/hmi/console/screenconsole.c index d9486c4..98e1f75 100644 --- a/sys/src/cmd/hmi/console/screenconsole.c +++ b/sys/src/cmd/hmi/console/screenconsole.c @@ -57,16 +57,16 @@ main(int argc, char *argv[]) srv = "screenconsole"; /* first try in /dev so that binding can work */ - if((fd = open("/dev/scancode", OREAD)) <= 0) - if((fd = open("#b/scancode", OREAD)) <= 0) + if((fd = sys_open("/dev/scancode", OREAD)) <= 0) + if((fd = sys_open("#b/scancode", OREAD)) <= 0) sysfatal("open keyboard: %r"); dup(fd, 0); - close(fd); - if((fd = open("/dev/cgamem", OWRITE)) <= 0) - if((fd = open("#P/cgamem", OWRITE)) <= 0) + sys_close(fd); + if((fd = sys_open("/dev/cgamem", OWRITE)) <= 0) + if((fd = sys_open("#P/cgamem", OWRITE)) <= 0) sysfatal("open screen: %r"); dup(fd, 1); - close(fd); + sys_close(fd); fd = servecons(readkeyboard, writecga, &devmnt); post(srv, fd); diff --git a/sys/src/cmd/hmi/console/serve9p.c b/sys/src/cmd/hmi/console/serve9p.c index e09f58a..88a6aa1 100644 --- a/sys/src/cmd/hmi/console/serve9p.c +++ b/sys/src/cmd/hmi/console/serve9p.c @@ -123,7 +123,7 @@ struct Fid static Fid *fids; static Fid **ftail; -static Fid *external; /* attach fid of the last mount() in gconsole.c */ +static Fid *external; /* attach fid of the last sys_mount() in gconsole.c */ static Fid *inputfid; /* from Topen(Qinput) */ static Fid *outputfid; /* from Topen(Qoutput) */ @@ -186,7 +186,7 @@ sendmessage(int fd, Fcall *rep) debug("sendmessage: convS2M error\n"); return 0; } - if(write(fd, repdata, n) != n) { + if(jehanne_write(fd, repdata, n) != n) { debug("sendmessage: write\n"); return 0; } @@ -542,14 +542,14 @@ gethostowner(void) res = (char*)malloc(256); if(res == nil) sysfatal("out of memory"); - f = open("#c/hostowner", OREAD); + f = sys_open("#c/hostowner", OREAD); if(f < 0) - sysfatal("open(#c/hostowner) %r"); - r = read(f, res, 255); + sysfatal("sys_open(#c/hostowner) %r"); + r = jehanne_read(f, res, 255); if(r < 0) sysfatal("read(#c/hostowner)"); res[r] = '\0'; - close(f); + sys_close(f); return res; } static int @@ -1103,8 +1103,8 @@ fsserve(int connection) if(w < 0) sysfatal("serve9p: sendmessage"); - close(connection); - debug("serve9p %d: close(%d)\n", fspid, connection); + sys_close(connection); + debug("serve9p %d: sys_close(%d)\n", fspid, connection); debug("serve9p %d: shut down\n", fspid); diff --git a/sys/src/cmd/hmi/console/utils.c b/sys/src/cmd/hmi/console/utils.c index 0796257..6257116 100644 --- a/sys/src/cmd/hmi/console/utils.c +++ b/sys/src/cmd/hmi/console/utils.c @@ -21,8 +21,8 @@ #include "console.h" -#define WAIT_FOR(v) while(rendezvous(&v, (void*)0x12345) == (void*)~0) -#define PROVIDE(v) while(rendezvous(&v, (void*)0x11111) == (void*)~0) +#define WAIT_FOR(v) while(sys_rendezvous(&v, (void*)0x12345) == (void*)~0) +#define PROVIDE(v) while(sys_rendezvous(&v, (void*)0x11111) == (void*)~0) /* debugging */ int debugging; @@ -56,13 +56,13 @@ enabledebug(const char *file) int fd; if (!debugging) { - if((fd = open(file, OCEXEC|OTRUNC|OWRITE)) < 0){ + if((fd = sys_open(file, OCEXEC|OTRUNC|OWRITE)) < 0){ debug("open: %r\n"); if((fd = ocreate(file, OCEXEC|OWRITE, 0666)) < 0) sysfatal("create %r"); } dup(fd, 2); - close(fd); + sys_close(fd); __assert = traceassert; if(!atnotify(debugnotes, 1)){ fprint(2, "atnotify: %r\n"); @@ -101,26 +101,26 @@ servecons(StreamFilter inputFilter, StreamFilter outputFilter, int *devmnt) pid = getpid(); - rfork(RFNAMEG); + sys_rfork(RFNAMEG); debug("%s %d: started, linecontrol = %d, blind = %d\n", argv0, pid, linecontrol, blind); fs = fsinit(&mnt, devmnt); if(!debugging) - close(2); + sys_close(2); /* start the file system */ - switch(rfork(RFPROC|RFMEM|RFNOWAIT|RFCENVG|RFNOTEG|RFCNAMEG|RFFDG)){ + switch(sys_rfork(RFPROC|RFMEM|RFNOWAIT|RFCENVG|RFNOTEG|RFCNAMEG|RFFDG)){ case -1: sysfatal("rfork (file server)"); break; case 0: - close(0); - close(1); - close(mnt); + sys_close(0); + sys_close(1); + sys_close(mnt); PROVIDE(fs); - rfork(RFREND); + sys_rfork(RFREND); fsserve(fs); break; default: @@ -128,22 +128,22 @@ servecons(StreamFilter inputFilter, StreamFilter outputFilter, int *devmnt) } WAIT_FOR(fs); - close(fs); + sys_close(fs); /* start output device writer */ debug("%s %d: starting output device writer\n", argv0, pid); - switch(rfork(RFPROC|RFMEM|RFNOWAIT|RFNOTEG|RFFDG|RFNAMEG)){ + switch(sys_rfork(RFPROC|RFMEM|RFNOWAIT|RFNOTEG|RFFDG|RFNAMEG)){ case -1: sysfatal("rfork (output writer): %r"); break; case 0: - if(mount(mnt, -1, "/dev", MBEFORE, "", *devmnt) == -1) + if(sys_mount(mnt, -1, "/dev", MBEFORE, "", *devmnt) == -1) sysfatal("mount (output writer): %r"); - if((output = open("/dev/gconsout", OREAD)) == -1) + if((output = sys_open("/dev/gconsout", OREAD)) == -1) sysfatal("open /dev/gconsout: %r"); - close(0); + sys_close(0); PROVIDE(output); - rfork(RFCENVG|RFCNAMEG|RFREND); + sys_rfork(RFCENVG|RFCNAMEG|RFREND); outputFilter(output, 1); break; default: @@ -152,18 +152,18 @@ servecons(StreamFilter inputFilter, StreamFilter outputFilter, int *devmnt) /* start input device reader */ debug("%s %d: starting input device reader\n", argv0, pid); - switch(rfork(RFPROC|RFMEM|RFNOWAIT|RFNOTEG|RFFDG|RFNAMEG)){ + switch(sys_rfork(RFPROC|RFMEM|RFNOWAIT|RFNOTEG|RFFDG|RFNAMEG)){ case -1: sysfatal("rfork (input reader): %r"); break; case 0: - if(mount(mnt, -1, "/dev", MBEFORE, "", *devmnt) == -1) + if(sys_mount(mnt, -1, "/dev", MBEFORE, "", *devmnt) == -1) sysfatal("mount (input reader): %r"); - if((input = open("/dev/gconsin", OWRITE)) == -1) + if((input = sys_open("/dev/gconsin", OWRITE)) == -1) sysfatal("open /dev/gconsin: %r"); - close(1); + sys_close(1); PROVIDE(input); - rfork(RFCENVG|RFCNAMEG|RFREND); + sys_rfork(RFCENVG|RFCNAMEG|RFREND); inputFilter(0, input); break; default: @@ -172,8 +172,8 @@ servecons(StreamFilter inputFilter, StreamFilter outputFilter, int *devmnt) WAIT_FOR(input); WAIT_FOR(output); - close(0); - close(1); + sys_close(0); + sys_close(1); return mnt; } @@ -189,7 +189,7 @@ post(char *srv, int fd) if(f < 0) sysfatal("ocreate(%s)", srv); sprint(buf, "%d", fd); - if(write(f, buf, strlen(buf)) != strlen(buf)) + if(jehanne_write(f, buf, strlen(buf)) != strlen(buf)) sysfatal("write"); - close(f); + sys_close(f); } diff --git a/sys/src/cmd/hmi/mouse.c b/sys/src/cmd/hmi/mouse.c index a3cb4df..a480266 100644 --- a/sys/src/cmd/hmi/mouse.c +++ b/sys/src/cmd/hmi/mouse.c @@ -48,8 +48,8 @@ catch(void *a, char *msg) { USED(a); USED(msg); if(strstr(msg, "alarm")) - noted(NCONT); - noted(NDFLT); + sys_noted(NCONT); + sys_noted(NDFLT); } static void @@ -66,9 +66,9 @@ timedwrite(int fd, void *p, int n) { int32_t rv; - alarm(TIMEOUT); - rv = write(fd, p, n); - alarm(0); + sys_alarm(TIMEOUT); + rv = jehanne_write(fd, p, n); + sys_alarm(0); if(rv < 0){ fprint(2, "%s: timed out\n", argv0); exits("timeout"); @@ -82,16 +82,16 @@ readbyte(int fd) uint8_t c; char buf[ERRMAX]; - alarm(200); - if(read(fd, &c, sizeof(c)) == -1){ - alarm(0); - errstr(buf, sizeof buf); + sys_alarm(200); + if(jehanne_read(fd, &c, sizeof(c)) == -1){ + sys_alarm(0); + sys_errstr(buf, sizeof buf); if(strcmp(buf, "interrupted") == 0) return -1; fprint(2, "%s: readbyte failed - %s\n", argv0, buf); exits("read"); } - alarm(0); + sys_alarm(0); return c; } @@ -130,7 +130,7 @@ toggleRTS(int fd) static void setupeia(int fd, char *baud, char *bits) { - alarm(TIMEOUT); + sys_alarm(TIMEOUT); /* * set the speed to 1200/2400/4800/9600 baud, * 7/8-bit data, one stop bit and no parity @@ -141,7 +141,7 @@ setupeia(int fd, char *baud, char *bits) timedwrite(fd, "s1", 2); timedwrite(fd, "pn", 2); timedwrite(fd, "i1", 2); - alarm(0); + sys_alarm(0); } /* @@ -324,14 +324,14 @@ main(int argc, char *argv[]) if(argc) p = *argv; - if((conf = open("/dev/mousectl", OWRITE)) == -1){ + if((conf = sys_open("/dev/mousectl", OWRITE)) == -1){ fprint(2, "%s: can't open /dev/mousectl - %r\n", argv0); if(dontset == 0) exits("open /dev/mousectl"); } if(strncmp(p, "ps2", 3) == 0){ - if(write(conf, p, strlen(p)) < 0){ + if(jehanne_write(conf, p, strlen(p)) < 0){ fprint(2, "%s: error setting mouse type - %r\n", argv0); exits("write conf"); } @@ -343,17 +343,17 @@ main(int argc, char *argv[]) if(tries) fprint(2, "%s: Unknown mouse type, retrying...\n", argv0); sprint(buf, "#t/eia%sctl", p); - if((ctl = open(buf, ORDWR)) == -1){ + if((ctl = sys_open(buf, ORDWR)) == -1){ fprint(2, "%s: can't open %s - %r\n", argv0, buf); exits("open ctl"); } sprint(buf, "#t/eia%s", p); - if((data = open(buf, ORDWR)) == -1){ + if((data = sys_open(buf, ORDWR)) == -1){ fprint(2, "%s: can't open %s - %r\n", argv0, buf); exits("open data"); } - notify(catch); + sys_notify(catch); type = MorW(ctl, data); if(type == 0) @@ -378,8 +378,8 @@ main(int argc, char *argv[]) sprint(buf, "serial %s", p); switch(type){ case 0: - close(data); - close(ctl); + sys_close(data); + sys_close(ctl); continue; case 'C': DEBUG print("Logitech 5 byte mouse\n"); @@ -402,7 +402,7 @@ main(int argc, char *argv[]) } DEBUG fprint(2, "mouse configured as '%s'\n", buf); - if(dontset == 0 && write(conf, buf, strlen(buf)) < 0){ + if(dontset == 0 && jehanne_write(conf, buf, strlen(buf)) < 0){ fprint(2, "%s: error setting mouse type - %r\n", argv0); exits("write conf"); } diff --git a/sys/src/cmd/hmi/realemu/loadcom.c b/sys/src/cmd/hmi/realemu/loadcom.c index 10adf6f..2f794a3 100644 --- a/sys/src/cmd/hmi/realemu/loadcom.c +++ b/sys/src/cmd/hmi/realemu/loadcom.c @@ -18,12 +18,12 @@ main(int argc, char *argv[]) fprint(2, "usage:\t%s file.com\n", argv0); exits("usage"); } - if((fd = open(*argv, OREAD)) < 0) + if((fd = sys_open(*argv, OREAD)) < 0) sysfatal("open: %r"); - if((rreg = open("/dev/realmode", OWRITE)) < 0) + if((rreg = sys_open("/dev/realmode", OWRITE)) < 0) sysfatal("open realmode: %r"); - if((rmem = open("/dev/realmodemem", OWRITE)) < 0) + if((rmem = sys_open("/dev/realmodemem", OWRITE)) < 0) sysfatal("open realmodemem: %r"); if((len = readn(fd, buf, sizeof buf)) < 2) sysfatal("file too small"); @@ -34,10 +34,10 @@ main(int argc, char *argv[]) u.sp = 0xfffe; u.ip = 0x0100; - seek(rmem, (u.cs<<4) + u.ip, 0); - if(write(rmem, buf, len) != len) + sys_seek(rmem, (u.cs<<4) + u.ip, 0); + if(jehanne_write(rmem, buf, len) != len) sysfatal("write mem: %r"); - if(write(rreg, &u, sizeof u) != sizeof u) + if(jehanne_write(rreg, &u, sizeof u) != sizeof u) sysfatal("write reg: %r"); } diff --git a/sys/src/cmd/hmi/realemu/main.c b/sys/src/cmd/hmi/realemu/main.c index f7dc2b0..59ad78e 100644 --- a/sys/src/cmd/hmi/realemu/main.c +++ b/sys/src/cmd/hmi/realemu/main.c @@ -158,7 +158,7 @@ rrealmem(void *aux, unsigned long off, int len) print_func_entry(); unsigned char data[4]; - if(pread(realmemfd, data, len, off) != len){ + if(sys_pread(realmemfd, data, len, off) != len){ fprint(2, "bad real mem read %.5lux: %r\n", off); trap(&cpu, EMEM); } @@ -173,7 +173,7 @@ wrealmem(void *aux, unsigned long off, unsigned long w, int len) unsigned char data[4]; pw[len](data, w); - if(pwrite(realmemfd, data, len, off) != len){ + if(sys_pwrite(realmemfd, data, len, off) != len){ fprint(2, "bad real mem write %.5lux: %r\n", off); trap(&cpu, EMEM); } @@ -241,7 +241,7 @@ rport(void *aux, unsigned long p, int len) w = 0; break; default: - if(pread(portfd[len], data, len, p) != len){ + if(sys_pread(portfd[len], data, len, p) != len){ fprint(2, "bad %d bit port read %.4lux: %r\n", len*8, p); trap(&cpu, EIO); } @@ -308,7 +308,7 @@ wport(void *aux, unsigned long p, unsigned long w, int len) default: pw[len](data, w); - if(pwrite(portfd[len], data, len, p) != len){ + if(sys_pwrite(portfd[len], data, len, p) != len){ fprint(2, "bad %d bit port write %.4lux: %r\n", len*8, p); trap(&cpu, EIO); } @@ -349,14 +349,14 @@ cpuinit(void) fmtinstall('J', flagfmt); fmtinstall('C', cpufmt); - if((portfd[1] = open("#P/iob", ORDWR)) < 0) + if((portfd[1] = sys_open("#P/iob", ORDWR)) < 0) sysfatal("open iob: %r"); - if((portfd[2] = open("#P/iow", ORDWR)) < 0) + if((portfd[2] = sys_open("#P/iow", ORDWR)) < 0) sysfatal("open iow: %r"); - if((portfd[4] = open("#P/iol", ORDWR)) < 0) + if((portfd[4] = sys_open("#P/iol", ORDWR)) < 0) sysfatal("open iol: %r"); - if((realmemfd = open("#P/realmodemem", ORDWR)) < 0) + if((realmemfd = sys_open("#P/realmodemem", ORDWR)) < 0) sysfatal("open realmodemem: %r"); for(i=0; iname); } - if((f = open("#v/vgactl", OWRITE)) < 0) + if((f = sys_open("#v/vgactl", OWRITE)) < 0) error("%s: can't open vgactl\n", ctlr->name); - if(write(f, "type clgd546x", 13) != 13) + if(jehanne_write(f, "type clgd546x", 13) != 13) error("%s: can't set type\n", ctlr->name); - close(f); + sys_close(f); mmio = segattach(0, "clgd546xmmio", 0, p->mem[1].size); if(mmio == (void*)-1) diff --git a/sys/src/cmd/hmi/vga/error.c b/sys/src/cmd/hmi/vga/error.c index 3f6e0cc..b673a5a 100644 --- a/sys/src/cmd/hmi/vga/error.c +++ b/sys/src/cmd/hmi/vga/error.c @@ -31,7 +31,7 @@ error(char* format, ...) if(vflag) Bprint(&stdout, "%s", buf+n); Bflush(&stdout); - write(2, buf, out-buf); + jehanne_write(2, buf, out-buf); exits("error"); } diff --git a/sys/src/cmd/hmi/vga/io.c b/sys/src/cmd/hmi/vga/io.c index 6d23768..aa2f215 100644 --- a/sys/src/cmd/hmi/vga/io.c +++ b/sys/src/cmd/hmi/vga/io.c @@ -41,7 +41,7 @@ devopen(char* device, int mode) { int fd; - if((fd = open(device, mode)) < 0) + if((fd = sys_open(device, mode)) < 0) error("devopen(%s, %d): %r\n", device, mode); return fd; } @@ -54,7 +54,7 @@ inportb(int32_t port) if(iobfd == -1) iobfd = devopen("#P/iob", ORDWR); - if(pread(iobfd, &data, sizeof(data), port) != sizeof(data)) + if(sys_pread(iobfd, &data, sizeof(data), port) != sizeof(data)) error("inportb(0x%4.4lx): %r\n", port); return data; } @@ -65,7 +65,7 @@ outportb(int32_t port, uint8_t data) if(iobfd == -1) iobfd = devopen("#P/iob", ORDWR); - if(pwrite(iobfd, &data, sizeof(data), port) != sizeof(data)) + if(sys_pwrite(iobfd, &data, sizeof(data), port) != sizeof(data)) error("outportb(0x%4.4lx, 0x%2.2uX): %r\n", port, data); } @@ -77,7 +77,7 @@ inportw(int32_t port) if(iowfd == -1) iowfd = devopen("#P/iow", ORDWR); - if(pread(iowfd, &data, sizeof(data), port) != sizeof(data)) + if(sys_pread(iowfd, &data, sizeof(data), port) != sizeof(data)) error("inportw(0x%4.4lx): %r\n", port); return data; } @@ -88,7 +88,7 @@ outportw(int32_t port, uint16_t data) if(iowfd == -1) iowfd = devopen("#P/iow", ORDWR); - if(pwrite(iowfd, &data, sizeof(data), port) != sizeof(data)) + if(sys_pwrite(iowfd, &data, sizeof(data), port) != sizeof(data)) error("outportw(0x%4.4lx, 0x%2.2uX): %r\n", port, data); } @@ -100,7 +100,7 @@ inportl(int32_t port) if(iolfd == -1) iolfd = devopen("#P/iol", ORDWR); - if(pread(iolfd, &data, sizeof(data), port) != sizeof(data)) + if(sys_pread(iolfd, &data, sizeof(data), port) != sizeof(data)) error("inportl(0x%4.4lx): %r\n", port); return data; } @@ -111,7 +111,7 @@ outportl(int32_t port, uint32_t data) if(iolfd == -1) iolfd = devopen("#P/iol", ORDWR); - if(pwrite(iolfd, &data, sizeof(data), port) != sizeof(data)) + if(sys_pwrite(iolfd, &data, sizeof(data), port) != sizeof(data)) error("outportl(0x%4.4lx, 0x%2.2luX): %r\n", port, data); } @@ -129,8 +129,8 @@ vgactlinit(void) memset(attr, 0, sizeof(attr)); } - seek(ctlfd, 0, 0); - nattr = read(ctlfd, ctlbuf, Nctlchar-1); + sys_seek(ctlfd, 0, 0); + nattr = jehanne_read(ctlfd, ctlbuf, Nctlchar-1); if(nattr < 0) error("vgactlr: read: %r\n"); ctlbuf[nattr] = 0; @@ -188,10 +188,10 @@ vgactlw(char* attr, char* val) if(ctlfd == -1) ctlfd = devopen("#v/vgactl", ORDWR); - seek(ctlfd, 0, 0); + sys_seek(ctlfd, 0, 0); len = sprint(buf, "%s %s", attr, val); trace("+vgactlw %s\n", buf); - if(write(ctlfd, buf, len) != len) + if(jehanne_write(ctlfd, buf, len) != len) error("vgactlw: <%s>: %r\n", buf); trace("-vgactlw %s\n", buf); @@ -213,7 +213,7 @@ doreadbios(char* buf, int32_t len, int32_t offset) char file[64]; if(biosfd == -1){ - biosfd = open("#v/vgabios", OREAD); + biosfd = sys_open("#v/vgabios", OREAD); biosoffset = 0; } if(biosfd == -1){ @@ -223,8 +223,8 @@ doreadbios(char* buf, int32_t len, int32_t offset) } if(biosfd == -1) return -1; - seek(biosfd, biosoffset+offset, 0); - return read(biosfd, buf, len); + sys_seek(biosfd, biosoffset+offset, 0); + return jehanne_read(biosfd, buf, len); } char* diff --git a/sys/src/cmd/hmi/vga/main.c b/sys/src/cmd/hmi/vga/main.c index 35740ec..f62d5de 100644 --- a/sys/src/cmd/hmi/vga/main.c +++ b/sys/src/cmd/hmi/vga/main.c @@ -171,18 +171,18 @@ wiremach(void) pid = getpid(); sprint(file, "#p/%d/ctl", pid); - f = open(file, OWRITE); + f = sys_open(file, OWRITE); if(f < 0){ sprint(file, "/proc/%d/ctl", pid); - f = open(file, OWRITE); + f = sys_open(file, OWRITE); } if(f < 0) fprint(2, "wiremach: cannot open neither #p/%d/ctl nor /proc/%d/ctl", pid, pid); - if(write(f, "wired 0", 7) < 7){ + if(jehanne_write(f, "wired 0", 7) < 7){ fprint(2, "%s: cannot wire to mach 0: %r", argv0); exits("wire"); } - close(f); + sys_close(f); } void @@ -490,9 +490,9 @@ main(int argc, char** argv) vgactlw("hwgc", vga->hwgc->name); /* might as well initialize the cursor */ - if((fd = open("/dev/cursor", OWRITE)) >= 0){ - write(fd, buf, 0); - close(fd); + if((fd = sys_open("/dev/cursor", OWRITE)) >= 0){ + jehanne_write(fd, buf, 0); + sys_close(fd); } if(vga->virtx != vga->mode->x || vga->virty != vga->mode->y){ diff --git a/sys/src/cmd/hmi/vga/t2r4.c b/sys/src/cmd/hmi/vga/t2r4.c index 9c97e86..55d4f50 100644 --- a/sys/src/cmd/hmi/vga/t2r4.c +++ b/sys/src/cmd/hmi/vga/t2r4.c @@ -116,11 +116,11 @@ snarf(Vga* vga, Ctlr* ctlr) error("%s: not found\n", ctlr->name); } - if((f = open("#v/vgactl", OWRITE)) < 0) + if((f = sys_open("#v/vgactl", OWRITE)) < 0) error("%s: can't open vgactl\n", ctlr->name); - if(write(f, "type t2r4", 9) != 9) + if(jehanne_write(f, "type t2r4", 9) != 9) error("%s: can't set type\n", ctlr->name); - close(f); + sys_close(f); mmio = segattach(0, "t2r4mmio", 0, p->mem[4].size); if(mmio == (void*)-1) diff --git a/sys/src/cmd/hmi/vga/vesa.c b/sys/src/cmd/hmi/vga/vesa.c index be951ad..a4894d9 100644 --- a/sys/src/cmd/hmi/vga/vesa.c +++ b/sys/src/cmd/hmi/vga/vesa.c @@ -334,9 +334,9 @@ mkvbe(void) Vbe *vbe; vbe = alloc(sizeof(Vbe)); - if((vbe->rmfd = open("/dev/realmode", ORDWR)) < 0) + if((vbe->rmfd = sys_open("/dev/realmode", ORDWR)) < 0) return nil; - if((vbe->memfd = open("/dev/realmodemem", ORDWR)) < 0) + if((vbe->memfd = sys_open("/dev/realmodemem", ORDWR)) < 0) return nil; vbe->mem = alloc(MemSize); vbe->isvalid = alloc(MemSize/PageSize); @@ -350,7 +350,7 @@ loadpage(Vbe *vbe, int p) { if(p >= MemSize/PageSize || vbe->isvalid[p]) return; - if(pread(vbe->memfd, vbe->mem+p*PageSize, PageSize, p*PageSize) != PageSize) + if(sys_pread(vbe->memfd, vbe->mem+p*PageSize, PageSize, p*PageSize) != PageSize) error("read /dev/realmodemem: %r\n"); vbe->isvalid[p] = 1; } @@ -387,13 +387,13 @@ int vbecall(Vbe *vbe, VGAreg *u) { u->trap = 0x10; - if(pwrite(vbe->memfd, vbe->buf, PageSize, RealModeBuf) != PageSize) + if(sys_pwrite(vbe->memfd, vbe->buf, PageSize, RealModeBuf) != PageSize) error("write /dev/realmodemem: %r\n"); - if(pwrite(vbe->rmfd, u, sizeof *u, 0) != sizeof *u) + if(sys_pwrite(vbe->rmfd, u, sizeof *u, 0) != sizeof *u) error("write /dev/realmode: %r\n"); - if(pread(vbe->rmfd, u, sizeof *u, 0) != sizeof *u) + if(sys_pread(vbe->rmfd, u, sizeof *u, 0) != sizeof *u) error("read /dev/realmode: %r\n"); - if(pread(vbe->memfd, vbe->buf, PageSize, RealModeBuf) != PageSize) + if(sys_pread(vbe->memfd, vbe->buf, PageSize, RealModeBuf) != PageSize) error("read /dev/realmodemem: %r\n"); if((u->ax&0xFFFF) != 0x004F){ werrstr("VBE error %#.4lux", u->ax&0xFFFF); diff --git a/sys/src/cmd/hoc/hoc.y b/sys/src/cmd/hoc/hoc.y index a0aaaf2..c1cdf2b 100644 --- a/sys/src/cmd/hoc/hoc.y +++ b/sys/src/cmd/hoc/hoc.y @@ -366,7 +366,7 @@ moreinput(void) /* leave fd around; file will be removed on exit */ /* the following looks weird but is required for unix version */ bin = &b; - seek(fd, 0, 0); + sys_seek(fd, 0, 0); Binit(bin, fd, OREAD); } else { bin=Bopen(infile, OREAD); diff --git a/sys/src/cmd/import.c b/sys/src/cmd/import.c index 6cf95e0..f24c831 100644 --- a/sys/src/cmd/import.c +++ b/sys/src/cmd/import.c @@ -66,9 +66,9 @@ procsetname(char *fmt, ...) if (cmdname == nil) return; snprint(buf, sizeof buf, "#p/%d/args", getpid()); - if((fd = open(buf, OWRITE)) >= 0){ - write(fd, cmdname, strlen(cmdname)+1); - close(fd); + if((fd = sys_open(buf, OWRITE)) >= 0){ + jehanne_write(fd, cmdname, strlen(cmdname)+1); + sys_close(fd); } free(cmdname); } @@ -83,9 +83,9 @@ post(char *name, char *envname, int srvfd) if(fd < 0) return; sprint(buf, "%d",srvfd); - if(write(fd, buf, strlen(buf)) != strlen(buf)) + if(jehanne_write(fd, buf, strlen(buf)) != strlen(buf)) sysfatal("srv write: %r"); - close(fd); + sys_close(fd); putenv(envname, name); } @@ -189,8 +189,8 @@ main(int argc, char **argv) if (encproto == Enctls) sysfatal("%s: tls has not yet been implemented", argv[0]); - notify(catcher); - alarm(60*1000); + sys_notify(catcher); + sys_alarm(60*1000); if(backwards) fd = passive(); @@ -216,7 +216,7 @@ main(int argc, char **argv) srand(truerand()); for(i = 0; i < 4; i++) key[i] = rand(); - if(write(fd, key, 4) != 4) + if(jehanne_write(fd, key, 4) != 4) sysfatal("can't write key part: %r"); if(readn(fd, key+12, 4) != 4) sysfatal("can't read key part: %r"); @@ -240,16 +240,16 @@ main(int argc, char **argv) if(srvpost){ sprint(srvfile, "/srv/%s", srvpost); - remove(srvfile); + sys_remove(srvfile); post(srvfile, srvpost, fd); } procsetname("mount on %s", mntpt); - if(mount(fd, -1, mntpt, mntflags, "", '9') < 0) + if(sys_mount(fd, -1, mntpt, mntflags, "", '9') < 0) sysfatal("can't mount %s: %r", argv[1]); - alarm(0); + sys_alarm(0); if(backwards && argc > 1){ - exec(argv[1], &argv[1]); + sys_exec(argv[1], &argv[1]); sysfatal("exec: %r"); } exits(0); @@ -260,8 +260,8 @@ catcher(void *v, char *msg) { timedout = 1; if(strcmp(msg, "alarm") == 0) - noted(NCONT); - noted(NDFLT); + sys_noted(NCONT); + sys_noted(NDFLT); } int @@ -273,32 +273,32 @@ old9p(int fd) if(pipe(p) < 0) sysfatal("pipe: %r"); - switch(rfork(RFPROC|RFFDG|RFNAMEG)) { + switch(sys_rfork(RFPROC|RFFDG|RFNAMEG)) { case -1: sysfatal("rfork srvold9p: %r"); case 0: if(fd != 1){ dup(fd, 1); - close(fd); + sys_close(fd); } if(p[0] != 0){ dup(p[0], 0); - close(p[0]); + sys_close(p[0]); } - close(p[1]); + sys_close(p[1]); if(0){ - fd = open("/sys/log/cpu", OWRITE); + fd = sys_open("/sys/log/cpu", OWRITE); if(fd != 2){ dup(fd, 2); - close(fd); + sys_close(fd); } execl("/cmd/srvold9p", "srvold9p", "-ds", nil); } else execl("/cmd/srvold9p", "srvold9p", "-s", nil); sysfatal("exec srvold9p: %r"); default: - close(fd); - close(p[0]); + sys_close(fd); + sys_close(p[0]); } return p[1]; } @@ -331,14 +331,14 @@ connect(char *system, char *tree, int oldserver) if(tree != nil){ procsetname("writing tree name %s", tree); - n = write(fd, tree, strlen(tree)); + n = jehanne_write(fd, tree, strlen(tree)); if(n < 0) sysfatal("can't write tree: %r"); strcpy(buf, "can't read tree"); procsetname("awaiting OK for %s", tree); - n = read(fd, buf, sizeof buf - 1); + n = jehanne_read(fd, buf, sizeof buf - 1); if(n!=2 || buf[0]!='O' || buf[1]!='K'){ if (timedout) sysfatal("timed out connecting to %s", na); @@ -370,10 +370,10 @@ passive(void) putenv(ENV_SERVICE, "import"); fd = dup(0, -1); - close(0); - open("/dev/null", ORDWR); - close(1); - open("/dev/null", ORDWR); + sys_close(0); + sys_open("/dev/null", ORDWR); + sys_close(1); + sys_open("/dev/null", ORDWR); return fd; } @@ -394,7 +394,7 @@ filter(int fd, char *cmd, char *host) char newport[256], buf[256], *s; char *argv[16], *file, *pbuf; - if ((len = read(fd, newport, sizeof newport - 1)) < 0) + if ((len = jehanne_read(fd, newport, sizeof newport - 1)) < 0) sysfatal("filter: cannot write port; %r"); newport[len] = '\0'; @@ -421,19 +421,19 @@ filter(int fd, char *cmd, char *host) if(pipe(p) < 0) sysfatal("pipe: %r"); - switch(rfork(RFNOWAIT|RFPROC|RFFDG)) { + switch(sys_rfork(RFNOWAIT|RFPROC|RFFDG)) { case -1: sysfatal("rfork record module: %r"); case 0: dup(p[0], 1); dup(p[0], 0); - close(p[0]); - close(p[1]); - exec(file, argv); + sys_close(p[0]); + sys_close(p[1]); + sys_exec(file, argv); sysfatal("exec record module: %r"); default: - close(fd); - close(p[0]); + sys_close(fd); + sys_close(p[0]); } return p[1]; } diff --git a/sys/src/cmd/init.c b/sys/src/cmd/init.c index 65d29b4..4dc9a63 100644 --- a/sys/src/cmd/init.c +++ b/sys/src/cmd/init.c @@ -42,7 +42,7 @@ main(int argc, char *argv[]) int fd; closefds(); - alarm(0); + sys_alarm(0); service = "cpu"; manual = 0; @@ -61,9 +61,9 @@ main(int argc, char *argv[]) fd = procopen(getpid(), "ctl", OWRITE); if(fd >= 0){ - if(write(fd, "pri 10", 6) != 6) + if(jehanne_write(fd, "pri 10", 6) != 6) fprint(2, "init: warning: can't set priority: %r\n"); - close(fd); + sys_close(fd); } cpu = readenv(ENV_CPUTYPE); @@ -98,14 +98,14 @@ printfile(int fd) int n; char buf[256]; if(fd >= 0){ - n = fd2path(fd, buf, 256); + n = sys_fd2path(fd, buf, 256); if(n < 0){ fprint(2, "printfile(%d): fd2path: %r\n", fd); return; } print("%s:\n", buf); - while((n = read(fd, buf, 256)) > 0){ - write(1, buf, n); + while((n = jehanne_read(fd, buf, 256)) > 0){ + jehanne_write(1, buf, n); sleep(500); } print("\n"); @@ -119,7 +119,7 @@ pinhead(void *c, char *msg) { gotnote = 1; fprint(2, "init got note '%s'\n", msg); - noted(NCONT); + sys_noted(NCONT); } void @@ -130,7 +130,7 @@ fexec(void (*execfn)(void)) switch(pid=fork()){ case 0: - rfork(RFNOTEG); + sys_rfork(RFNOTEG); (*execfn)(); print("init: exec error: %r\n"); exits("exec"); @@ -139,7 +139,7 @@ fexec(void (*execfn)(void)) exits("fork"); default: casedefault: - notify(pinhead); + sys_notify(pinhead); gotnote = 0; w = wait(); if(w == nil){ @@ -192,7 +192,7 @@ readfile(char *name) Dir *d; char *val; - f = open(name, OREAD); + f = sys_open(name, OREAD); if(f < 0){ print("init: can't open %s: %r\n", name); return nil; @@ -200,7 +200,7 @@ readfile(char *name) d = dirfstat(f); if(d == nil){ print("init: can't stat %s: %r\n", name); - close(f); + sys_close(f); return nil; } len = d->length; @@ -210,11 +210,11 @@ readfile(char *name) val = malloc(len+1); if(val == nil){ print("init: can't malloc %s: %r\n", name); - close(f); + sys_close(f); return nil; } - len = read(f, val, len); - close(f); + len = jehanne_read(f, val, len); + sys_close(f); if(len < 0){ print("init: can't read %s: %r\n", name); return nil; @@ -247,8 +247,8 @@ setenv(char *name, char *val) if(fd < 0) fprint(2, "init: can't create %s: %r\n", buf); else{ - write(fd, val, strlen(val)); - close(fd); + jehanne_write(fd, val, strlen(val)); + sys_close(fd); } } @@ -273,7 +273,7 @@ closefds(void) int i; for(i = 3; i < 30; i++) - close(i); + sys_close(i); } int @@ -283,7 +283,7 @@ procopen(int pid, char *name, int mode) int fd; snprint(buf, sizeof(buf), "#p/%d/%s", pid, name); - fd = open(buf, mode); + fd = sys_open(buf, mode); if(fd < 0) fprint(2, "init: warning: can't open %s: %r\n", name); return fd; diff --git a/sys/src/cmd/ip/dhcpclient.c b/sys/src/cmd/ip/dhcpclient.c index b91c258..59336e3 100644 --- a/sys/src/cmd/ip/dhcpclient.c +++ b/sys/src/cmd/ip/dhcpclient.c @@ -74,7 +74,7 @@ main(int argc, char *argv[]) dhcpinit(); - rfork(RFNOTEG|RFREND); + sys_rfork(RFNOTEG|RFREND); thread(timerthread, 0); thread(stdinthread, 0); @@ -91,7 +91,7 @@ main(int argc, char *argv[]) dhcprecv(); /* allows other clients on this machine */ - close(dhcp.fd); + sys_close(dhcp.fd); dhcp.fd = -1; print("ip=%I\n", dhcp.client); @@ -118,7 +118,7 @@ main(int argc, char *argv[]) dhcprecv(); /* allows other clients on this machine */ - close(dhcp.fd); + sys_close(dhcp.fd); dhcp.fd = -1; } } @@ -190,7 +190,7 @@ stdinthread(void* v) int n; for(;;) { - n = read(0, buf, sizeof(buf)); + n = jehanne_read(0, buf, sizeof(buf)); if(n <= 0) break; } @@ -216,10 +216,10 @@ dhcpinit(void) dhcp.state = Sinit; dhcp.timeout = 4; - fd = open("/dev/random", OREAD); + fd = sys_open("/dev/random", OREAD); if(fd >= 0) { - read(fd, &dhcp.xid, sizeof(dhcp.xid)); - close(fd); + jehanne_read(fd, &dhcp.xid, sizeof(dhcp.xid)); + sys_close(fd); } else dhcp.xid = time(0)*getpid(); srand(dhcp.xid); @@ -279,7 +279,7 @@ dhcpsend(int type) n = p - (uint8_t*)&bp; - if(write(dhcp.fd, &bp, n) != n) + if(jehanne_write(dhcp.fd, &bp, n) != n) myfatal("dhcpsend: write failed: %r"); } @@ -293,7 +293,7 @@ dhcprecv(void) uint8_t mask[IPaddrlen]; qunlock(&dhcp.lk); - n = read(dhcp.fd, buf, sizeof(buf)); + n = jehanne_read(dhcp.fd, buf, sizeof(buf)); qlock(&dhcp.lk); if(n <= 0) @@ -382,10 +382,10 @@ openlisten(char *net) myfatal("can't set header mode: %r"); sprint(data, "%s/data", devdir); - fd = open(data, ORDWR); + fd = sys_open(data, ORDWR); if(fd < 0) myfatal("open %s: %r", data); - close(cfd); + sys_close(cfd); return fd; } @@ -645,7 +645,7 @@ thread(void(*f)(void*), void *a) { int pid; - pid = rfork(RFNOWAIT|RFMEM|RFPROC); + pid = sys_rfork(RFNOWAIT|RFMEM|RFPROC); if(pid < 0) myfatal("rfork failed: %r"); if(pid != 0) diff --git a/sys/src/cmd/ip/dhcpd/db.c b/sys/src/cmd/ip/dhcpd/db.c index 01219db..3b8e768 100644 --- a/sys/src/cmd/ip/dhcpd/db.c +++ b/sys/src/cmd/ip/dhcpd/db.c @@ -108,10 +108,10 @@ lockopen(char *file) int fd, tries; for(tries = 0; tries < 5; tries++){ - fd = open(file, ORDWR); + fd = sys_open(file, ORDWR); if(fd >= 0) return fd; - errstr(err, sizeof err); + sys_errstr(err, sizeof err); if(strstr(err, "lock")){ /* wait for other process to let go of lock */ sleep(250); @@ -165,7 +165,7 @@ writebinding(int fd, Binding *b) { Dir *d; - seek(fd, 0, 0); + sys_seek(fd, 0, 0); if(fprint(fd, "%ld\n%s\n", b->lease, b->boundto) < 0) return -1; d = dirfstat(fd); @@ -200,7 +200,7 @@ syncbinding(Binding *b, int returnfd) d = dirfstat(fd); if(d != nil) /* BUG? */ if(d->qid.type != b->q.type || d->qid.path != b->q.path || d->qid.vers != b->q.vers){ - i = read(fd, buf, sizeof(buf)-1); + i = jehanne_read(fd, buf, sizeof(buf)-1); if(i < 0) i = 0; buf[i] = 0; @@ -215,7 +215,7 @@ syncbinding(Binding *b, int returnfd) if(returnfd) return fd; - close(fd); + sys_close(fd); return 0; } @@ -410,17 +410,17 @@ commitbinding(Binding *b) if(fd < 0) return -1; if(b->lease > now && b->boundto && strcmp(b->boundto, b->offeredto) != 0){ - close(fd); + sys_close(fd); return -1; } setbinding(b, b->offeredto, now + b->offer); b->lasttouched = now; if(writebinding(fd, b) < 0){ - close(fd); + sys_close(fd); return -1; } - close(fd); + sys_close(fd); return 0; } @@ -439,16 +439,16 @@ releasebinding(Binding *b, char *id) if(fd < 0) return -1; if(b->lease > now && b->boundto && strcmp(b->boundto, id) != 0){ - close(fd); + sys_close(fd); return -1; } b->lease = 0; b->expoffer = 0; if(writebinding(fd, b) < 0){ - close(fd); + sys_close(fd); return -1; } - close(fd); + sys_close(fd); return 0; } diff --git a/sys/src/cmd/ip/dhcpd/dhcpd.c b/sys/src/cmd/ip/dhcpd/dhcpd.c index bda78b6..610a624 100644 --- a/sys/src/cmd/ip/dhcpd/dhcpd.c +++ b/sys/src/cmd/ip/dhcpd/dhcpd.c @@ -310,7 +310,7 @@ main(int argc, char **argv) /* put process in background */ if(!debug) - switch(rfork(RFNOTEG|RFPROC|RFFDG)) { + switch(sys_rfork(RFNOTEG|RFPROC|RFFDG)) { case -1: fatal(1, "fork"); case 0: @@ -792,7 +792,7 @@ sendoffer(Req *rp, uint8_t *ip, int offer) * send */ n = rp->p - rp->buf; - if(!ismuted(rp) && write(rp->fd, rp->buf, n) != n) + if(!ismuted(rp) && jehanne_write(rp->fd, rp->buf, n) != n) warning(0, "offer: write failed: %r"); } @@ -853,7 +853,7 @@ sendack(Req *rp, uint8_t *ip, int offer, int sendlease) * send */ n = rp->p - rp->buf; - if(!ismuted(rp) && write(rp->fd, rp->buf, n) != n) + if(!ismuted(rp) && jehanne_write(rp->fd, rp->buf, n) != n) warning(0, "ack: write failed: %r"); } @@ -906,7 +906,7 @@ sendnak(Req *rp, char *msg) * send nak */ n = rp->p - rp->buf; - if(!ismuted(rp) && write(rp->fd, rp->buf, n) != n) + if(!ismuted(rp) && jehanne_write(rp->fd, rp->buf, n) != n) warning(0, "nak: write failed: %r"); } @@ -1046,7 +1046,7 @@ bootp(Req *rp) * send */ n = rp->p - rp->buf; - if(!ismuted(rp) && write(rp->fd, rp->buf, n) != n) + if(!ismuted(rp) && jehanne_write(rp->fd, rp->buf, n) != n) warning(0, "bootp: write failed: %r"); warning(0, "bootp via %I: file %s xid(%ux)flag(%ux)ci(%V)gi(%V)yi(%V)si(%V) %s", @@ -1318,7 +1318,7 @@ openlisten(char *net) fatal(1, "can't set header mode"); sprint(data, "%s/data", devdir); - fd = open(data, ORDWR); + fd = sys_open(data, ORDWR); if(fd < 0) fatal(1, "open udp data"); return fd; @@ -1367,10 +1367,10 @@ readsysname(void) char *p; int n, fd; - fd = open("/dev/sysname", OREAD); + fd = sys_open("/dev/sysname", OREAD); if(fd >= 0){ - n = read(fd, name, sizeof(name)-1); - close(fd); + n = jehanne_read(fd, name, sizeof(name)-1); + sys_close(fd); if(n > 0){ name[n] = 0; return name; @@ -1604,13 +1604,13 @@ arpenter(uint8_t *ip, uint8_t *ether) char buf[256]; sprint(buf, "%s/arp", net); - f = open(buf, OWRITE); + f = sys_open(buf, OWRITE); if(f < 0){ syslog(debug, blog, "open %s: %r", buf); return; } fprint(f, "add ether %I %E", ip, ether); - close(f); + sys_close(f); } char *dhcpmsgname[] = @@ -1681,9 +1681,9 @@ void ding(void* _, char *msg) { if(strstr(msg, "alarm")) - noted(NCONT); + sys_noted(NCONT); else - noted(NDFLT); + sys_noted(NDFLT); } int @@ -1691,13 +1691,13 @@ readlast(int fd, uint8_t *buf, int len) { int lastn, n; - notify(ding); + sys_notify(ding); lastn = 0; for(;;){ - alarm(20); - n = read(fd, buf, len); - alarm(0); + sys_alarm(20); + n = jehanne_read(fd, buf, len); + sys_alarm(0); if(n < 0){ if(lastn > 0) return lastn; @@ -1705,5 +1705,5 @@ readlast(int fd, uint8_t *buf, int len) } lastn = n; } - return read(fd, buf, len); + return jehanne_read(fd, buf, len); } diff --git a/sys/src/cmd/ip/dhcpd/dhcpleases.c b/sys/src/cmd/ip/dhcpd/dhcpleases.c index acf8223..d4691c2 100644 --- a/sys/src/cmd/ip/dhcpd/dhcpleases.c +++ b/sys/src/cmd/ip/dhcpd/dhcpleases.c @@ -38,13 +38,13 @@ main(void) fmtinstall('V', eipfmt); fmtinstall('M', eipfmt); - fd = open(binddir, OREAD); + fd = sys_open(binddir, OREAD); if(fd < 0) sysfatal("opening %s: %r", binddir); nall = dirreadall(fd, &all); if(nall < 0) sysfatal("reading %s: %r", binddir); - close(fd); + sys_close(fd); b.boundto = 0; b.lease = b.offer = 0; diff --git a/sys/src/cmd/ip/dhcpd/ping.c b/sys/src/cmd/ip/dhcpd/ping.c index 4baf40b..194b7ea 100644 --- a/sys/src/cmd/ip/dhcpd/ping.c +++ b/sys/src/cmd/ip/dhcpd/ping.c @@ -23,9 +23,9 @@ catch(void *a, char *msg) { USED(a); if(strstr(msg, "alarm")) - noted(NCONT); + sys_noted(NCONT); else - noted(NDFLT); + sys_noted(NDFLT); } #define MSG "dhcp probe" @@ -54,7 +54,7 @@ icmpecho(uint8_t *a) sseq = getpid()*time(0); ip = (Icmphdr *)(buf + IPV4HDR_LEN); - notify(catch); + sys_notify(catch); for(i = 0; i < 3; i++){ ip->type = EchoRequest; ip->code = 0; @@ -64,13 +64,13 @@ icmpecho(uint8_t *a) len = IPV4HDR_LEN + ICMP_HDRSIZE + sizeof(MSG); /* send a request */ - if(write(fd, buf, len) < len) + if(jehanne_write(fd, buf, len) < len) break; /* wait 1/10th second for a reply and try again */ - alarm(100); - n = read(fd, buf, sizeof(buf)); - alarm(0); + sys_alarm(100); + n = jehanne_read(fd, buf, sizeof(buf)); + sys_alarm(0); if(n <= 0) continue; @@ -82,6 +82,6 @@ icmpecho(uint8_t *a) break; } } - close(fd); + sys_close(fd); return rv; } diff --git a/sys/src/cmd/ip/gping.c b/sys/src/cmd/ip/gping.c index b21522f..75b1c4e 100644 --- a/sys/src/cmd/ip/gping.c +++ b/sys/src/cmd/ip/gping.c @@ -229,10 +229,10 @@ loadbuf(Machine *m, int *fd) if(*fd < 0) return 0; - seek(*fd, 0, 0); - n = read(*fd, m->buf, sizeof m->buf); + sys_seek(*fd, 0, 0); + n = jehanne_read(*fd, m->buf, sizeof m->buf); if(n <= 0){ - close(*fd); + sys_close(*fd); *fd = -1; return 0; } @@ -520,8 +520,8 @@ pingsend(Machine *m) m->last = r; r->time = nsec(); jehanne_unlock(m); - if(write(m->pingfd, buf, MSGLEN) < MSGLEN){ - errstr(err, sizeof err); + if(jehanne_write(m->pingfd, buf, MSGLEN) < MSGLEN){ + sys_errstr(err, sizeof err); if(strstr(err, "unreach")||strstr(err, "exceed")) m->unreachable++; } @@ -544,7 +544,7 @@ pingrcv(void *arg) ip = (Icmphdr *)(buf + IPV4HDR_LEN); fd = dup(m->pingfd, -1); for(;;){ - n = read(fd, buf, sizeof(buf)); + n = jehanne_read(fd, buf, sizeof(buf)); now = nsec(); if(n <= 0) continue; @@ -653,7 +653,7 @@ alarmed(void *a, char *s) { if(strcmp(s, "alarm") == 0) notejmp(a, catchalarm, 1); - noted(NDFLT); + sys_noted(NDFLT); } void @@ -980,7 +980,7 @@ startproc(void (*f)(void*), void *arg) { int pid; - switch(pid = rfork(RFPROC|RFMEM|RFNOWAIT)){ + switch(pid = sys_rfork(RFPROC|RFMEM|RFNOWAIT)){ case -1: fprint(2, "%s: fork failed: %r\n", argv0); killall("fork failed"); @@ -1047,7 +1047,7 @@ main(int argc, char *argv[]) } colinit(); einit(Emouse); - notify(nil); + sys_notify(nil); startproc(mouseproc, 0); display->locking = 1; /* tell library we're using the display lock */ diff --git a/sys/src/cmd/ip/hogports.c b/sys/src/cmd/ip/hogports.c index ba30571..381ef0f 100644 --- a/sys/src/cmd/ip/hogports.c +++ b/sys/src/cmd/ip/hogports.c @@ -60,21 +60,21 @@ main(int argc, char **argv) exits("usage"); } - switch(rfork(RFREND|RFNOTEG|RFFDG|RFPROC|RFNAMEG)){ + switch(sys_rfork(RFREND|RFNOTEG|RFFDG|RFPROC|RFNAMEG)){ case 0: - close(0); - close(1); + sys_close(0); + sys_close(1); break; case -1: abort(); /* "fork failed\n" */; default: - _exits(0); + sys__exits(0); } for(i = 0; i < argc; i++) hogrange(argv[i]); - close(2); + sys_close(2); for(;;) sleep(10000); } diff --git a/sys/src/cmd/ip/ipconfig/ipv6.c b/sys/src/cmd/ip/ipconfig/ipv6.c index 8a04bb2..ce5d8eb 100644 --- a/sys/src/cmd/ip/ipconfig/ipv6.c +++ b/sys/src/cmd/ip/ipconfig/ipv6.c @@ -328,9 +328,9 @@ catch(void *a, char *msg) { USED(a); if(strstr(msg, "alarm")) - noted(NCONT); + sys_noted(NCONT); else - noted(NDFLT); + sys_noted(NDFLT); } /* @@ -351,9 +351,9 @@ procsetname(char *fmt, ...) if (cmdname == nil) return; snprint(buf, sizeof buf, "#p/%d/args", getpid()); - if((fd = open(buf, OWRITE)) >= 0){ - write(fd, cmdname, strlen(cmdname)+1); - close(fd); + if((fd = sys_open(buf, OWRITE)) >= 0){ + jehanne_write(fd, cmdname, strlen(cmdname)+1); + sys_close(fd); } free(cmdname); } @@ -366,17 +366,17 @@ dialicmp(uint8_t *dst, int dport, int *ctlfd) char hdrs[] = "headers"; snprint(name, sizeof name, "%s/icmpv6/clone", conf.mpoint); - cfd = open(name, ORDWR); + cfd = sys_open(name, ORDWR); if(cfd < 0) sysfatal("dialicmp: can't open %s: %r", name); n = snprint(cmsg, sizeof cmsg, "connect %I!%d!r %d", dst, dport, dport); - m = write(cfd, cmsg, n); + m = jehanne_write(cfd, cmsg, n); if (m < n) sysfatal("dialicmp: can't write %s to %s: %r", cmsg, name); - seek(cfd, 0, 0); - n = read(cfd, connind, sizeof connind); + sys_seek(cfd, 0, 0); + n = jehanne_read(cfd, connind, sizeof connind); if (n < 0) connind[0] = 0; else if (n < sizeof connind) @@ -385,12 +385,12 @@ dialicmp(uint8_t *dst, int dport, int *ctlfd) connind[sizeof connind - 1] = 0; snprint(name, sizeof name, "%s/icmpv6/%s/data", conf.mpoint, connind); - fd = open(name, ORDWR); + fd = sys_open(name, ORDWR); if(fd < 0) sysfatal("dialicmp: can't open %s: %r", name); n = sizeof hdrs - 1; - if(write(cfd, hdrs, n) < n) + if(jehanne_write(cfd, hdrs, n) < n) sysfatal("dialicmp: can't write `%s' to %s: %r", hdrs, name); *ctlfd = cfd; return fd; @@ -429,7 +429,7 @@ Again: n += snprint(buf+n, sizeof buf-n, " %d", conf.mtu); } - if(write(conf.cfd, buf, n) < 0){ + if(jehanne_write(conf.cfd, buf, n) < 0){ warning("write(%s): %r", buf); return -1; } @@ -493,7 +493,7 @@ sendrs(int fd) memmove(rs->src, v6Unspecified, IPaddrlen); rs->type = ICMP6_RS; - if(write(fd, rs, sizeof buff) < sizeof buff) + if(jehanne_write(fd, rs, sizeof buff) < sizeof buff) ralog("sendrs: write failed, pkt size %d", sizeof buff); else ralog("sendrs: sent solicitation to %I from %I on %s", @@ -522,7 +522,7 @@ ewrite(int fd, char *str) int n; n = strlen(str); - if (write(fd, str, n) != n) + if (jehanne_write(fd, str, n) != n) ralog("write(%s) failed: %r", str); } @@ -608,7 +608,7 @@ recvrahost(uint8_t buf[], int pktlen) } snprint(abuf, sizeof abuf, "%s/arp", conf.mpoint); - arpfd = open(abuf, OWRITE); + arpfd = sys_open(abuf, OWRITE); if (arpfd < 0) { ralog("recvrahost: couldn't open %s to write: %r", abuf); @@ -617,10 +617,10 @@ recvrahost(uint8_t buf[], int pktlen) n = snprint(abuf, sizeof abuf, "add ether %I %E", ra->src, llao->lladdr); - if (write(arpfd, abuf, n) < n) + if (jehanne_write(arpfd, abuf, n) < n) ralog("recvrahost: couldn't write to %s/arp", conf.mpoint); - close(arpfd); + sys_close(arpfd); break; case V6nd_targlladdr: case V6nd_redirhdr: @@ -681,10 +681,10 @@ recvra6(void) if (fd < 0) sysfatal("can't open icmp_ra connection: %r"); - notify(catch); + sys_notify(catch); sendrscnt = Maxv6rss; - switch(rfork(RFPROC|RFMEM|RFFDG|RFNOWAIT|RFNOTEG)){ + switch(sys_rfork(RFPROC|RFMEM|RFFDG|RFNOWAIT|RFNOTEG)){ case -1: sysfatal("can't fork: %r"); default: @@ -704,9 +704,9 @@ recvra6(void) */ if (sleepfor < 7000) sleepfor = 7000; - alarm(sleepfor); - n = read(fd, buf, sizeof buf); - alarm(0); + sys_alarm(sleepfor); + n = jehanne_read(fd, buf, sizeof buf); + sys_alarm(0); ifc = readipifc(conf.mpoint, ifc, myifc); if (ifc == nil) { @@ -742,7 +742,7 @@ recvra6(void) break; case IsHostNoRecv: ralog("recvra6: recvra off, quitting on %s", conf.dev); - close(fd); + sys_close(fd); exits(0); } } @@ -779,7 +779,7 @@ recvrs(uint8_t *buf, int pktlen, uint8_t *sol) return 0; snprint(abuf, sizeof abuf, "%s/arp", conf.mpoint); - arpfd = open(abuf, OWRITE); + arpfd = sys_open(abuf, OWRITE); if (arpfd < 0) { ralog("recvrs: can't open %s/arp to write: %r", conf.mpoint); return -1; @@ -787,14 +787,14 @@ recvrs(uint8_t *buf, int pktlen, uint8_t *sol) llao = (Lladdropt *)(uint64_t)buf[n]; n = snprint(abuf, sizeof abuf, "add ether %I %E", rs->src, llao->lladdr); - if (write(arpfd, abuf, n) < n) { + if (jehanne_write(arpfd, abuf, n) < n) { ralog("recvrs: can't write to %s/arp: %r", conf.mpoint); - close(arpfd); + sys_close(arpfd); return -1; } memmove(sol, rs->src, IPaddrlen); - close(arpfd); + sys_close(arpfd); return 1; } @@ -869,7 +869,7 @@ sendra(int fd, uint8_t *dst, int rlt, Ipifc *ifc) pktsz += sizeof *llao; pkt2str(buf+40, buf+pktsz, abuf, abuf+1024); - if(write(fd, buf, pktsz) < pktsz) + if(jehanne_write(fd, buf, pktsz) < pktsz) ralog("sendra fail %s: %r", abuf); else if (debug) ralog("sendra succ %s", abuf); @@ -890,11 +890,11 @@ sendra6(void) if (fd < 0) sysfatal("can't open icmp_rs connection: %r"); - notify(catch); + sys_notify(catch); sendracnt = Maxv6initras; nquitmsgs = Maxv6finalras; - switch(rfork(RFPROC|RFMEM|RFFDG|RFNOWAIT|RFNOTEG)){ + switch(sys_rfork(RFPROC|RFMEM|RFFDG|RFNOWAIT|RFNOTEG)){ case -1: sysfatal("can't fork: %r"); default: @@ -910,9 +910,9 @@ sendra6(void) lastra = time(0); if (sleepfor < 0) sleepfor = 0; - alarm(sleepfor); - n = read(fd, buf, sizeof buf); - alarm(0); + sys_alarm(sleepfor); + n = jehanne_read(fd, buf, sizeof buf); + sys_alarm(0); ifc = readipifc(conf.mpoint, ifc, myifc); if (ifc == nil) { @@ -967,7 +967,7 @@ startra6(void) recvra6(); if (conf.sendra > 0) { - if (write(conf.cfd, routeon, sizeof routeon - 1) < 0) { + if (jehanne_write(conf.cfd, routeon, sizeof routeon - 1) < 0) { warning("write (iprouting 1) failed: %r"); return; } diff --git a/sys/src/cmd/ip/ipconfig/main.c b/sys/src/cmd/ip/ipconfig/main.c index b01dd78..b5ee3ed 100644 --- a/sys/src/cmd/ip/ipconfig/main.c +++ b/sys/src/cmd/ip/ipconfig/main.c @@ -377,11 +377,11 @@ finddev(char *dir, char *name, char *dev) int fd, i, nd; Dir *d; - fd = open(dir, OREAD); + fd = sys_open(dir, OREAD); if(fd >= 0){ d = nil; nd = dirreadall(fd, &d); - close(fd); + sys_close(fd); for(i=0; iindex); - cfd = open(file, ORDWR); + cfd = sys_open(file, ORDWR); if(cfd < 0){ warning("can't open %s: %r", conf.mpoint); continue; @@ -718,7 +718,7 @@ dounbind(void) if(strcmp(nifc->dev, conf.dev) == 0){ snprint(file, sizeof file, "%s/ipifc/%d/ctl", conf.mpoint, nifc->index); - cfd = open(file, ORDWR); + cfd = sys_open(file, ORDWR); if(cfd < 0){ warning("can't open %s: %r", conf.mpoint); break; @@ -738,7 +738,7 @@ adddefroute(char *mpoint, uint8_t *gaddr) int cfd; sprint(buf, "%s/iproute", mpoint); - cfd = open(buf, ORDWR); + cfd = sys_open(buf, ORDWR); if(cfd < 0) return; @@ -746,7 +746,7 @@ adddefroute(char *mpoint, uint8_t *gaddr) fprint(cfd, "add 0 0 %I", gaddr); else fprint(cfd, "add :: /0 %I", gaddr); - close(cfd); + sys_close(cfd); } /* create a client id */ @@ -793,16 +793,16 @@ controldevice(void) return; snprint(ctlfile, sizeof ctlfile, "%s/clone", conf.dev); - fd = open(ctlfile, ORDWR); + fd = sys_open(ctlfile, ORDWR); if(fd < 0) sysfatal("can't open %s", ctlfile); for(cp = firstctl; cp != nil; cp = cp->next){ - if(write(fd, cp->ctl, strlen(cp->ctl)) < 0) + if(jehanne_write(fd, cp->ctl, strlen(cp->ctl)) < 0) sysfatal("ctl message %s: %r", cp->ctl); - seek(fd, 0, 0); + sys_seek(fd, 0, 0); } -// close(fd); /* or does it need to be left hanging? */ +// sys_close(fd); /* or does it need to be left hanging? */ } /* bind an ip stack to a device, leave the control channel open */ @@ -816,7 +816,7 @@ binddevice(void) else if(myifc < 0){ /* get a new ip interface */ snprint(buf, sizeof buf, "%s/ipifc/clone", conf.mpoint); - conf.cfd = open(buf, ORDWR); + conf.cfd = sys_open(buf, ORDWR); if(conf.cfd < 0) sysfatal("opening %s/ipifc/clone: %r", conf.mpoint); @@ -826,7 +826,7 @@ binddevice(void) } else { /* open the old interface */ snprint(buf, sizeof buf, "%s/ipifc/%d/ctl", conf.mpoint, myifc); - conf.cfd = open(buf, ORDWR); + conf.cfd = sys_open(buf, ORDWR); if(conf.cfd < 0) sysfatal("open %s: %r", buf); } @@ -856,7 +856,7 @@ ip4cfg(void) n += snprint(buf+n, sizeof buf-n, " %d", conf.mtu); } - if(write(conf.cfd, buf, n) < 0){ + if(jehanne_write(conf.cfd, buf, n) < 0){ warning("write(%s): %r", buf); return -1; } @@ -884,7 +884,7 @@ ipunconfig(void) ipmove(conf.mask, defmask(conf.laddr)); n += snprint(buf+n, sizeof buf-n, " %I", conf.mask); - write(conf.cfd, buf, n); + jehanne_write(conf.cfd, buf, n); ipmove(conf.laddr, IPnoaddr); ipmove(conf.raddr, IPnoaddr); @@ -895,8 +895,8 @@ void ding(void* _, char *msg) { if(strstr(msg, "alarm")) - noted(NCONT); - noted(NDFLT); + sys_noted(NCONT); + sys_noted(NDFLT); } void @@ -910,7 +910,7 @@ dhcpquery(int needconfig, int startstate) conf.state = Sinit; return; } - notify(ding); + sys_notify(ding); conf.xid = lrand(); conf.starttime = time(0); @@ -933,7 +933,7 @@ dhcpquery(int needconfig, int startstate) dhcprecv(); dhcptimer(); } - close(conf.fd); + sys_close(conf.fd); if(needconfig) fprint(conf.cfd, "remove %I %I", IPnoaddr, IPnoaddr); @@ -956,7 +956,7 @@ dhcpwatch(int needconfig) if(nodhcpwatch) return; - switch(rfork(RFPROC|RFFDG|RFNOWAIT|RFNOTEG)){ + switch(sys_rfork(RFPROC|RFFDG|RFNOWAIT|RFNOTEG)){ default: return; case 0: @@ -1134,7 +1134,7 @@ dhcpsend(int type) * same size, so if the request is too short the reply * is truncated. */ - if(write(conf.fd, &bp, sizeof bp) != sizeof bp) + if(jehanne_write(conf.fd, &bp, sizeof bp) != sizeof bp) warning("dhcpsend: write failed: %r"); } @@ -1148,9 +1148,9 @@ dhcprecv(void) Bootp *bp; memset(buf, 0, sizeof buf); - alarm(1000); - n = read(conf.fd, buf, sizeof buf); - alarm(0); + sys_alarm(1000); + n = jehanne_read(conf.fd, buf, sizeof buf); + sys_alarm(0); if(n < 0){ rerrstr(err, sizeof err); @@ -1357,10 +1357,10 @@ openlisten(void) sysfatal("can't set header mode: %r"); sprint(data, "%s/data", devdir); - fd = open(data, ORDWR); + fd = sys_open(data, ORDWR); if(fd < 0) sysfatal("open %s: %r", data); - close(cfd); + sys_close(cfd); return fd; } @@ -1711,20 +1711,20 @@ putndb(void) ndbclose(db); } - if((fd = open(file, OWRITE|OTRUNC)) < 0) + if((fd = sys_open(file, OWRITE|OTRUNC)) < 0) return; - write(fd, buf, p-buf); - close(fd); + jehanne_write(fd, buf, p-buf); + sys_close(fd); snprint(file, sizeof file, "%s/cs", conf.mpoint); - if((fd = open(file, OWRITE)) >= 0){ - write(fd, "refresh", 7); - close(fd); + if((fd = sys_open(file, OWRITE)) >= 0){ + jehanne_write(fd, "refresh", 7); + sys_close(fd); } snprint(file, sizeof file, "%s/dns", conf.mpoint); - if((fd = open(file, OWRITE)) >= 0){ - write(fd, "refresh", 7); - close(fd); + if((fd = sys_open(file, OWRITE)) >= 0){ + jehanne_write(fd, "refresh", 7); + sys_close(fd); } } diff --git a/sys/src/cmd/ip/ipconfig/ppp.c b/sys/src/cmd/ip/ipconfig/ppp.c index d08ab54..b28a036 100644 --- a/sys/src/cmd/ip/ipconfig/ppp.c +++ b/sys/src/cmd/ip/ipconfig/ppp.c @@ -29,7 +29,7 @@ pppbinddev(void) Waitmsg *w; /* ppp does the binding */ - switch(pid = rfork(RFPROC|RFFDG|RFMEM)){ + switch(pid = sys_rfork(RFPROC|RFFDG|RFMEM)){ case -1: sysfatal("can't start ppp: %r"); case 0: @@ -45,8 +45,8 @@ pppbinddev(void) av[ac++] = conf.baud; } av[ac] = nil; - exec("/bin/ip/ppp", av); - exec("/ppp", av); + sys_exec("/bin/ip/ppp", av); + sys_exec("/ppp", av); sysfatal("execing /ppp: %r"); } diff --git a/sys/src/cmd/ip/listen.c b/sys/src/cmd/ip/listen.c index 18c2bbf..176336e 100644 --- a/sys/src/cmd/ip/listen.c +++ b/sys/src/cmd/ip/listen.c @@ -77,9 +77,9 @@ procsetname(char *fmt, ...) if (cmdname == nil) return; snprint(buf, sizeof buf, "#p/%d/args", getpid()); - if((fd = open(buf, OWRITE)) >= 0){ - write(fd, cmdname, strlen(cmdname)+1); - close(fd); + if((fd = sys_open(buf, OWRITE)) >= 0){ + jehanne_write(fd, cmdname, strlen(cmdname)+1); + sys_close(fd); } free(cmdname); } @@ -163,8 +163,8 @@ static void dingdong(void *v, char *msg) { if(strstr(msg, "alarm") != nil) - noted(NCONT); - noted(NDFLT); + sys_noted(NCONT); + sys_noted(NDFLT); } void @@ -183,7 +183,7 @@ listendir(char *protodir, char *srvdir, int trusted) * changing of console environment variables * erase privileged crypt state */ - switch(rfork(RFNOTEG|RFPROC|RFFDG|RFNOWAIT|RFENVG|RFNAMEG)) { + switch(sys_rfork(RFNOTEG|RFPROC|RFFDG|RFNOWAIT|RFENVG|RFNAMEG)) { case -1: error("fork"); case 0: @@ -196,7 +196,7 @@ listendir(char *protodir, char *srvdir, int trusted) if (!trusted) becomenone(); - notify(dingdong); + sys_notify(dingdong); pid = getpid(); scandir(proto, protodir, srvdir); @@ -212,7 +212,7 @@ listendir(char *protodir, char *srvdir, int trusted) sleep((pid*10)%200); /* a process per service */ - switch(pid = rfork(RFFDG|RFPROC)){ + switch(pid = sys_rfork(RFFDG|RFPROC)){ case -1: syslog(1, listenlog, "couldn't fork for %s", a->a); break; @@ -220,7 +220,7 @@ listendir(char *protodir, char *srvdir, int trusted) for(;;){ ctl = announce(a->a, dir); if(ctl < 0) { - errstr(err, sizeof err); + sys_errstr(err, sizeof err); if (!a->whined) syslog(1, listenlog, "giving up on %s: %r", @@ -232,7 +232,7 @@ listendir(char *protodir, char *srvdir, int trusted) exits("ctl"); } dolisten(proto, dir, ctl, srvdir, a->a); - close(ctl); + sys_close(ctl); } default: a->announced = pid; @@ -253,7 +253,7 @@ listendir(char *protodir, char *srvdir, int trusted) */ start = time(0); if(!immutable) - alarm(60*1000); + sys_alarm(60*1000); while((wm = wait()) != nil) { for(a = announcements; a; a = a->next) if(a->announced == wm->pid) { @@ -268,7 +268,7 @@ listendir(char *protodir, char *srvdir, int trusted) break; } if(!immutable){ - alarm(0); + sys_alarm(0); scandir(proto, protodir, srvdir); } start = 60 - (time(0)-start); @@ -349,7 +349,7 @@ scandir(char *proto, char *protodir, char *dname) char ds[128]; Dir *db; - fd = open(dname, OREAD); + fd = sys_open(dname, OREAD); if(fd < 0) return; @@ -370,7 +370,7 @@ scandir(char *proto, char *protodir, char *dname) free(db); } - close(fd); + sys_close(fd); } void @@ -378,10 +378,10 @@ becomenone(void) { int fd; - fd = open("#c/user", OWRITE); - if(fd < 0 || write(fd, "none", strlen("none")) < 0) + fd = sys_open("#c/user", OWRITE); + if(fd < 0 || jehanne_write(fd, "none", strlen("none")) < 0) error("can't become none"); - close(fd); + sys_close(fd); if(newns("none", namespace) < 0) error("can't build namespace"); } @@ -409,10 +409,10 @@ dolisten(char *proto, char *dir, int ctl, char *srvdir, /* * start a subprocess for the connection */ - switch(rfork(RFFDG|RFPROC|RFNOWAIT|RFENVG|RFNAMEG|RFNOTEG)){ + switch(sys_rfork(RFFDG|RFPROC|RFNOWAIT|RFENVG|RFNAMEG|RFNOTEG)){ case -1: reject(nctl, ndir, "host overloaded"); - close(nctl); + sys_close(nctl); continue; case 0: /* @@ -432,12 +432,12 @@ dolisten(char *proto, char *dir, int ctl, char *srvdir, exits(0); } fprint(nctl, "keepalive"); - close(ctl); - close(nctl); + sys_close(ctl); + sys_close(nctl); newcall(data, proto, ndir, &s); exits(0); default: - close(nctl); + sys_close(nctl); break; } } @@ -505,11 +505,11 @@ remoteaddr(char *dir) int n, fd; snprint(buf, sizeof buf, "%s/remote", dir); - fd = open(buf, OREAD); + fd = sys_open(buf, OREAD); if(fd < 0) return strdup(""); - n = read(fd, buf, sizeof(buf)); - close(fd); + n = jehanne_read(fd, buf, sizeof(buf)); + sys_close(fd); if(n > 0){ buf[n] = 0; p = strchr(buf, '!'); @@ -538,17 +538,17 @@ newcall(int fd, char *proto, char *dir, Service *s) } snprint(data, sizeof data, "%s/data", dir); - bind(data, "/dev/cons", MREPL); + sys_bind(data, "/dev/cons", MREPL); dup(fd, 0); dup(fd, 1); dup(fd, 2); - close(fd); + sys_close(fd); /* * close all the fds */ for(fd=3; fd<20; fd++) - close(fd); + sys_close(fd); execl(s->prog, s->prog, s->serv, proto, dir, nil); error(s->prog); } @@ -570,17 +570,17 @@ readstr(char *dir, char *info, char *s, int len) char buf[3*NAMELEN+4]; snprint(buf, sizeof buf, "%s/%s", dir, info); - fd = open(buf, OREAD); + fd = sys_open(buf, OREAD); if(fd<0) return 0; - n = read(fd, s, len-1); + n = jehanne_read(fd, s, len-1); if(n<=0){ - close(fd); + sys_close(fd); return -1; } s[n] = 0; - close(fd); + sys_close(fd); return n+1; } diff --git a/sys/src/cmd/ip/listen1.c b/sys/src/cmd/ip/listen1.c index a35d48b..48ea14a 100644 --- a/sys/src/cmd/ip/listen1.c +++ b/sys/src/cmd/ip/listen1.c @@ -27,10 +27,10 @@ becomenone(void) { int fd; - fd = open("#c/user", OWRITE); - if(fd < 0 || write(fd, "none", strlen("none")) < 0) + fd = sys_open("#c/user", OWRITE); + if(fd < 0 || jehanne_write(fd, "none", strlen("none")) < 0) sysfatal("can't become none: %r"); - close(fd); + sys_close(fd); if(newns("none", nil) < 0) sysfatal("can't build namespace: %r"); } @@ -43,11 +43,11 @@ remoteaddr(char *dir) int n, fd; snprint(buf, sizeof buf, "%s/remote", dir); - fd = open(buf, OREAD); + fd = sys_open(buf, OREAD); if(fd < 0) return ""; - n = read(fd, buf, sizeof(buf)); - close(fd); + n = jehanne_read(fd, buf, sizeof(buf)); + sys_close(fd); if(n > 0){ buf[n] = 0; p = strchr(buf, '!'); @@ -79,11 +79,11 @@ main(int argc, char **argv) usage(); if(!verbose){ - close(1); - fd = open("/dev/null", OWRITE); + sys_close(1); + fd = sys_open("/dev/null", OWRITE); if(fd != 1){ dup(fd, 1); - close(fd); + sys_close(fd); } } @@ -100,37 +100,37 @@ main(int argc, char **argv) if(nctl < 0) sysfatal("listen %s: %r", argv[0]); - switch(rfork(RFFDG|RFPROC|RFNOWAIT|RFENVG|RFNAMEG|RFNOTEG)){ + switch(sys_rfork(RFFDG|RFPROC|RFNOWAIT|RFENVG|RFNAMEG|RFNOTEG)){ case -1: reject(nctl, ndir, "host overloaded"); - close(nctl); + sys_close(nctl); continue; case 0: fd = accept(nctl, ndir); if(fd < 0){ fprint(2, "accept %s: can't open %s/data: %r\n", argv[0], ndir); - _exits(0); + sys__exits(0); } print("incoming call for %s from %s in %s\n", argv[0], remoteaddr(ndir), ndir); fprint(nctl, "keepalive"); - close(ctl); - close(nctl); + sys_close(ctl); + sys_close(nctl); putenv("net", ndir); snprint(data, sizeof data, "%s/data", ndir); - bind(data, "/dev/cons", MREPL); + sys_bind(data, "/dev/cons", MREPL); dup(fd, 0); dup(fd, 1); dup(fd, 2); - close(fd); - exec(argv[1], argv+1); + sys_close(fd); + sys_exec(argv[1], argv+1); if(argv[1][0] != '/') - exec(smprint("/cmd/%s", argv[1]), argv+1); + sys_exec(smprint("/cmd/%s", argv[1]), argv+1); fprint(2, "%s: exec: %r\n", argv0); exits(nil); default: - close(nctl); + sys_close(nctl); break; } } diff --git a/sys/src/cmd/ip/ping.c b/sys/src/cmd/ip/ping.c index 19934d8..df81bef 100644 --- a/sys/src/cmd/ip/ping.c +++ b/sys/src/cmd/ip/ping.c @@ -87,11 +87,11 @@ catch(void *a, char *msg) { USED(a); if(strstr(msg, "alarm")) - noted(NCONT); + sys_noted(NCONT); else if(strstr(msg, "die")) exits("errors"); else - noted(NDFLT); + sys_noted(NDFLT); } static void @@ -299,7 +299,7 @@ sender(int fd, int msglen, int interval, int n) last = r; jehanne_unlock(&listlock); r->time = nsec(); - if(write(fd, buf, msglen) < msglen){ + if(jehanne_write(fd, buf, msglen) < msglen){ fprint(2, "%s: write failed: %r\n", argv0); return; } @@ -320,9 +320,9 @@ rcvr(int fd, int msglen, int interval, int nmsg) sum = 0; while(lostmsgs+rcvdmsgs < nmsg){ - alarm((nmsg-lostmsgs-rcvdmsgs)*interval+waittime); - n = read(fd, buf, sizeof buf); - alarm(0); + sys_alarm((nmsg-lostmsgs-rcvdmsgs)*interval+waittime); + n = jehanne_read(fd, buf, sizeof buf); + sys_alarm(0); now = nsec(); if(n <= 0){ /* read interrupted - time to go */ clean(0, now+MINUTE, nil); @@ -565,7 +565,7 @@ main(int argc, char **argv) if(argc < 1) usage(); - notify(catch); + sys_notify(catch); if (!isv4name(argv[0])) proto = &v6pr; @@ -580,7 +580,7 @@ main(int argc, char **argv) print("sending %d %d byte messages %d ms apart to %s\n", nmsg, msglen, interval, ds); - switch(rfork(RFPROC|RFMEM|RFFDG)){ + switch(sys_rfork(RFPROC|RFMEM|RFFDG)){ case -1: fprint(2, "%s: can't fork: %r\n", argv0); /* fallthrough */ diff --git a/sys/src/cmd/ip/rip.c b/sys/src/cmd/ip/rip.c index 563661b..2d08224 100644 --- a/sys/src/cmd/ip/rip.c +++ b/sys/src/cmd/ip/rip.c @@ -144,7 +144,7 @@ fatal(int syserr, char *fmt, ...) vseprint(buf, buf+sizeof(buf), fmt, arg); va_end(arg); if(syserr) { - errstr(sysbuf, sizeof sysbuf); + sys_errstr(sysbuf, sizeof sysbuf); fprint(2, "routed: %s: %s\n", buf, sysbuf); } else @@ -196,8 +196,8 @@ ding(void *u, char *msg) USED(u); if(strstr(msg, "alarm")) - noted(NCONT); - noted(NDFLT); + sys_noted(NCONT); + sys_noted(NDFLT); } void @@ -260,7 +260,7 @@ main(int argc, char *argv[]) /* command returns */ if(!debug) - switch(rfork(RFNOTEG|RFPROC|RFFDG|RFNOWAIT)) { + switch(sys_rfork(RFNOTEG|RFPROC|RFFDG|RFNOWAIT)) { case -1: fatal(1, "fork"); case 0: @@ -280,7 +280,7 @@ main(int argc, char *argv[]) readifcs(); readroutes(); - notify(ding); + sys_notify(ding); ripfd = openport(); for(;;) { @@ -293,9 +293,9 @@ main(int argc, char *argv[]) btime = time(0) + 2*60; diff = 2*60; } - alarm(diff*1000); - n = read(ripfd, buf, sizeof(buf)); - alarm(0); + sys_alarm(diff*1000); + n = jehanne_read(ripfd, buf, sizeof(buf)); + sys_alarm(0); if(n <= 0) continue; @@ -342,7 +342,7 @@ openport(void) fatal(1, "can't set header mode"); sprint(data, "%s/data", devdir); - rip = open(data, ORDWR); + rip = sys_open(data, ORDWR); if(rip < 0) fatal(1, "open udp data"); return rip; @@ -500,7 +500,7 @@ removeroute(Route *r) { int fd; - fd = open(routefile, ORDWR); + fd = sys_open(routefile, ORDWR); if(fd < 0){ fprint(2, "can't open oproute\n"); return; @@ -509,7 +509,7 @@ removeroute(Route *r) fprint(fd, "delete %V", r->dest); if(debug) fprint(2, "removeroute %V\n", r->dest); - close(fd); + sys_close(fd); } /* @@ -530,7 +530,7 @@ installroute(Route *r) if(equivip(r->gate, ralloc.def.dest)) return; - fd = open(routefile, ORDWR); + fd = sys_open(routefile, ORDWR); if(fd < 0){ fprint(2, "can't open oproute\n"); return; @@ -558,7 +558,7 @@ installroute(Route *r) fprint(fd, "delete %V", r->dest); if(debug) fprint(2, "delete %V\n", r->dest); - close(fd); + sys_close(fd); return; } } @@ -566,7 +566,7 @@ installroute(Route *r) fprint(fd, "add %V %V %V", r->dest, r->mask, r->gate); if(debug) fprint(2, "add %V & %V -> %V\n", r->dest, r->mask, r->gate); - close(fd); + sys_close(fd); } /* @@ -670,14 +670,14 @@ sendto(Ifc *ip) r->dest, r->mask, r->gate, r->metric); if(++n == Maxroutes && !readonly){ - write(ripfd, mbuf, Udphdrsize + 4 + n*20); + jehanne_write(ripfd, mbuf, Udphdrsize + 4 + n*20); n = 0; } } } if(n && !readonly) - write(ripfd, mbuf, Udphdrsize+4+n*20); + jehanne_write(ripfd, mbuf, Udphdrsize+4+n*20); } void broadcast(void) diff --git a/sys/src/cmd/ip/timesync.c b/sys/src/cmd/ip/timesync.c index 5b4b669..b99075c 100644 --- a/sys/src/cmd/ip/timesync.c +++ b/sys/src/cmd/ip/timesync.c @@ -269,7 +269,7 @@ main(int argc, char **argv) /* detach from the current namespace */ if(debug) - rfork(RFNAMEG); + sys_rfork(RFNAMEG); switch(type){ case Utc: @@ -316,26 +316,26 @@ main(int argc, char **argv) */ switch(type){ case Fs: - fd = open(timeserver, ORDWR); + fd = sys_open(timeserver, ORDWR); if(fd < 0) sysfatal("opening %s: %r", timeserver); if(amount(fd, "/n/boot", MREPL, "") < 0) sysfatal("mounting %s: %r", timeserver); - close(fd); + sys_close(fd); break; case Rtc: - bind("#r", "/dev", MAFTER); + sys_bind("#r", "/dev", MAFTER); if(access("/dev/rtc", AREAD) < 0) sysfatal("accessing /dev/rtc: %r"); break; case Utc: - fd = open(timeserver, OREAD); + fd = sys_open(timeserver, OREAD); if(fd < 0) sysfatal("opening %s: %r", timeserver); utcfil = fd; break; case Gps: - fd = open(timeserver, OREAD); + fd = sys_open(timeserver, OREAD); if(fd < 0) sysfatal("opening %s: %r", timeserver); gpsfil = fd; @@ -346,12 +346,12 @@ main(int argc, char **argv) * start a local ntp server(s) */ for(i = 0; i < nservenet; i++) - switch(rfork(RFPROC|RFFDG|RFMEM|RFNOWAIT)){ + switch(sys_rfork(RFPROC|RFFDG|RFMEM|RFNOWAIT)){ case -1: sysfatal("forking: %r"); case 0: ntpserver(servenet[i]); - _exits(0); + sys__exits(0); } /* get the last known frequency from the file */ @@ -623,23 +623,23 @@ inittime(void) /* bind in clocks */ if(access("/dev/time", AEXIST) < 0) - bind("#c", "/dev", MAFTER); + sys_bind("#c", "/dev", MAFTER); if(access("/dev/rtc", AEXIST) < 0) - bind("#r", "/dev", MAFTER); + sys_bind("#r", "/dev", MAFTER); /* figure out what interface we have */ ifc = Ibintime; - bintimefd = open("/dev/bintime", mode); + bintimefd = sys_open("/dev/bintime", mode); if(bintimefd >= 0) return; ifc = Insec; - nsecfd = open("/dev/nsec", mode); + nsecfd = sys_open("/dev/nsec", mode); if(nsecfd < 0) sysfatal("opening /dev/nsec"); - fastclockfd = open("/dev/fastclock", mode); + fastclockfd = sys_open("/dev/fastclock", mode); if(fastclockfd < 0) sysfatal("opening /dev/fastclock"); - timingfd = open("/dev/timing", OREAD); + timingfd = sys_open("/dev/timing", OREAD); if(timingfd < 0) return; ifc = Itiming; @@ -721,7 +721,7 @@ gettime(int64_t *nsec, uint64_t *ticks, uint64_t *hz) n = 3*sizeof(int64_t); if(ticks != nil) n = 2*sizeof(int64_t); - i = read(bintimefd, ub, n); + i = jehanne_read(bintimefd, ub, n); if(i != n) break; p = ub; @@ -738,7 +738,7 @@ gettime(int64_t *nsec, uint64_t *ticks, uint64_t *hz) n = sizeof(int64_t); if(ticks != nil) n = 2*sizeof(int64_t); - i = read(timingfd, ub, n); + i = jehanne_read(timingfd, ub, n); if(i != n) break; p = ub; @@ -748,8 +748,8 @@ gettime(int64_t *nsec, uint64_t *ticks, uint64_t *hz) if(ticks != nil) be2vlong((int64_t*)ticks, p); if(hz != nil){ - seek(fastclockfd, 0, 0); - n = read(fastclockfd, b, sizeof(b)-1); + sys_seek(fastclockfd, 0, 0); + n = jehanne_read(fastclockfd, b, sizeof(b)-1); if(n <= 0) break; b[n] = 0; @@ -758,24 +758,24 @@ gettime(int64_t *nsec, uint64_t *ticks, uint64_t *hz) return 0; case Insec: if(nsec != nil){ - seek(nsecfd, 0, 0); - n = read(nsecfd, b, sizeof(b)-1); + sys_seek(nsecfd, 0, 0); + n = jehanne_read(nsecfd, b, sizeof(b)-1); if(n <= 0) break; b[n] = 0; *nsec = strtoll(b, 0, 0); } if(ticks != nil){ - seek(fastclockfd, 0, 0); - n = read(fastclockfd, b, sizeof(b)-1); + sys_seek(fastclockfd, 0, 0); + n = jehanne_read(fastclockfd, b, sizeof(b)-1); if(n <= 0) break; b[n] = 0; *ticks = strtoll(b, 0, 0); } if(hz != nil){ - seek(fastclockfd, 0, 0); - n = read(fastclockfd, b, sizeof(b)-1); + sys_seek(fastclockfd, 0, 0); + n = jehanne_read(fastclockfd, b, sizeof(b)-1); if(n <= 24) break; b[n] = 0; @@ -802,7 +802,7 @@ settime(int64_t now, uint64_t hz, int64_t delta, int n) p = b; *p++ = 'n'; p = vlong2be(p, now); - if(write(bintimefd, b, p-b) < 0) + if(jehanne_write(bintimefd, b, p-b) < 0) sysfatal("writing /dev/bintime: %r"); } if(delta != 0){ @@ -810,26 +810,26 @@ settime(int64_t now, uint64_t hz, int64_t delta, int n) *p++ = 'd'; p = vlong2be(p, delta); p = long2be(p, n); - if(write(bintimefd, b, p-b) < 0) + if(jehanne_write(bintimefd, b, p-b) < 0) sysfatal("writing /dev/bintime: %r"); } if(hz != 0){ p = b; *p++ = 'f'; p = vlong2be(p, hz); - if(write(bintimefd, b, p-b) < 0) + if(jehanne_write(bintimefd, b, p-b) < 0) sysfatal("writing /dev/bintime: %r"); } break; case Itiming: case Insec: - seek(nsecfd, 0, 0); + sys_seek(nsecfd, 0, 0); if(now >= 0 || delta != 0){ if(fprint(nsecfd, "%lld %lld %d", now, delta, n) < 0) sysfatal("writing /dev/nsec: %r"); } if(hz > 0){ - seek(fastclockfd, 0, 0); + sys_seek(fastclockfd, 0, 0); if(fprint(fastclockfd, "%lld", hz) < 0) sysfatal("writing /dev/fastclock: %r"); } @@ -846,7 +846,7 @@ setpriority(void) char buf[32]; sprint(buf, "/proc/%d/ctl", getpid()); - fd = open(buf, ORDWR); + fd = sys_open(buf, ORDWR); if(fd < 0){ fprint(2, "can't set priority\n"); return; @@ -855,7 +855,7 @@ setpriority(void) fprint(2, "can't set priority\n"); if(fprint(fd, "wired 2") < 0) fprint(2, "can't wire process\n"); - close(fd); + sys_close(fd); } /* convert to ntp timestamps */ @@ -931,11 +931,11 @@ setrootid(char *d) char *p; snprint(buf, sizeof buf, "%s/remote", d); - fd = open(buf, OREAD); + fd = sys_open(buf, OREAD); if(fd < 0) return; - n = read(fd, buf, sizeof buf); - close(fd); + n = jehanne_read(fd, buf, sizeof buf); + sys_close(fd); if(n <= 0) return; p = strchr(buf, '!'); @@ -948,8 +948,8 @@ static void ding(void* _, char *s) { if(strstr(s, "alarm") != nil) - noted(NCONT); - noted(NDFLT); + sys_noted(NCONT); + sys_noted(NDFLT); } static void @@ -980,8 +980,8 @@ ntptimediff(NTPserver *ns) char dir[64]; static int whined; - notify(ding); - alarm(30*1000); /* don't wait forever if ns->name is unreachable */ + sys_notify(ding); + sys_alarm(30*1000); /* don't wait forever if ns->name is unreachable */ fd = dial(netmkaddr(ns->name, "udp", "ntp"), 0, dir, 0); if(fd < 0){ if (!whined++) @@ -994,20 +994,20 @@ ntptimediff(NTPserver *ns) ntpout.mode = 3 | (3 << 3); for(tries = 0; tries < 3; tries++){ - alarm(2*1000); + sys_alarm(2*1000); gettime(&x, 0, 0); hnputts(ntpout.xmitts, x); - if(write(fd, &ntpout, NTPSIZE) < 0){ - alarm(0); + if(jehanne_write(fd, &ntpout, NTPSIZE) < 0){ + sys_alarm(0); continue; } - n = read(fd, &ntpin, sizeof ntpin); - alarm(0); + n = jehanne_read(fd, &ntpin, sizeof ntpin); + sys_alarm(0); gettime(&destts, 0, 0); if(n >= NTPSIZE){ - close(fd); + sys_close(fd); /* we got one, use it */ recvts = nhgetts(ntpin.recvts); @@ -1032,7 +1032,7 @@ ntptimediff(NTPserver *ns) /* try again */ sleep(250); } - close(fd); + sys_close(fd); return -1; } @@ -1046,8 +1046,8 @@ gpssample(void) d = -1000000000000000000LL; for(i = 0; i < 5; i++){ sleep(1100); - seek(gpsfil, 0, 0); - n = read(gpsfil, buf, sizeof buf - 1); + sys_seek(gpsfil, 0, 0); + n = jehanne_read(gpsfil, buf, sizeof buf - 1); if (n <= 0) return 0; buf[n] = 0; @@ -1111,8 +1111,8 @@ utcsample(void) char *v[2], buf[128]; s = 0; - seek(utcfil, 0, 0); - n = read(utcfil, buf, sizeof buf - 1); + sys_seek(utcfil, 0, 0); + n = jehanne_read(utcfil, buf, sizeof buf - 1); if (n <= 0) return 0; buf[n] = 0; @@ -1144,7 +1144,7 @@ openlisten(char *net) sysfatal("can't set header mode"); sprint(data, "%s/data", devdir); - fd = open(data, ORDWR); + fd = sys_open(data, ORDWR); if(fd < 0) sysfatal("open %s: %r", data); return fd; @@ -1182,7 +1182,7 @@ ntpserver(char *servenet) memmove(rootid, Rootid, strlen(Rootid) > 4? 4: strlen(Rootid)); for(;;){ - n = read(fd, buf, sizeof buf); + n = jehanne_read(fd, buf, sizeof buf); gettime(&recvts, 0, 0); if(n <= 0) { /* don't croak on input error, but don't spin either */ @@ -1209,7 +1209,7 @@ ntpserver(char *servenet) memmove(ntp->rootid, rootid, sizeof(ntp->rootid)); gettime(&x, 0, 0); hnputts(ntp->xmitts, x); - write(fd, buf, NTPSIZE + Udphdrsize); + jehanne_write(fd, buf, NTPSIZE + Udphdrsize); } } @@ -1244,11 +1244,11 @@ rtctime(void) memset(b, 0, sizeof(b)); for(retries = 0; retries < 100; retries++){ if(f < 0) - f = open("/dev/rtc", OREAD|OCEXEC); + f = sys_open("/dev/rtc", OREAD|OCEXEC); if(f < 0) break; - if(seek(f, 0, 0) < 0 || (i = read(f, b, sizeof b)) < 0){ - close(f); + if(sys_seek(f, 0, 0) < 0 || (i = jehanne_read(f, b, sizeof b)) < 0){ + sys_close(f); f = -1; } else if(i != 0) @@ -1263,11 +1263,11 @@ setrtctime(int32_t t) static int f = -1; if(f < 0) - f = open("/dev/rtc", OWRITE|OCEXEC); + f = sys_open("/dev/rtc", OWRITE|OCEXEC); if(f < 0) return; - if(seek(f, 0, 0) < 0 || fprint(f, "%ld", t-gmtdelta) < 0){ - close(f); + if(sys_seek(f, 0, 0) < 0 || fprint(f, "%ld", t-gmtdelta) < 0){ + sys_close(f); f = -1; } } @@ -1320,7 +1320,7 @@ openfreqfile(void) p = smprint("%s/ts.%s.%d", dir, sysid, type); break; } - fd = open(p, ORDWR); + fd = sys_open(p, ORDWR); if(fd < 0) fd = ocreate(p, ORDWR, 0666); free(p); @@ -1340,7 +1340,7 @@ readfreqfile(int fd, int64_t ohz, int64_t minhz, int64_t maxhz) char buf[128]; int64_t hz; - n = read(fd, buf, sizeof buf-1); + n = jehanne_read(fd, buf, sizeof buf-1); if(n <= 0) return ohz; buf[n] = 0; @@ -1368,7 +1368,7 @@ writefreqfile(int fd, int64_t hz, int secs, int64_t diff) if(now - last < 10*60) return; last = now; - if(seek(fd, 0, 0) < 0) + if(sys_seek(fd, 0, 0) < 0) return; fprint(fd, "%lld %d %d %lld\n", hz, secs, type, diff); } @@ -1391,7 +1391,7 @@ background(void) return; if(!debug) - switch(rfork(RFPROC|RFFDG|RFNAMEG|RFNOTEG|RFNOWAIT)){ + switch(sys_rfork(RFPROC|RFFDG|RFNAMEG|RFNOTEG|RFNOWAIT)){ case -1: sysfatal("forking: %r"); break; diff --git a/sys/src/cmd/ip/traceroute.c b/sys/src/cmd/ip/traceroute.c index 0b809a3..36713b3 100644 --- a/sys/src/cmd/ip/traceroute.c +++ b/sys/src/cmd/ip/traceroute.c @@ -54,7 +54,7 @@ csquery(DS *ds, char *clone, char *dest) * open connection server */ snprint(buf, sizeof(buf), "%s/cs", ds->netdir); - fd = open(buf, ORDWR); + fd = sys_open(buf, ORDWR); if(fd < 0){ if(!isdigit(*dest)){ werrstr("can't translate"); @@ -71,17 +71,17 @@ csquery(DS *ds, char *clone, char *dest) * ask connection server to translate */ sprint(buf, "%s!%s", ds->proto, ds->rem); - if(write(fd, buf, strlen(buf)) < 0){ - close(fd); + if(jehanne_write(fd, buf, strlen(buf)) < 0){ + sys_close(fd); return -1; } /* * get an address. */ - seek(fd, 0, 0); - n = read(fd, buf, sizeof(buf) - 1); - close(fd); + sys_seek(fd, 0, 0); + n = jehanne_read(fd, buf, sizeof(buf) - 1); + sys_close(fd); if(n <= 0){ werrstr("problem with cs"); return -1; @@ -136,9 +136,9 @@ tcpilprobe(int cfd, int dfd, char *dest, int interval) USED(dfd); n = snprint(msg, sizeof msg, "connect %s", dest); - alarm(interval); - n = write(cfd, msg, n); - alarm(0); + sys_alarm(interval); + n = jehanne_write(cfd, msg, n); + sys_alarm(0); return n; } @@ -153,15 +153,15 @@ udpprobe(int cfd, int dfd, char *dest, int interval) char msg[Maxstring]; char err[Maxstring]; - seek(cfd, 0, 0); + sys_seek(cfd, 0, 0); n = snprint(msg, sizeof msg, "connect %s", dest); - if(write(cfd, msg, n)< 0) + if(jehanne_write(cfd, msg, n)< 0) return -1; rv = -1; for(i = 0; i < 3; i++){ - alarm(interval/3); - if(write(dfd, "boo hoo ", 8) < 0) + sys_alarm(interval/3); + if(jehanne_write(dfd, "boo hoo ", 8) < 0) break; /* * a hangup due to an error looks like 3 eofs followed @@ -169,21 +169,21 @@ udpprobe(int cfd, int dfd, char *dest, int interval) * done for pipes. */ do { - n = read(dfd, msg, sizeof(msg)-1); + n = jehanne_read(dfd, msg, sizeof(msg)-1); } while(n == 0); - alarm(0); + sys_alarm(0); if(n > 0){ rv = 0; break; } - errstr(err, sizeof err); + sys_errstr(err, sizeof err); if(strstr(err, "alarm") == 0){ werrstr(err); break; } werrstr(err); } - alarm(0); + sys_alarm(0); return rv; } @@ -198,15 +198,15 @@ icmpprobe(int cfd, int dfd, char *dest, int interval) char buf[512], err[Maxstring], msg[Maxstring]; Icmphdr *ip; - seek(cfd, 0, 0); + sys_seek(cfd, 0, 0); n = snprint(msg, sizeof msg, "connect %s", dest); - if(write(cfd, msg, n)< 0) + if(jehanne_write(cfd, msg, n)< 0) return -1; rv = -1; ip = (Icmphdr *)(buf + IPV4HDR_LEN); for(i = 0; i < 3; i++){ - alarm(interval/3); + sys_alarm(interval/3); ip->type = EchoRequest; ip->code = 0; strcpy((char*)ip->data, MSG); @@ -215,14 +215,14 @@ icmpprobe(int cfd, int dfd, char *dest, int interval) len = IPV4HDR_LEN + ICMP_HDRSIZE + sizeof(MSG); /* send a request */ - if(write(dfd, buf, len) < len) + if(jehanne_write(dfd, buf, len) < len) break; /* wait for reply */ - n = read(dfd, buf, sizeof(buf)); - alarm(0); + n = jehanne_read(dfd, buf, sizeof(buf)); + sys_alarm(0); if(n < 0){ - errstr(err, sizeof err); + sys_errstr(err, sizeof err); if(strstr(err, "alarm") == 0){ werrstr(err); break; @@ -237,7 +237,7 @@ icmpprobe(int cfd, int dfd, char *dest, int interval) break; } } - alarm(0); + sys_alarm(0); return rv; } @@ -246,9 +246,9 @@ catch(void *a, char *msg) { USED(a); if(strstr(msg, "alarm")) - noted(NCONT); + sys_noted(NCONT); else - noted(NDFLT); + sys_noted(NDFLT); } static int @@ -259,13 +259,13 @@ call(DS *ds, char *clone, char *dest, int ttl, int32_t *interval) char file[Maxstring]; int64_t start; - notify(catch); + sys_notify(catch); /* start timing */ start = nsec()/1000; rv = -1; - cfd = open(clone, ORDWR); + cfd = sys_open(clone, ORDWR); if(cfd < 0){ werrstr("%s: %r", clone); return -1; @@ -273,14 +273,14 @@ call(DS *ds, char *clone, char *dest, int ttl, int32_t *interval) dfd = -1; /* get conversation number */ - n = read(cfd, msg, sizeof(msg)-1); + n = jehanne_read(cfd, msg, sizeof(msg)-1); if(n <= 0) goto out; msg[n] = 0; /* open data file */ sprint(file, "%s/%s/%s/data", ds->netdir, ds->proto, msg); - dfd = open(file, ORDWR); + dfd = sys_open(file, ORDWR); if(dfd < 0) goto out; @@ -297,10 +297,10 @@ call(DS *ds, char *clone, char *dest, int ttl, int32_t *interval) rv = tcpilprobe(cfd, dfd, dest, 3000); out: /* turn off alarms */ - alarm(0); + sys_alarm(0); *interval = nsec()/1000 - start; - close(cfd); - close(dfd); + sys_close(cfd); + sys_close(dfd); return rv; } @@ -406,7 +406,7 @@ main(int argc, char **argv) done = 1; continue; } - errstr(err, sizeof err); + sys_errstr(err, sizeof err); if(strstr(err, "refused")){ strcpy(hop, dest); p = strchr(hop, '!'); diff --git a/sys/src/cmd/ip/trampoline.c b/sys/src/cmd/ip/trampoline.c index 0abcfe3..7b4fb77 100644 --- a/sys/src/cmd/ip/trampoline.c +++ b/sys/src/cmd/ip/trampoline.c @@ -92,7 +92,7 @@ main(int argc, char **argv) if(fd < 0) sysfatal("dial %s: %r", argv[0]); - rfork(RFNOTEG); + sys_rfork(RFNOTEG); switch(fork()){ case -1: fprint(2, "%s: fork: %r\n", argv0); @@ -114,8 +114,8 @@ xfer(int from, int to) char buf[12*1024]; int n; - while((n = read(from, buf, sizeof buf)) > 0) - if(write(to, buf, n) < 0) + while((n = jehanne_read(from, buf, sizeof buf)) > 0) + if(jehanne_write(to, buf, n) < 0) break; } @@ -143,7 +143,7 @@ xfer9p(int from, int to) } if(readn(from, buf+4, n-4) != n-4) break; - if(write(to, buf, n) != n){ + if(jehanne_write(to, buf, n) != n){ sysfatal("oops: %r"); break; } @@ -160,9 +160,9 @@ getendpoint(char *dir, char *file, char **sysp, char **servp) sys = serv = 0; snprint(buf, sizeof buf, "%s/%s", dir, file); - fd = open(buf, OREAD); + fd = sys_open(buf, OREAD); if(fd >= 0){ - n = read(fd, buf, sizeof(buf)-1); + n = jehanne_read(fd, buf, sizeof(buf)-1); if(n>0){ buf[n-1] = 0; serv = strchr(buf, '!'); @@ -172,7 +172,7 @@ getendpoint(char *dir, char *file, char **sysp, char **servp) } sys = strdup(buf); } - close(fd); + sys_close(fd); } if(serv == 0) serv = strdup("unknown"); diff --git a/sys/src/cmd/lock.c b/sys/src/cmd/lock.c index 1eeec1b..fd20624 100644 --- a/sys/src/cmd/lock.c +++ b/sys/src/cmd/lock.c @@ -37,7 +37,7 @@ waitfor(int pid) for (;;) { w = jehanne_wait(); if (w == nil){ - errstr(err, sizeof err); + sys_errstr(err, sizeof err); if(jehanne_strcmp(err, "interrupted") == 0) continue; return nil; @@ -66,10 +66,10 @@ openlock(char *lock) jehanne_free(dir); if (lockwait) - while ((lckfd = open(lock, ORDWR)) < 0) + while ((lckfd = sys_open(lock, ORDWR)) < 0) jehanne_sleep(1000); else - lckfd = open(lock, ORDWR); + lckfd = sys_open(lock, ORDWR); if (lckfd < 0) jehanne_sysfatal("can't open %s read/write: %r", lock); return lckfd; @@ -118,13 +118,13 @@ main(int argc, char *argv[]) /* keep lock alive until killed */ for (;;) { jehanne_sleep(60*1000); - seek(lckfd, 0, 0); + sys_seek(lckfd, 0, 0); jehanne_fprint(lckfd, "\n"); } } /* spawn argument command */ - cmdpid = rfork(RFFDG|RFREND|RFPROC|RFENVG); + cmdpid = sys_rfork(RFFDG|RFREND|RFPROC|RFENVG); switch(cmdpid){ case -1: error("fork"); @@ -132,16 +132,16 @@ main(int argc, char *argv[]) fd = jehanne_ocreate("/env/prompt", OWRITE, 0666); if (fd >= 0) { jehanne_fprint(fd, "%s%% ", lock); - close(fd); + sys_close(fd); } - exec(cmd, args); + sys_exec(cmd, args); if(cmd[0] != '/' && jehanne_strncmp(cmd, "./", 2) != 0 && jehanne_strncmp(cmd, "../", 3) != 0) - exec(jehanne_smprint("/cmd/%s", cmd), args); + sys_exec(jehanne_smprint("/cmd/%s", cmd), args); error(cmd); } - notify(notifyf); + sys_notify(notifyf); w = waitfor(cmdpid); if (w == nil) @@ -174,6 +174,6 @@ notifyf(void *a, char *s) { USED(a); if(jehanne_strcmp(s, "interrupt") == 0) - noted(NCONT); - noted(NDFLT); + sys_noted(NCONT); + sys_noted(NDFLT); } diff --git a/sys/src/cmd/ls.c b/sys/src/cmd/ls.c index 00ef9f9..8e591da 100644 --- a/sys/src/cmd/ls.c +++ b/sys/src/cmd/ls.c @@ -113,7 +113,7 @@ ls(char *s, int multi) if((db->qid.type&QTDIR) && dflag==0){ free(db); output(); - fd = open(s, OREAD); + fd = sys_open(s, OREAD); if(fd == -1) goto error; n = dirreadall(fd, &db); @@ -126,7 +126,7 @@ ls(char *s, int multi) dirbuf[ndir+i].prefix = multi? s : 0; } ndir += n; - close(fd); + sys_close(fd); output(); }else{ growto(ndir+1); diff --git a/sys/src/cmd/mc.c b/sys/src/cmd/mc.c index 57e4e20..ea6cdde 100644 --- a/sys/src/cmd/mc.c +++ b/sys/src/cmd/mc.c @@ -90,12 +90,12 @@ main(int argc, char *argv[]) readbuf(0); else{ for(i = 1; i < argc; i++){ - if((ifd = open(*++argv, OREAD)) == -1) + if((ifd = sys_open(*++argv, OREAD)) == -1) fprint(2, "mc: can't open %s (%r)\n", *argv); else{ readbuf(ifd); Bflush(&bin); - close(ifd); + sys_close(ifd); } } } @@ -270,10 +270,10 @@ getwidth(void) char buf[128], *f[10], *p; if(access("/dev/acme", OREAD) >= 0){ - if((fd = open("/dev/acme/ctl", OREAD)) < 0) + if((fd = sys_open("/dev/acme/ctl", OREAD)) < 0) return; - n = read(fd, buf, sizeof buf-1); - close(fd); + n = jehanne_read(fd, buf, sizeof buf-1); + sys_close(fd); if(n <= 0) return; buf[n] = 0; @@ -296,12 +296,12 @@ getwidth(void) return; if((font = openfont(nil, p)) == nil) return; - if((fd = open("/dev/window", OREAD)) < 0){ + if((fd = sys_open("/dev/window", OREAD)) < 0){ font = nil; return; } - n = read(fd, buf, 5*12); - close(fd); + n = jehanne_read(fd, buf, 5*12); + sys_close(fd); if(n < 5*12){ font = nil; return; diff --git a/sys/src/cmd/mkdir.c b/sys/src/cmd/mkdir.c index f25d130..74f87d3 100644 --- a/sys/src/cmd/mkdir.c +++ b/sys/src/cmd/mkdir.c @@ -30,13 +30,13 @@ makedir(char *s) e = "error"; return -1; } - f = create(s, OREAD, DMDIR | mode); + f = sys_create(s, OREAD, DMDIR | mode); if(f < 0){ fprint(2, "mkdir: can't create %s: %r\n", s); e = "error"; return -1; } - close(f); + sys_close(f); return 0; } diff --git a/sys/src/cmd/mount.c b/sys/src/cmd/mount.c index 8778027..c756653 100644 --- a/sys/src/cmd/mount.c +++ b/sys/src/cmd/mount.c @@ -26,7 +26,7 @@ amount0(int fd, char *mntpt, int flags, char *aname, char *keyspec) int rv, afd; AuthInfo *ai; - afd = fauth(fd, aname); + afd = sys_fauth(fd, aname); if(afd >= 0){ ai = auth_proxy(afd, amount_getkey, "proto=p9any role=client %s", keyspec); if(ai != nil) @@ -34,9 +34,9 @@ amount0(int fd, char *mntpt, int flags, char *aname, char *keyspec) else fprint(2, "%s: auth_proxy: %r\n", argv0); } - rv = mount(fd, afd, mntpt, flags, aname, mntdevice); + rv = sys_mount(fd, afd, mntpt, flags, aname, mntdevice); if(afd >= 0) - close(afd); + sys_close(afd); return rv; } @@ -98,7 +98,7 @@ main(int argc, char *argv[]) if((flag&MAFTER)&&(flag&MBEFORE)) usage(); - fd = open(argv[0], ORDWR); + fd = sys_open(argv[0], ORDWR); if(fd < 0){ if(qflag) exits(0); @@ -106,9 +106,9 @@ main(int argc, char *argv[]) exits("open"); } - notify(catch); + sys_notify(catch); if(noauth) - rv = mount(fd, -1, argv[1], flag, spec, mntdevice); + rv = sys_mount(fd, -1, argv[1], flag, spec, mntdevice); else rv = amount0(fd, argv[1], flag, spec, keyspec); if(rv < 0){ diff --git a/sys/src/cmd/mpc.y b/sys/src/cmd/mpc.y index 9c46ddb..a02a2e0 100644 --- a/sys/src/cmd/mpc.y +++ b/sys/src/cmd/mpc.y @@ -445,14 +445,14 @@ cprint(char *fmt, ...) p = buf; while((x = strchr(p, '\n')) != nil){ x++; - write(1, p, x-p); + jehanne_write(1, p, x-p); p = &tabs[sizeof(tabs)-1 - clevel]; if(*p != '\0') - write(1, p, strlen(p)); + jehanne_write(1, p, strlen(p)); p = x; } if(*p != '\0') - write(1, p, strlen(p)); + jehanne_write(1, p, strlen(p)); } Node* @@ -1131,12 +1131,12 @@ main(int argc, char *argv[]) while(*argv != nil){ int fd; - if((fd = open(*argv, OREAD)) < 0){ + if((fd = sys_open(*argv, OREAD)) < 0){ fprint(2, "%s: %r\n", *argv); exits("error"); } parse(fd, *argv); - close(fd); + sys_close(fd); argv++; } exits(nil); diff --git a/sys/src/cmd/mv.c b/sys/src/cmd/mv.c index d37b642..de7de97 100644 --- a/sys/src/cmd/mv.c +++ b/sys/src/cmd/mv.c @@ -139,7 +139,7 @@ mv1(char *from, Dir *dirb, char *todir, char *toelem) fromname, toname); return -1; } - fdf = open(fromname, OREAD); + fdf = sys_open(fromname, OREAD); if(fdf < 0){ fprint(2, "mv: can't open %s: %r\n", fromname); return -1; @@ -147,29 +147,29 @@ mv1(char *from, Dir *dirb, char *todir, char *toelem) dirt = dirstat(toname); if(dirt != nil && (dirt->mode & DMAPPEND)) - hardremove(toname); /* because create() won't truncate file */ + hardremove(toname); /* because sys_create() won't truncate file */ free(dirt); fdt = ocreate(toname, OWRITE, dirb->mode); if(fdt < 0){ fprint(2, "mv: can't create %s: %r\n", toname); - close(fdf); + sys_close(fdf); return -1; } stat = copy1(fdf, fdt, fromname, toname); - close(fdf); + sys_close(fdf); if(stat >= 0){ nulldir(&null); null.mtime = dirb->mtime; null.mode = dirb->mode; dirfwstat(fdt, &null); /* ignore errors; e.g. user none always fails */ - if(remove(fromname) < 0){ + if(sys_remove(fromname) < 0){ fprint(2, "mv: can't remove %s: %r\n", fromname); stat = -1; } } - close(fdt); + sys_close(fdt); return stat; } @@ -179,8 +179,8 @@ copy1(int fdf, int fdt, char *from, char *to) char buf[8192]; int32_t n, n1; - while ((n = read(fdf, buf, sizeof buf)) > 0) { - n1 = write(fdt, buf, n); + while ((n = jehanne_read(fdf, buf, sizeof buf)) > 0) { + n1 = jehanne_write(fdt, buf, n); if(n1 != n){ fprint(2, "mv: error writing %s: %r\n", to); return -1; @@ -236,10 +236,10 @@ samefile(char *a, char *b) void hardremove(char *a) { - if(remove(a) == -1){ + if(sys_remove(a) == -1){ fprint(2, "mv: can't remove %s: %r\n", a); exits("mv"); } - while(remove(a) != -1) + while(sys_remove(a) != -1) ; } diff --git a/sys/src/cmd/ndb/cs.c b/sys/src/cmd/ndb/cs.c index 3be2bcf..679a944 100644 --- a/sys/src/cmd/ndb/cs.c +++ b/sys/src/cmd/ndb/cs.c @@ -230,9 +230,9 @@ procsetname(char *fmt, ...) if (cmdname == nil) return; snprint(buf, sizeof buf, "#p/%d/args", getpid()); - if((fd = open(buf, OWRITE)) >= 0){ - write(fd, cmdname, strlen(cmdname)+1); - close(fd); + if((fd = sys_open(buf, OWRITE)) >= 0){ + jehanne_write(fd, cmdname, strlen(cmdname)+1); + sys_close(fd); } free(cmdname); } @@ -279,10 +279,10 @@ main(int argc, char *argv[]) if(!justsetname){ snprint(servefile, sizeof(servefile), "#s/cs%s", ext); - unmount(servefile, mntpt); - remove(servefile); + sys_unmount(servefile, mntpt); + sys_remove(servefile); - rfork(RFREND|RFNOTEG); + sys_rfork(RFREND|RFNOTEG); csuser = estrdup(getuser()); mountinit(servefile, mntpt); io(); @@ -328,12 +328,12 @@ mountinit(char *service, char *mntpt) if(f < 0) error(service); snprint(buf, sizeof(buf), "%d", p[1]); - if(write(f, buf, strlen(buf)) != strlen(buf)) + if(jehanne_write(f, buf, strlen(buf)) != strlen(buf)) error("write /srv/cs"); - switch(rfork(RFFDG|RFPROC|RFNAMEG)){ + switch(sys_rfork(RFFDG|RFPROC|RFNAMEG)){ case 0: - close(p[1]); + sys_close(p[1]); procsetname("%s", mntpt); break; case -1: @@ -342,10 +342,10 @@ mountinit(char *service, char *mntpt) /* * put ourselves into the file system */ - close(p[0]); - if(mount(p[1], -1, mntpt, MAFTER, "", '9') < 0) + sys_close(p[0]); + if(sys_mount(p[1], -1, mntpt, MAFTER, "", '9') < 0) error("mount failed\n"); - _exits(0); + sys__exits(0); } mfd[0] = mfd[1] = p[0]; } @@ -531,7 +531,7 @@ io(void) if(debug) syslog(0, logfile, "slave death %d", getpid()); adec(&active); - _exits(0); + sys__exits(0); } } } @@ -981,7 +981,7 @@ sendmsg(Job *job, char *err) } qlock(&joblock); if(job->flushed == 0) - if(write(mfd[1], mdata, n)!=n) + if(jehanne_write(mfd[1], mdata, n)!=n) error("mount write"); qunlock(&joblock); if(debug) @@ -992,7 +992,7 @@ void error(char *s) { syslog(1, logfile, "%s: %r", s); - _exits(0); + sys__exits(0); } static int @@ -1079,10 +1079,10 @@ ipid(void) if(t == nil){ n = 0; d = nil; - f = open(mntpt, OREAD); + f = sys_open(mntpt, OREAD); if(f >= 0){ n = dirreadall(f, &d); - close(f); + sys_close(f); } for(f = 0; f < n; f++){ if((d[f].mode & DMDIR) == 0 || strncmp(d[f].name, "ether", 5) != 0) @@ -1113,10 +1113,10 @@ ipid(void) /* set /dev/sysname if we now know it */ if(mysysname){ - f = open("/dev/sysname", OWRITE); + f = sys_open("/dev/sysname", OWRITE); if(f >= 0){ - write(f, mysysname, strlen(mysysname)); - close(f); + jehanne_write(f, mysysname, strlen(mysysname)); + sys_close(f); } } } @@ -1133,7 +1133,7 @@ netinit(int background) Network *np; if(background){ - switch(rfork(RFPROC|RFNOTEG|RFMEM|RFNOWAIT)){ + switch(sys_rfork(RFPROC|RFNOTEG|RFMEM|RFNOWAIT)){ case 0: break; default: @@ -1170,7 +1170,7 @@ netinit(int background) if(background){ qunlock(&netlock); - _exits(0); + sys__exits(0); } } @@ -1641,7 +1641,7 @@ slave(char *host) adec(&active); return; } - switch(rfork(RFPROC|RFNOTEG|RFMEM|RFNOWAIT)){ + switch(sys_rfork(RFPROC|RFNOTEG|RFMEM|RFNOWAIT)){ case -1: adec(&active); break; diff --git a/sys/src/cmd/ndb/csquery.c b/sys/src/cmd/ndb/csquery.c index 91ec9bd..9d2c2ba 100644 --- a/sys/src/cmd/ndb/csquery.c +++ b/sys/src/cmd/ndb/csquery.c @@ -34,24 +34,24 @@ query(char *addr) char buf[128]; int fd, n; - fd = open(server, ORDWR); + fd = sys_open(server, ORDWR); if(fd < 0) sysfatal("cannot open %s: %r", server); - if(write(fd, addr, strlen(addr)) != strlen(addr)){ + if(jehanne_write(fd, addr, strlen(addr)) != strlen(addr)){ if(!statusonly) fprint(2, "translating %s: %r\n", addr); status = "errors"; - close(fd); + sys_close(fd); return; } if(!statusonly){ - seek(fd, 0, 0); - while((n = read(fd, buf, sizeof(buf)-1)) > 0){ + sys_seek(fd, 0, 0); + while((n = jehanne_read(fd, buf, sizeof(buf)-1)) > 0){ buf[n] = 0; print("%s\n", buf); } } - close(fd); + sys_close(fd); } void diff --git a/sys/src/cmd/ndb/dn.c b/sys/src/cmd/ndb/dn.c index cd69d31..9aca442 100644 --- a/sys/src/cmd/ndb/dn.c +++ b/sys/src/cmd/ndb/dn.c @@ -161,9 +161,9 @@ ding(void* _1, char *msg) { if(strstr(msg, "alarm") != nil) { stats.alarms++; - noted(NCONT); /* resume with system call error */ + sys_noted(NCONT); /* resume with system call error */ } else - noted(NDFLT); /* die */ + sys_noted(NDFLT); /* die */ } void @@ -180,7 +180,7 @@ dninit(void) dnvars.names = 0; dnvars.id = truerand(); /* don't start with same id every time */ - notify(ding); + sys_notify(ding); } /* @@ -303,7 +303,7 @@ dnstats(char *file) jehanne_lock(&dnlock); fprint(fd, "\n# domain names %lud target %lud\n", dnvars.names, target); jehanne_unlock(&dnlock); - close(fd); + sys_close(fd); } /* @@ -333,7 +333,7 @@ dndump(char *file) } } jehanne_unlock(&dnlock); - close(fd); + sys_close(fd); } /* @@ -1490,9 +1490,9 @@ procsetname(char *fmt, ...) if (cmdname == nil) return; snprint(buf, sizeof buf, "#p/%d/args", getpid()); - if((fd = open(buf, OWRITE)) >= 0){ - write(fd, cmdname, strlen(cmdname)+1); - close(fd); + if((fd = sys_open(buf, OWRITE)) >= 0){ + jehanne_write(fd, cmdname, strlen(cmdname)+1); + sys_close(fd); } free(cmdname); } @@ -1533,7 +1533,7 @@ slave(Request *req) * don't change note group. */ ppid = getpid(); - switch(rfork(RFPROC|RFMEM|RFNOWAIT)){ + switch(sys_rfork(RFPROC|RFMEM|RFNOWAIT)){ case -1: putactivity(1); break; @@ -1549,7 +1549,7 @@ slave(Request *req) * stacks, thus giving us two copies of `req', one in each * process. */ - alarm(0); + sys_alarm(0); longjmp(req->mret, 1); } } diff --git a/sys/src/cmd/ndb/dnnotify.c b/sys/src/cmd/ndb/dnnotify.c index 325c762..b7b2272 100644 --- a/sys/src/cmd/ndb/dnnotify.c +++ b/sys/src/cmd/ndb/dnnotify.c @@ -113,11 +113,11 @@ send_notify(char *slave, RR *soa, Request *req) dnslog("sending %d byte notify to %s/%I.%d about %s", n, slave, up->raddr, nhgets(up->rport), soa->owner->name); memset(&repmsg, 0, sizeof repmsg); - if(write(fd, obuf, n) != n) + if(jehanne_write(fd, obuf, n) != n) break; - alarm(2*1000); - len = read(fd, ibuf, sizeof ibuf); - alarm(0); + sys_alarm(2*1000); + len = jehanne_read(fd, ibuf, sizeof ibuf); + sys_alarm(0); if(len <= Udphdrsize) continue; err = convM2DNS(&ibuf[Udphdrsize], len, &repmsg, nil); @@ -130,7 +130,7 @@ send_notify(char *slave, RR *soa, Request *req) } if (i < 3) freeanswers(&repmsg); - close(fd); + sys_close(fd); } /* send notifies for any updated areas */ @@ -159,7 +159,7 @@ notifyproc(void) { Request req; - switch(rfork(RFPROC|RFNOTEG|RFMEM|RFNOWAIT)){ + switch(sys_rfork(RFPROC|RFNOTEG|RFMEM|RFNOWAIT)){ case -1: return; case 0: diff --git a/sys/src/cmd/ndb/dnresolve.c b/sys/src/cmd/ndb/dnresolve.c index e49744c..837b07a 100644 --- a/sys/src/cmd/ndb/dnresolve.c +++ b/sys/src/cmd/ndb/dnresolve.c @@ -113,11 +113,11 @@ procgetname(void) char buf[256]; snprint(buf, sizeof buf, "#p/%d/args", getpid()); - if((fd = open(buf, OREAD)) < 0) + if((fd = sys_open(buf, OREAD)) < 0) return strdup(""); *buf = '\0'; - n = read(fd, buf, sizeof buf-1); - close(fd); + n = jehanne_read(fd, buf, sizeof buf-1); + sys_close(fd); if (n >= 0) buf[n] = '\0'; if ((lp = strchr(buf, '[')) == nil || @@ -255,10 +255,10 @@ querydestroy(Query *qp) qp->req->aux = qp->prev; /* leave udpfd open */ if (qp->tcpfd >= 0) - close(qp->tcpfd); + sys_close(qp->tcpfd); if (qp->tcpctlfd >= 0) { hangup(qp->tcpctlfd); - close(qp->tcpctlfd); + sys_close(qp->tcpctlfd); } memset(qp, 0, sizeof *qp); /* prevent accidents */ qp->udpfd = qp->tcpfd = qp->tcpctlfd = -1; @@ -530,16 +530,16 @@ udpport(char *mtpt) } /* turn on header style interface */ - if(write(ctl, hmsg, strlen(hmsg)) != strlen(hmsg)){ - close(ctl); + if(jehanne_write(ctl, hmsg, strlen(hmsg)) != strlen(hmsg)){ + sys_close(ctl); warning(hmsg); return -1; } /* grab the data file */ snprint(ds, sizeof ds, "%s/data", adir); - fd = open(ds, ORDWR); - close(ctl); + fd = sys_open(ds, ORDWR); + sys_close(ctl); if(fd < 0) warning("can't open udp port %s: %r", ds); return fd; @@ -607,13 +607,13 @@ readnet(Query *qp, int medium, uint8_t *ibuf, uint64_t endms, uint8_t **replyp, return -1; /* taking too int32_t */ reply = ibuf; - alarm(ms); + sys_alarm(ms); if (medium == Udp) if (qp->udpfd < 0) dnslog("readnet: qp->udpfd closed"); else { - len = read(qp->udpfd, ibuf, Udphdrsize+Maxudpin); - alarm(0); + len = jehanne_read(qp->udpfd, ibuf, Udphdrsize+Maxudpin); + sys_alarm(0); notestats(startns, len < 0, qp->type); if (len >= IPaddrlen) memmove(srcip, ibuf, IPaddrlen); @@ -646,7 +646,7 @@ readnet(Query *qp, int medium, uint8_t *ibuf, uint64_t endms, uint8_t **replyp, } memmove(srcip, qp->tcpip, IPaddrlen); } - alarm(0); + sys_alarm(0); *replyp = reply; return len; } @@ -955,16 +955,16 @@ mydnsquery(Query *qp, int medium, uint8_t *udppkt, int len) nfd = dup(qp->udpfd, -1); if (nfd < 0) { warning("mydnsquery: qp->udpfd %d: %r", qp->udpfd); - close(qp->udpfd); /* ensure it's closed */ + sys_close(qp->udpfd); /* ensure it's closed */ qp->udpfd = -1; /* poison it */ break; } - close(nfd); + sys_close(nfd); if (qp->udpfd < 0) dnslog("mydnsquery: qp->udpfd %d closed", qp->udpfd); else { - if (write(qp->udpfd, udppkt, len+Udphdrsize) != + if (jehanne_write(qp->udpfd, udppkt, len+Udphdrsize) != len+Udphdrsize) warning("sending udp msg: %r"); else { @@ -981,9 +981,9 @@ mydnsquery(Query *qp, int medium, uint8_t *udppkt, int len) snprint(addr, sizeof addr, "%s/tcp!%s!dns", *mntpt ? mntpt : "/net", domain); - alarm(10*1000); + sys_alarm(10*1000); qp->tcpfd = dial(addr, nil, conndir, &qp->tcpctlfd); - alarm(0); + sys_alarm(0); if (qp->tcpfd < 0) { dnslog("can't dial %s: %r", addr); break; @@ -998,8 +998,8 @@ mydnsquery(Query *qp, int medium, uint8_t *udppkt, int len) belen[0] = len >> 8; belen[1] = len; - if (write(qp->tcpfd, belen, 2) != 2 || - write(qp->tcpfd, udppkt + Udphdrsize, len) != len) + if (jehanne_write(qp->tcpfd, belen, 2) != 2 || + jehanne_write(qp->tcpfd, udppkt + Udphdrsize, len) != len) warning("sending tcp msg: %r"); else rv = 0; @@ -1325,8 +1325,8 @@ tcpquery(Query *qp, DNSmsg *mp, int depth, uint8_t *ibuf, uint8_t *obuf, int len rv = -1; if (qp->tcpfd >= 0) { hangup(qp->tcpctlfd); - close(qp->tcpctlfd); - close(qp->tcpfd); + sys_close(qp->tcpctlfd); + sys_close(qp->tcpfd); } qp->tcpfd = qp->tcpctlfd = -1; @@ -1497,7 +1497,7 @@ udpquery(Query *qp, char *mntpt, int depth, int patient, int inns) qp->udpfd = fd; rv = queryns(qp, depth, ibuf, obuf, wait, inns); qp->udpfd = -1; - close(fd); + sys_close(fd); Out: free(obuf); diff --git a/sys/src/cmd/ndb/dns.c b/sys/src/cmd/ndb/dns.c index 5b4489b..5087381 100644 --- a/sys/src/cmd/ndb/dns.c +++ b/sys/src/cmd/ndb/dns.c @@ -185,7 +185,7 @@ main(int argc, char *argv[]) if(argc != 0) usage(); - rfork(RFREND|RFNOTEG); + sys_rfork(RFREND|RFNOTEG); cfg.inside = (*mntpt == '\0' || strcmp(mntpt, "/net") == 0); @@ -225,7 +225,7 @@ main(int argc, char *argv[]) * /srv/dns and /net/dns remain open and valid. */ for (;;) { - kid = rfork(RFPROC|RFFDG|RFNOTEG); + kid = sys_rfork(RFPROC|RFFDG|RFNOTEG); switch (kid) { case -1: sysfatal("fork failed: %r"); @@ -235,7 +235,7 @@ main(int argc, char *argv[]) if(sendnotifies) notifyproc(); io(); - _exits("restart"); + sys__exits("restart"); default: while ((pid = waitpid()) != kid && pid != -1) continue; @@ -282,26 +282,26 @@ mountinit(char *service, char *mntpt) if((f = ocreate(service, OWRITE|ORCLOSE, 0666)) < 0) sysfatal("create %s failed: %r", service); snprint(buf, sizeof buf, "%d", p[1]); - if(write(f, buf, strlen(buf)) != strlen(buf)) + if(jehanne_write(f, buf, strlen(buf)) != strlen(buf)) sysfatal("write %s failed: %r", service); /* copy namespace to avoid a deadlock */ - switch(rfork(RFFDG|RFPROC|RFNAMEG)){ + switch(sys_rfork(RFFDG|RFPROC|RFNAMEG)){ case 0: /* child: hang around and (re)start main proc */ - close(p[1]); + sys_close(p[1]); procsetname("%s restarter", mntpt); break; case -1: sysfatal("fork failed: %r"); default: /* parent: make /srv/dns, mount it, exit */ - close(p[0]); + sys_close(p[0]); /* * put ourselves into the file system */ - if(mount(p[1], -1, mntpt, MAFTER, "", '9') < 0) + if(sys_mount(p[1], -1, mntpt, MAFTER, "", '9') < 0) fprint(2, "dns mount failed: %r\n"); - _exits(0); + sys__exits(0); } mfd[0] = mfd[1] = p[0]; } @@ -508,7 +508,7 @@ io(void) */ if(req.isslave){ putactivity(0); - _exits(0); + sys__exits(0); } putactivity(0); @@ -946,7 +946,7 @@ sendmsg(Job *job, char *err) } jehanne_lock(&joblock); if(job->flushed == 0) - if(write(mfd[1], mdata, n)!=n) + if(jehanne_write(mfd[1], mdata, n)!=n) sysfatal("mount write"); jehanne_unlock(&joblock); if(debug) diff --git a/sys/src/cmd/ndb/dnsquery.c b/sys/src/cmd/ndb/dnsquery.c index 63373e5..459c911 100644 --- a/sys/src/cmd/ndb/dnsquery.c +++ b/sys/src/cmd/ndb/dnsquery.c @@ -31,16 +31,16 @@ setup(int argc, char **argv) mtpt = argv[0]; } - fd = open(dns, ORDWR); + fd = sys_open(dns, ORDWR); if(fd < 0){ if(domount == 0) sysfatal("can't open %s: %r", dns); - fd = open(srv, ORDWR); + fd = sys_open(srv, ORDWR); if(fd < 0) sysfatal("can't open %s: %r", srv); - if(mount(fd, -1, mtpt, MBEFORE, "", '9') < 0) - sysfatal("can't mount(%s, %s): %r", srv, mtpt); - fd = open(dns, ORDWR); + if(sys_mount(fd, -1, mtpt, MBEFORE, "", '9') < 0) + sysfatal("can't sys_mount(%s, %s): %r", srv, mtpt); + fd = sys_open(dns, ORDWR); if(fd < 0) sysfatal("can't open %s: %r", dns); } @@ -52,14 +52,14 @@ querydns(int fd, char *line, int n) { char buf[1024]; - seek(fd, 0, 0); - if(write(fd, line, n) != n) { + sys_seek(fd, 0, 0); + if(jehanne_write(fd, line, n) != n) { print("!%r\n"); return; } - seek(fd, 0, 0); + sys_seek(fd, 0, 0); buf[0] = '\0'; - while((n = read(fd, buf, sizeof(buf))) > 0){ + while((n = jehanne_read(fd, buf, sizeof(buf))) > 0){ buf[n] = '\0'; print("%s\n", buf); } diff --git a/sys/src/cmd/ndb/dnstcp.c b/sys/src/cmd/ndb/dnstcp.c index 6cf81c4..5422002 100644 --- a/sys/src/cmd/ndb/dnstcp.c +++ b/sys/src/cmd/ndb/dnstcp.c @@ -60,7 +60,7 @@ main(int argc, char *argv[]) DNSmsg reqmsg, repmsg; Request req; - alarm(2*60*1000); + sys_alarm(2*60*1000); cfg.cachedb = 1; ARGBEGIN{ case 'd': @@ -169,7 +169,7 @@ main(int argc, char *argv[]) if(req.isslave){ putactivity(0); - _exits(0); + sys__exits(0); } } refreshmain(mntpt); @@ -217,7 +217,7 @@ reply(int fd, DNSmsg *rep, Request *req) len = convDNS2M(rep, buf+2, sizeof(buf) - 2); buf[0] = len>>8; buf[1] = len; - rv = write(fd, buf, len+2); + rv = jehanne_write(fd, buf, len+2); if(rv != len+2){ dnslog("[%d] sending reply: %d instead of %d", getpid(), rv, len+2); @@ -333,11 +333,11 @@ getcaller(char *dir) static char remote[128]; snprint(remote, sizeof(remote), "%s/remote", dir); - fd = open(remote, OREAD); + fd = sys_open(remote, OREAD); if(fd < 0) return; - n = read(fd, remote, sizeof remote - 1); - close(fd); + n = jehanne_read(fd, remote, sizeof remote - 1); + sys_close(fd); if(n <= 0) return; if(remote[n-1] == '\n') @@ -355,12 +355,12 @@ refreshmain(char *net) snprint(file, sizeof(file), "%s/dns", net); if(debug) dnslog("refreshing %s", file); - fd = open(file, ORDWR); + fd = sys_open(file, ORDWR); if(fd < 0) dnslog("can't refresh %s", file); else { fprint(fd, "refresh"); - close(fd); + sys_close(fd); } } diff --git a/sys/src/cmd/ndb/dnudpserver.c b/sys/src/cmd/ndb/dnudpserver.c index eaa1970..deb9d4b 100644 --- a/sys/src/cmd/ndb/dnudpserver.c +++ b/sys/src/cmd/ndb/dnudpserver.c @@ -128,8 +128,8 @@ redistrib(uint8_t *buf, int len) if (tp->fd > 0) { memmove(uh->raddr, tp->addr, sizeof tp->addr); hnputs(uh->rport, 53); /* dns port */ - if (write(tp->fd, buf, len) != len) { - close(tp->fd); + if (jehanne_write(tp->fd, buf, len) != len) { + sys_close(tp->fd); tp->fd = -1; } } else if (tp->host && time(nil) - tp->lastdial > 60) { @@ -159,7 +159,7 @@ dnudpserver(char *mntpt) * fork sharing text, data, and bss with parent. * stay in the same note group. */ - switch(rfork(RFPROC|RFMEM|RFNOWAIT)){ + switch(sys_rfork(RFPROC|RFMEM|RFNOWAIT)){ case -1: break; case 0: @@ -172,7 +172,7 @@ dnudpserver(char *mntpt) restart: procsetname("udp server announcing"); if(fd >= 0) - close(fd); + sys_close(fd); while((fd = udpannounce(mntpt)) < 0) sleep(5000); @@ -191,9 +191,9 @@ restart: memset(&repmsg, 0, sizeof repmsg); memset(&reqmsg, 0, sizeof reqmsg); - alarm(60*1000); - len = read(fd, buf, sizeof buf); - alarm(0); + sys_alarm(60*1000); + len = jehanne_read(fd, buf, sizeof buf); + sys_alarm(0); if(len <= Udphdrsize) goto restart; @@ -285,7 +285,7 @@ freereq: freeanswers(&reqmsg); if(req.isslave){ putactivity(0); - _exits(0); + sys__exits(0); } } } @@ -310,24 +310,24 @@ udpannounce(char *mntpt) } /* turn on header style interface */ - if(write(ctl, hmsg, strlen(hmsg)) != strlen(hmsg)){ - close(ctl); + if(jehanne_write(ctl, hmsg, strlen(hmsg)) != strlen(hmsg)){ + sys_close(ctl); if(!whined++) warning("can't enable headers on %s", datafile); return -1; } snprint(datafile, sizeof(datafile), "%s/data", dir); - data = open(datafile, ORDWR); + data = sys_open(datafile, ORDWR); if(data < 0){ - close(ctl); + sys_close(ctl); if(!whined++) warning("can't open %s to announce on dns udp port", datafile); return -1; } - close(ctl); + sys_close(ctl); return data; } @@ -346,6 +346,6 @@ reply(int fd, uint8_t *buf, DNSmsg *rep, Request *reqp) len = convDNS2M(rep, &buf[Udphdrsize], Maxudp); len += Udphdrsize; - if(write(fd, buf, len) != len) + if(jehanne_write(fd, buf, len) != len) dnslog("error sending reply: %r"); } diff --git a/sys/src/cmd/ndb/inform.c b/sys/src/cmd/ndb/inform.c index 56def2b..46e22c2 100644 --- a/sys/src/cmd/ndb/inform.c +++ b/sys/src/cmd/ndb/inform.c @@ -51,8 +51,8 @@ void ding(void * _1, char *msg) { if(strstr(msg, "alarm") != nil) - noted(NCONT); - noted(NDFLT); + sys_noted(NCONT); + sys_noted(NDFLT); } int @@ -211,19 +211,19 @@ main(int argc, char *argv[]) pmem(&p, addr, IPv4addrlen); /* v4 address */ len = p - buf; - if(write(fd, buf, len) != len) + if(jehanne_write(fd, buf, len) != len) sysfatal("write failed: %r"); - notify(ding); - alarm(3000); + sys_notify(ding); + sys_alarm(3000); do{ - if(read(fd, buf, sizeof buf) < 0) + if(jehanne_read(fd, buf, sizeof buf) < 0) sysfatal("timeout"); p = buf; }while(g16(&p) != txid); - alarm(0); + sys_alarm(0); - close(fd); + sys_close(fd); err = g16(&p) & 7; if(err != 0 && err != 7) /* err==7 is just a "yes, I know" warning */ diff --git a/sys/src/cmd/ndb/mkhash.c b/sys/src/cmd/ndb/mkhash.c index 70d7e2b..9697840 100644 --- a/sys/src/cmd/ndb/mkhash.c +++ b/sys/src/cmd/ndb/mkhash.c @@ -32,7 +32,7 @@ syserr(void) { static char buf[ERRMAX]; - errstr(buf, sizeof buf); + sys_errstr(buf, sizeof buf); return buf; } @@ -147,22 +147,22 @@ main(int argc, char **argv) } NDBPUTUL(db->mtime, buf); NDBPUTUL(hlen, buf+NDBULLEN); - if(write(fd, buf, NDBHLEN) != NDBHLEN){ + if(jehanne_write(fd, buf, NDBHLEN) != NDBHLEN){ fprint(2, "mkhash: writing %s\n", file); exits(syserr()); } - if(write(fd, ht, nextchain) != nextchain){ + if(jehanne_write(fd, ht, nextchain) != nextchain){ fprint(2, "mkhash: writing %s\n", file); exits(syserr()); } - close(fd); + sys_close(fd); /* make sure file didn't change while we were making the hash */ d = dirstat(argv[1]); if(d == nil || d->qid.path != db->qid.path || d->qid.vers != db->qid.vers){ fprint(2, "mkhash: %s changed underfoot\n", argv[1]); - remove(file); + sys_remove(file); exits("changed"); } diff --git a/sys/src/cmd/ndb/mkhosts.c b/sys/src/cmd/ndb/mkhosts.c index f01ae2b..e413fc3 100644 --- a/sys/src/cmd/ndb/mkhosts.c +++ b/sys/src/cmd/ndb/mkhosts.c @@ -213,7 +213,7 @@ main(int argc, char *argv[]) fprint(fd, "; This file is generated automatically, do not edit!\n"); for(i = 0; i < nx; i++) printArecord(fd, &x[i]); - close(fd); + sys_close(fd); sprint(fn, "/cfg/ndb/equiv.%-.21s", domname); fd = ocreate(fn, OWRITE, 0664); @@ -223,7 +223,7 @@ main(int argc, char *argv[]) } for(i = 0; i < nx; i++) printsys(fd, &x[i]); - close(fd); + sys_close(fd); sprint(fn, "/cfg/ndb/txt.%-.23s", domname); fd = ocreate(fn, OWRITE, 0664); @@ -233,7 +233,7 @@ main(int argc, char *argv[]) } for(i = 0; i < nx; i++) printtxt(fd, &x[i]); - close(fd); + sys_close(fd); exits(0); } diff --git a/sys/src/cmd/netstat.c b/sys/src/cmd/netstat.c index d4d43c2..cce346c 100644 --- a/sys/src/cmd/netstat.c +++ b/sys/src/cmd/netstat.c @@ -76,7 +76,7 @@ main(int argc, char *argv[]) for(i=0; iname); - fd = open(buf, OREAD); + fd = sys_open(buf, OREAD); if(fd < 0) return; - n = read(fd, buf, sizeof(buf) - 1); - close(fd); + n = jehanne_read(fd, buf, sizeof(buf) - 1); + sys_close(fd); if(n < 0) return; buf[n] = 0; @@ -159,13 +159,13 @@ pip(char *net, Dir *db) Bprint(&out, "%-4s %-4s %-10s %-12s ", net, db->name, db->uid, buf); snprint(buf, sizeof(buf) - 1, "%s/%s/%s/local", netroot, net, db->name); - fd = open(buf, OREAD); + fd = sys_open(buf, OREAD); if(fd < 0) { Bprint(&out, "\n"); return; } - n = read(fd, buf, sizeof(buf) - 1); - close(fd); + n = jehanne_read(fd, buf, sizeof(buf) - 1); + sys_close(fd); if(n < 0) { Bprint(&out, "\n"); return; @@ -180,13 +180,13 @@ pip(char *net, Dir *db) Bprint(&out, "%-10s ", getport(net, p+1)); snprint(buf, sizeof(buf) - 1, "%s/%s/%s/remote", netroot, net, db->name); - fd = open(buf, OREAD); + fd = sys_open(buf, OREAD); if(fd < 0) { print("\n"); return; } - n = read(fd, buf, sizeof(buf) - 1); - close(fd); + n = jehanne_read(fd, buf, sizeof(buf) - 1); + sys_close(fd); if(n < 0) { print("\n"); return; diff --git a/sys/src/cmd/ns/cat.c b/sys/src/cmd/ns/cat.c index c0a5d37..c658865 100644 --- a/sys/src/cmd/ns/cat.c +++ b/sys/src/cmd/ns/cat.c @@ -69,14 +69,14 @@ main(int argc, char **argv) Binit(&stdout, 1, OWRITE); sprint(buf, "/proc/%d/ns", pid); - fd = open(buf, OREAD); + fd = sys_open(buf, OREAD); if(fd < 0) { fprint(2, "ns: open %s: %r\n", buf); exits("open ns"); } for(line=1; ; line++) { - n = read(fd, buf, sizeof(buf)); + n = jehanne_read(fd, buf, sizeof(buf)); if(n == sizeof(buf)) { fprint(2, "ns: ns string too int32_t\n"); exits("read ns"); @@ -178,11 +178,11 @@ xlatemnt(Mount *m) if(strcmp(t+1, "data") != 0) goto Return; snprint(buf, sizeof buf, "/net/%s/%s/remote", net, port); - fd = open(buf, OREAD); + fd = sys_open(buf, OREAD); if(fd < 0) goto Return; - n = read(fd, buf, sizeof buf); - close(fd); + n = jehanne_read(fd, buf, sizeof buf); + sys_close(fd); if(n<=1 || n>sizeof buf) goto Return; if(buf[n-1] == '\n') diff --git a/sys/src/cmd/ns/clone.c b/sys/src/cmd/ns/clone.c index dae3887..c4288ff 100644 --- a/sys/src/cmd/ns/clone.c +++ b/sys/src/cmd/ns/clone.c @@ -25,26 +25,26 @@ main(int argc, char *argv[]) int fd; char buf[256], *cmd, **args; - rfork(RFNAMEG); + sys_rfork(RFNAMEG); if(argc < 3){ fprint(2, "usage: ns/clone pid cmd [args...]\n"); exits("usage"); } snprint(buf, sizeof(buf), "/proc/%s/ns", argv[1]); - fd = open(buf, OWRITE); + fd = sys_open(buf, OWRITE); if(fd < 0){ print("cannot open %s\n", buf); exits("invalid target pid"); } - write(fd, "clone", 6); - close(fd); + jehanne_write(fd, "clone", 6); + sys_close(fd); cmd = strdup(argv[2]); args = &argv[2]; if(cmd[0] == '/' ||(cmd[0] == '.' && (cmd[1] == '/' || (cmd[1] == '.' && cmd[2] == '/')))){ - exec(cmd, args); + sys_exec(cmd, args); sysfatal("exec %s failed: %r", cmd); } diff --git a/sys/src/cmd/p.c b/sys/src/cmd/p.c index ba274ab..d5ccf6f 100644 --- a/sys/src/cmd/p.c +++ b/sys/src/cmd/p.c @@ -40,13 +40,13 @@ main(int argc, char *argv[]) pglen = DEF; } else { n++; - f = open(argv[0], OREAD); + f = sys_open(argv[0], OREAD); if(f < 0){ fprint(2, "p: can't open %s - %r\n", argv[0]); continue; } printfile(f); - close(f); + sys_close(f); } } if(n == 0) diff --git a/sys/src/cmd/pict/bmp.c b/sys/src/cmd/pict/bmp.c index bbbfbd8..9d03a21 100644 --- a/sys/src/cmd/pict/bmp.c +++ b/sys/src/cmd/pict/bmp.c @@ -107,13 +107,13 @@ main(int argc, char *argv[]) err = show(0, ""); else{ for(i=0; i1 && err==nil){ fprint(2, "bmp: exiting after one file\n"); @@ -197,7 +197,7 @@ show(int fd, char *name) chantostr(buf, outchan); print("%11s %11d %11d %11d %11d ", buf, c->r.min.x, c->r.min.y, c->r.max.x, c->r.max.y); - if(write(1, c->chans[0], c->chanlen) != c->chanlen){ + if(jehanne_write(1, c->chans[0], c->chanlen) != c->chanlen){ fprint(2, "bmp: %s: write error %r\n", name); return "write"; } diff --git a/sys/src/cmd/pict/gif.c b/sys/src/cmd/pict/gif.c index ade27ab..80947c7 100644 --- a/sys/src/cmd/pict/gif.c +++ b/sys/src/cmd/pict/gif.c @@ -109,13 +109,13 @@ main(int argc, char *argv[]) err = show(0, ""); else{ for(i=0; i1 && err==nil){ fprint(2, "gif: exiting after one file\n"); @@ -404,7 +404,7 @@ show(int fd, char *name) chantostr(buf, outchan); print("%11s %11d %11d %11d %11d ", buf, rgbv[0]->r.min.x, rgbv[0]->r.min.y, rgbv[0]->r.max.x, rgbv[0]->r.max.y); - if(write(1, rgbv[0]->chans[0], rgbv[0]->chanlen) != rgbv[0]->chanlen){ + if(jehanne_write(1, rgbv[0]->chans[0], rgbv[0]->chanlen) != rgbv[0]->chanlen){ fprint(2, "gif: %s: write error %r\n", name); return "write"; } diff --git a/sys/src/cmd/pict/ico.c b/sys/src/cmd/pict/ico.c index 8f5c7c0..ce21613 100644 --- a/sys/src/cmd/pict/ico.c +++ b/sys/src/cmd/pict/ico.c @@ -411,10 +411,10 @@ doimage(Icon *icon) rv = -1; snprint(file, sizeof(file), "%dx%d.img", icon->w, icon->h); - fd = create(file, OWRITE, 0664); + fd = sys_create(file, OWRITE, 0664); if(fd >= 0){ rv = writememimage(fd, icon->img); - close(fd); + sys_close(fd); } if(rv < 0) mesg("error writing %s: %r", file); @@ -434,10 +434,10 @@ domask(Icon *icon) rv = -1; snprint(file, sizeof(file), "%dx%d.mask", icon->w, icon->h); - fd = create(file, OWRITE, 0664); + fd = sys_create(file, OWRITE, 0664); if(fd >= 0){ rv = writememimage(fd, icon->mask); - close(fd); + sys_close(fd); } if(rv < 0) mesg("error writing %s: %r", file); @@ -569,7 +569,7 @@ main(int argc, char **argv) fd = 0; break; case 1: - fd = open(argv[0], OREAD); + fd = sys_open(argv[0], OREAD); if(fd < 0) sysfatal("opening: %r"); break; diff --git a/sys/src/cmd/pict/jpg.c b/sys/src/cmd/pict/jpg.c index e66978b..9dfa8a5 100644 --- a/sys/src/cmd/pict/jpg.c +++ b/sys/src/cmd/pict/jpg.c @@ -124,12 +124,12 @@ main(int argc, char *argv[]) }ARGEND; if(yflag==0 && dflag==0 && colorspace==CYCbCr){ /* see if we should convert right to RGB */ - fd = open("/dev/screen", OREAD); + fd = sys_open("/dev/screen", OREAD); if(fd >= 0){ buf[12] = '\0'; - if(read(fd, buf, 12)==12 && chantodepth(strtochan(buf))>8) + if(jehanne_read(fd, buf, 12)==12 && chantodepth(strtochan(buf))>8) colorspace = CRGB; - close(fd); + sys_close(fd); } } @@ -138,13 +138,13 @@ main(int argc, char *argv[]) err = show(0, "", outchan); else{ for(i=0; i1 && err==nil){ fprint(2, "jpg: exiting after one file\n"); @@ -332,7 +332,7 @@ rpt: array = Breadjpg(&b, colorspace); chantostr(buf, outchan); print("%11s %11d %11d %11d %11d ", buf, c->r.min.x, c->r.min.y, c->r.max.x, c->r.max.y); - if(write(1, c->chans[0], c->chanlen) != c->chanlen){ + if(jehanne_write(1, c->chans[0], c->chanlen) != c->chanlen){ fprint(2, "jpg: %s: write error %r\n", name); return "write"; } diff --git a/sys/src/cmd/pict/png.c b/sys/src/cmd/pict/png.c index 5710a7e..f2f2380 100644 --- a/sys/src/cmd/pict/png.c +++ b/sys/src/cmd/pict/png.c @@ -109,13 +109,13 @@ main(int argc, char *argv[]) err = show(0, "", outchan); else{ for(i=0; i1 && err==nil){ fprint(2, "png: exiting after one file\n"); @@ -227,7 +227,7 @@ show(int fd, char *name, int outc) argv0, c->chanlen, len, buf); print("%11s %11d %11d %11d %11d ", buf, c->r.min.x, c->r.min.y, c->r.max.x, c->r.max.y); - if(write(1, c->chans[0], c->chanlen) != c->chanlen){ + if(jehanne_write(1, c->chans[0], c->chanlen) != c->chanlen){ fprint(2, "png: %s: write error %r\n", name); return "write"; } diff --git a/sys/src/cmd/pict/ppm.c b/sys/src/cmd/pict/ppm.c index 0226bcd..98b784a 100644 --- a/sys/src/cmd/pict/ppm.c +++ b/sys/src/cmd/pict/ppm.c @@ -105,13 +105,13 @@ main(int argc, char *argv[]) err = show(0, ""); else{ for(i=0; i1 && err==nil){ fprint(2, "ppm: exiting after one file\n"); @@ -196,7 +196,7 @@ show(int fd, char *name) chantostr(buf, outchan); print("%11s %11d %11d %11d %11d ", buf, c->r.min.x, c->r.min.y, c->r.max.x, c->r.max.y); - if(write(1, c->chans[0], c->chanlen) != c->chanlen){ + if(jehanne_write(1, c->chans[0], c->chanlen) != c->chanlen){ fprint(2, "ppm: %s: write error %r\n", name); return "write"; } diff --git a/sys/src/cmd/pict/readbmp.c b/sys/src/cmd/pict/readbmp.c index 4dbcbe5..c35873f 100644 --- a/sys/src/cmd/pict/readbmp.c +++ b/sys/src/cmd/pict/readbmp.c @@ -555,7 +555,7 @@ Breadbmp(Biobuf *bp, int colourspace) USED(a); USED(bmp); if (colourspace != CRGB) { - errstr(ebuf, sizeof ebuf); /* throw it away */ + sys_errstr(ebuf, sizeof ebuf); /* throw it away */ werrstr("ReadRGB: unknown colour space %d", colourspace); return nil; } diff --git a/sys/src/cmd/pict/readgif.c b/sys/src/cmd/pict/readgif.c index 908a8c7..1fbc9f3 100644 --- a/sys/src/cmd/pict/readgif.c +++ b/sys/src/cmd/pict/readgif.c @@ -119,7 +119,7 @@ readgif(int fd, int colorspace, int justone) } memset(h, 0, sizeof(Header)); h->fd = &b; - errstr(buf, sizeof buf); /* throw it away */ + sys_errstr(buf, sizeof buf); /* throw it away */ if(setjmp(h->errlab)) a = nil; else diff --git a/sys/src/cmd/pict/readjpg.c b/sys/src/cmd/pict/readjpg.c index b4f5370..bef3d2c 100644 --- a/sys/src/cmd/pict/readjpg.c +++ b/sys/src/cmd/pict/readjpg.c @@ -242,7 +242,7 @@ Breadjpg(Biobuf *b, int colorspace) buf[0] = '\0'; if(colorspace!=CYCbCr && colorspace!=CRGB){ - errstr(buf, sizeof buf); /* throw it away */ + sys_errstr(buf, sizeof buf); /* throw it away */ werrstr("ReadJPG: unknown color space"); return nil; } @@ -257,7 +257,7 @@ Breadjpg(Biobuf *b, int colorspace) h->array = array; memset(h, 0, sizeof(Header)); h->fd = b; - errstr(buf, sizeof buf); /* throw it away */ + sys_errstr(buf, sizeof buf); /* throw it away */ if(setjmp(h->errlab)) r = h->image; else diff --git a/sys/src/cmd/pict/readppm.c b/sys/src/cmd/pict/readppm.c index d9af764..a454f04 100644 --- a/sys/src/cmd/pict/readppm.c +++ b/sys/src/cmd/pict/readppm.c @@ -130,10 +130,10 @@ Error: free(array[0]); free(array); - errstr(buf, sizeof buf); + sys_errstr(buf, sizeof buf); if(buf[0] == 0) strcpy(buf, e); - errstr(buf, sizeof buf); + sys_errstr(buf, sizeof buf); return nil; } @@ -225,10 +225,10 @@ readppm(Biobuf *b, Rawimage *a) return a; Error: - errstr(buf, sizeof buf); + sys_errstr(buf, sizeof buf); if(buf[0] == 0) strcpy(buf, e); - errstr(buf, sizeof buf); + sys_errstr(buf, sizeof buf); for(i=0; i<3; i++) free(a->chans[i]); diff --git a/sys/src/cmd/pict/tga.c b/sys/src/cmd/pict/tga.c index e7817ab..d471b69 100644 --- a/sys/src/cmd/pict/tga.c +++ b/sys/src/cmd/pict/tga.c @@ -107,13 +107,13 @@ main(int argc, char *argv[]) err = show(0, ""); else{ for(i=0; i1 && err==nil){ fprint(2, "tga: exiting after one file\n"); @@ -200,7 +200,7 @@ show(int fd, char *name) chantostr(buf, outchan); print("%11s %11d %11d %11d %11d ", buf, c->r.min.x, c->r.min.y, c->r.max.x, c->r.max.y); - if(write(1, c->chans[0], c->chanlen) != c->chanlen){ + if(jehanne_write(1, c->chans[0], c->chanlen) != c->chanlen){ fprint(2, "tga: %s: write error %r\n", name); return "write"; } diff --git a/sys/src/cmd/pict/tif.c b/sys/src/cmd/pict/tif.c index 97fe1ea..0298a5f 100644 --- a/sys/src/cmd/pict/tif.c +++ b/sys/src/cmd/pict/tif.c @@ -130,13 +130,13 @@ main(int argc, char *argv[]) exits(show(0, "", outchan)); err = nil; for(i = 0; i < argc; i++) { - if((fd = open(argv[i], OREAD)) < 0) { + if((fd = sys_open(argv[i], OREAD)) < 0) { fprint(2, "%s: open %s: %r\n", argv0, argv[i]); err = "open"; } else { err = show(fd, argv[i], outchan); - close(fd); + sys_close(fd); } if((nineflag || cflag) && argc > 1 && err == nil) { fprint(2, "%s: exiting after one file\n", @@ -233,7 +233,7 @@ show(int fd, char *name, int outchan) print("%11s %11d %11d %11d %11d ", buf, c->r.min.x, c->r.min.y, c->r.max.x, c->r.max.y); - if(write(1, c->chans[0], c->chanlen) != + if(jehanne_write(1, c->chans[0], c->chanlen) != c->chanlen) { fprint(2, "%s: %s: write error: %r\n", argv0, name); diff --git a/sys/src/cmd/pict/togif.c b/sys/src/cmd/pict/togif.c index 491e96c..1e0aa6a 100644 --- a/sys/src/cmd/pict/togif.c +++ b/sys/src/cmd/pict/togif.c @@ -139,13 +139,13 @@ main(int argc, char *argv[]) usage(); continue; } - fd = open(argv[j], OREAD); + fd = sys_open(argv[j], OREAD); if(fd < 0) sysfatal("can't open %s: %r", argv[j]); i = readmemimage(fd); if(i == nil) sysfatal("can't readimage %s: %r", argv[j]); - close(fd); + sys_close(fd); ni = memonechan(i); if(ni == nil) sysfatal("converting image to RGBV: %r"); diff --git a/sys/src/cmd/pict/toico.c b/sys/src/cmd/pict/toico.c index 9141c1d..711f0c4 100644 --- a/sys/src/cmd/pict/toico.c +++ b/sys/src/cmd/pict/toico.c @@ -147,14 +147,14 @@ readicon(char *file) int fd; Icon *icon; - fd = open(file, OREAD); + fd = sys_open(file, OREAD); if(fd < 0) sysfatal("opening %s: %r", file); icon = emalloc(sizeof(Icon)); icon->img = readimage(display, fd, 0); if(icon->img == nil) sysfatal("reading image %s: %r", file); - close(fd); + sys_close(fd); if(h.first) h.last->next = icon; diff --git a/sys/src/cmd/pict/tojpg.c b/sys/src/cmd/pict/tojpg.c index d792f5e..6a83346 100644 --- a/sys/src/cmd/pict/tojpg.c +++ b/sys/src/cmd/pict/tojpg.c @@ -44,7 +44,7 @@ main(int argc, char *argv[]) fd = 0; } else { file = argv[0]; - if((fd = open(file, OREAD)) < 0) + if((fd = sys_open(file, OREAD)) < 0) sysfatal("open %s: %r", file); } @@ -54,7 +54,7 @@ main(int argc, char *argv[]) if((i = readmemimage(fd)) == nil) sysfatal("readimage %s: %r", file); - close(fd); + sys_close(fd); if((ni = memmultichan(i)) == nil) sysfatal("converting image to RGB24: %r"); if(i != ni) { diff --git a/sys/src/cmd/pict/topng.c b/sys/src/cmd/pict/topng.c index b760d9c..da4d16b 100644 --- a/sys/src/cmd/pict/topng.c +++ b/sys/src/cmd/pict/topng.c @@ -50,7 +50,7 @@ main(int argc, char *argv[]) fd = 0; filename = ""; }else{ - fd = open(argv[0], OREAD); + fd = sys_open(argv[0], OREAD); if(fd < 0) sysfatal("can't open %s: %r", argv[0]); filename = argv[0]; @@ -59,7 +59,7 @@ main(int argc, char *argv[]) i = readmemimage(fd); if(i == nil) sysfatal("can't readimage %s: %r", filename); - close(fd); + sys_close(fd); err = memwritepng(&bout, i, &II); freememimage(i); diff --git a/sys/src/cmd/pict/toppm.c b/sys/src/cmd/pict/toppm.c index ce66381..6fa8f7b 100644 --- a/sys/src/cmd/pict/toppm.c +++ b/sys/src/cmd/pict/toppm.c @@ -62,13 +62,13 @@ main(int argc, char *argv[]) } err = memwriteppm(&bout, i, comment, rflag); }else{ - fd = open(argv[0], OREAD); + fd = sys_open(argv[0], OREAD); if(fd < 0) sysfatal("can't open %s: %r", argv[0]); i = readmemimage(fd); if(i == nil) sysfatal("can't readimage %s: %r", argv[0]); - close(fd); + sys_close(fd); ni = memmultichan(i); if(ni == nil) sysfatal("converting image to RGB24: %r"); diff --git a/sys/src/cmd/pict/torgbv.c b/sys/src/cmd/pict/torgbv.c index 6363b75..832e8fb 100644 --- a/sys/src/cmd/pict/torgbv.c +++ b/sys/src/cmd/pict/torgbv.c @@ -22,7 +22,7 @@ _remaperror(char *fmt, ...) vseprint(buf, buf+sizeof buf, fmt, arg); va_end(arg); - errstr(buf, sizeof buf); + sys_errstr(buf, sizeof buf); return nil; } @@ -41,7 +41,7 @@ torgbv(Rawimage *i, int errdiff) unsigned char *cmap, *cm, *in, *out, *inp, *outp, cmap1[3*256], map[256], *rpic, *bpic, *gpic; err[0] = '\0'; - errstr(err, sizeof err); /* throw it away */ + sys_errstr(err, sizeof err); /* throw it away */ im = malloc(sizeof(Rawimage)); if(im == nil) return nil; diff --git a/sys/src/cmd/pict/totif.c b/sys/src/cmd/pict/totif.c index 4f7efb7..8be9cbd 100644 --- a/sys/src/cmd/pict/totif.c +++ b/sys/src/cmd/pict/totif.c @@ -91,7 +91,7 @@ main(int argc, char *argv[]) fd = 0; } else { file = argv[0]; - if((fd = open(file, OREAD)) < 0) + if((fd = sys_open(file, OREAD)) < 0) sysfatal("open %s: %r", file); } if(Binit(&bout, 1, OWRITE) < 0) @@ -99,7 +99,7 @@ main(int argc, char *argv[]) memimageinit(); if((i = readmemimage(fd)) == nil) sysfatal("readmemimage %s: %r", file); - close(fd); + sys_close(fd); if(comp >= 2 && comp <= 4) { chan = GREY1; chanflag = 1; diff --git a/sys/src/cmd/pict/totruecolor.c b/sys/src/cmd/pict/totruecolor.c index 0613865..88c9efd 100644 --- a/sys/src/cmd/pict/totruecolor.c +++ b/sys/src/cmd/pict/totruecolor.c @@ -24,7 +24,7 @@ totruecolor(Rawimage *i, int chandesc) return _remaperror("remap: can't convert to chandesc %d", chandesc); err[0] = '\0'; - errstr(err, sizeof err); /* throw it away */ + sys_errstr(err, sizeof err); /* throw it away */ im = malloc(sizeof(Rawimage)); if(im == nil) return nil; diff --git a/sys/src/cmd/pict/v210.c b/sys/src/cmd/pict/v210.c index 2d77646..ef42003 100644 --- a/sys/src/cmd/pict/v210.c +++ b/sys/src/cmd/pict/v210.c @@ -107,13 +107,13 @@ main(int argc, char *argv[]) err = show(0, ""); else{ for(i=0; i1 && err==nil){ fprint(2, "readV210: exiting after one file\n"); @@ -197,7 +197,7 @@ show(int fd, char *name) chantostr(buf, outchan); print("%11s %11d %11d %11d %11d ", buf, c->r.min.x, c->r.min.y, c->r.max.x, c->r.max.y); - if(write(1, c->chans[0], c->chanlen) != c->chanlen){ + if(jehanne_write(1, c->chans[0], c->chanlen) != c->chanlen){ fprint(2, "readV210: %s: write error %r\n", name); return "write"; } diff --git a/sys/src/cmd/pict/writerawimage.c b/sys/src/cmd/pict/writerawimage.c index a893695..932eb34 100644 --- a/sys/src/cmd/pict/writerawimage.c +++ b/sys/src/cmd/pict/writerawimage.c @@ -86,7 +86,7 @@ writerawimage(int fd, Rawimage *i) data = i->chans[0]; sprint(hdr, "compressed\n%11s %11d %11d %11d %11d ", chantostr(buf, desc), r.min.x, r.min.y, r.max.x, r.max.y); - if(write(fd, hdr, 11+5*12) != 11+5*12){ + if(jehanne_write(fd, hdr, 11+5*12) != 11+5*12){ werrstr("i/o error writing header"); goto ErrOut; } @@ -195,8 +195,8 @@ writerawimage(int fd, Rawimage *i) } n = loutp-outbuf; sprint(hdr, "%11d %11ld ", r.max.y, n); - write(fd, hdr, 2*12); - write(fd, outbuf, n); + jehanne_write(fd, hdr, 2*12); + jehanne_write(fd, outbuf, n); r.min.y = r.max.y; } free(outbuf); diff --git a/sys/src/cmd/pict/yuv.c b/sys/src/cmd/pict/yuv.c index 795daf3..ae5d227 100644 --- a/sys/src/cmd/pict/yuv.c +++ b/sys/src/cmd/pict/yuv.c @@ -107,13 +107,13 @@ main(int argc, char *argv[]) err = show(0, ""); else{ for(i=0; i1 && err==nil){ fprint(2, "yuv: exiting after one file\n"); @@ -197,7 +197,7 @@ show(int fd, char *name) chantostr(buf, outchan); print("%11s %11d %11d %11d %11d ", buf, c->r.min.x, c->r.min.y, c->r.max.x, c->r.max.y); - if(write(1, c->chans[0], c->chanlen) != c->chanlen){ + if(jehanne_write(1, c->chans[0], c->chanlen) != c->chanlen){ fprint(2, "yuv: %s: write error %r\n", name); return "write"; } diff --git a/sys/src/cmd/pipefile.c b/sys/src/cmd/pipefile.c index 4a51e75..27265a1 100644 --- a/sys/src/cmd/pipefile.c +++ b/sys/src/cmd/pipefile.c @@ -22,19 +22,19 @@ usage(void) void connect(char *cmd, int fd0, int fd1) { - switch(rfork(RFPROC|RFFDG|RFREND|RFNOWAIT)){ + switch(sys_rfork(RFPROC|RFFDG|RFREND|RFNOWAIT)){ case -1: sysfatal("fork %s: %r", cmd); break; default: - close(fd0); - close(fd1); + sys_close(fd0); + sys_close(fd1); return; case 0: dup(fd0, 0); dup(fd1, 1); - close(fd0); - close(fd1); + sys_close(fd0); + sys_close(fd1); execl("/cmd/rc", "rc", "-c", cmd, nil); sysfatal("exec %s: %r", cmd); break; @@ -48,7 +48,7 @@ main(int argc, char *argv[]) char *rcmd, *wcmd; int fd0, fd1, ifd0, ifd1, dupflag; - rfork(RFNOTEG); + sys_rfork(RFNOTEG); dupflag = 0; rcmd = wcmd = nil; ARGBEGIN{ @@ -74,32 +74,32 @@ main(int argc, char *argv[]) file = argv[0]; if(dupflag){ - ifd0 = open(file, ORDWR); + ifd0 = sys_open(file, ORDWR); if(ifd0 < 0) sysfatal("open %s: %r", file); ifd1 = dup(ifd0, -1); }else{ - ifd0 = open(file, OREAD); + ifd0 = sys_open(file, OREAD); if(ifd0 < 0) sysfatal("open %s: %r", file); - ifd1 = open(file, OWRITE); + ifd1 = sys_open(file, OWRITE); if(ifd1 < 0) sysfatal("open %s: %r", file); } - if(bind("#|", TEMP, MREPL) < 0) + if(sys_bind("#|", TEMP, MREPL) < 0) sysfatal("bind pipe %s: %r", TEMP); - if(bind(TEMP "/data", file, MREPL) < 0) + if(sys_bind(TEMP "/data", file, MREPL) < 0) sysfatal("bind %s %s: %r", TEMP "/data", file); - fd0 = open(TEMP "/data1", OREAD); + fd0 = sys_open(TEMP "/data1", OREAD); if(fd0 < 0) sysfatal("open %s: %r", TEMP "/data1"); connect(wcmd, fd0, ifd1); - fd1 = open(TEMP "/data1", OWRITE); + fd1 = sys_open(TEMP "/data1", OWRITE); if(fd1 < 0) sysfatal("open %s: %r", TEMP "/data1"); connect(rcmd, ifd0, fd1); - unmount(nil, TEMP); + sys_unmount(nil, TEMP); exits(nil); } diff --git a/sys/src/cmd/ps.c b/sys/src/cmd/ps.c index 67fb479..a7bb37d 100644 --- a/sys/src/cmd/ps.c +++ b/sys/src/cmd/ps.c @@ -41,7 +41,7 @@ main(int argc, char *argv[]) Binit(&bout, 1, OWRITE); if(chdir("/proc")==-1) error("/proc"); - fd=open(".", OREAD); + fd=sys_open(".", OREAD); if(fd<0) error("/proc"); tot = dirreadall(fd, &dir); @@ -72,11 +72,11 @@ ps(char *s) char args[256], *argv[16], buf[64], pbuf[8], rbuf[20], rbuf1[20], status[4096]; sprint(buf, "%s/status", s); - fd = open(buf, OREAD); + fd = sys_open(buf, OREAD); if(fd<0) return; - n = read(fd, status, sizeof status-1); - close(fd); + n = jehanne_read(fd, status, sizeof status-1); + sys_close(fd); if(n <= 0) return; status[n] = '\0'; @@ -133,11 +133,11 @@ ps(char *s) } sprint(buf, "%s/args", s); - fd = open(buf, OREAD); + fd = sys_open(buf, OREAD); if(fd < 0) goto Badargs; - n = read(fd, args, sizeof args-1); - close(fd); + n = jehanne_read(fd, args, sizeof args-1); + sys_close(fd); if(n < 0) goto Badargs; if(n == 0) diff --git a/sys/src/cmd/pstree.c b/sys/src/cmd/pstree.c index c2110e6..5e92384 100644 --- a/sys/src/cmd/pstree.c +++ b/sys/src/cmd/pstree.c @@ -65,15 +65,15 @@ theppid(int pid) ppid = 0; snprint(b, sizeof(b), "%d/ppid", pid); - fd = open(b, OREAD); + fd = sys_open(b, OREAD); if(fd >= 0){ memset(b, 0, sizeof b); - if(read(fd, b, sizeof b-1) >= 0){ + if(jehanne_read(fd, b, sizeof b-1) >= 0){ ppid = atoi(b); if(ppid < 0) ppid = 0; } - close(fd); + sys_close(fd); } return ppid; } @@ -101,13 +101,13 @@ addprocs(void) int fd, rc, i; Dir *d; - fd = open(".", OREAD); + fd = sys_open(".", OREAD); if(fd < 0) sysfatal("open: %r"); rc = dirreadall(fd, &d); if(rc < 0) sysfatal("dirreadall: %r"); - close(fd); + sys_close(fd); for(i = 0; i < rc; i++) if(d[i].mode & DMDIR) addproc(atoi(d[i].name)); @@ -123,17 +123,17 @@ readout(char *file) int fd, rc, i, n; char b[512]; - fd = open(file, OREAD); + fd = sys_open(file, OREAD); if(fd < 0) return -1; n = 0; - while((rc = read(fd, b, sizeof b)) > 0){ + while((rc = jehanne_read(fd, b, sizeof b)) > 0){ for(i=0; i 0) return; snprint(b, sizeof(b), "%d/status", pid); - fd = open(b, OREAD); + fd = sys_open(b, OREAD); if(fd >= 0){ memset(b, 0, sizeof b); - if(read(fd, b, 27) > 0){ + if(jehanne_read(fd, b, 27) > 0){ p = b + strlen(b); while(p > b && p[-1] == ' ') *--p = 0; Bprint(&bout, "%s", b); } - close(fd); + sys_close(fd); } } diff --git a/sys/src/cmd/ramfs.c b/sys/src/cmd/ramfs.c index 441bc6c..dda23af 100644 --- a/sys/src/cmd/ramfs.c +++ b/sys/src/cmd/ramfs.c @@ -157,8 +157,8 @@ notifyf(void *a, char *s) { USED(a); if(strncmp(s, "interrupt", 9) == 0) - noted(NCONT); - noted(NDFLT); + sys_noted(NCONT); + sys_noted(NDFLT); } void @@ -214,13 +214,13 @@ main(int argc, char *argv[]) if(fd < 0) error("create failed"); sprint(buf, "%d", p[1]); - if(write(fd, buf, strlen(buf)) < 0) + if(jehanne_write(fd, buf, strlen(buf)) < 0) error("writing service file"); } } user = getuser(); - notify(notifyf); + sys_notify(notifyf); nram = 1; r = &ram[0]; r->busy = 1; @@ -242,16 +242,16 @@ main(int argc, char *argv[]) fmtinstall('F', fcallfmt); fmtinstall('M', dirmodefmt); } - switch(rfork(RFFDG|RFPROC|RFNAMEG|RFNOTEG)){ + switch(sys_rfork(RFFDG|RFPROC|RFNAMEG|RFNOTEG)){ case -1: error("fork"); case 0: - close(p[1]); + sys_close(p[1]); io(); break; default: - close(p[0]); /* don't deadlock if child fails */ - if(defmnt && mount(p[1], -1, defmnt, MREPL|MCREATE, "", '9') < 0) + sys_close(p[0]); /* don't deadlock if child fails */ + if(defmnt && sys_mount(p[1], -1, defmnt, MREPL|MCREATE, "", '9') < 0) error("mount failed"); } exits(0); @@ -799,13 +799,13 @@ io(void) pid = getpid(); if(private){ snprint(buf, sizeof buf, "/proc/%d/ctl", pid); - ctl = open(buf, OWRITE); + ctl = sys_open(buf, OWRITE); if(ctl < 0){ fprint(2, "can't protect ramfs\n"); }else{ fprint(ctl, "noswap\n"); fprint(ctl, "private\n"); - close(ctl); + sys_close(ctl); } } @@ -852,7 +852,7 @@ io(void) n = convS2M(&rhdr, mdata, messagesize); if(n == 0) error("convS2M error on write"); - if(write(mfd[1], mdata, n) != n) + if(jehanne_write(mfd[1], mdata, n) != n) error("mount write"); } } diff --git a/sys/src/cmd/rc/exec.c b/sys/src/cmd/rc/exec.c index af821f0..8c513b6 100644 --- a/sys/src/cmd/rc/exec.c +++ b/sys/src/cmd/rc/exec.c @@ -277,7 +277,7 @@ Xappend(void) break; } file = runq->argv->words->word; - if((f = open(file, OWRITE))<0 && (f = Creat(file))<0){ + if((f = sys_open(file, OWRITE))<0 && (f = Creat(file))<0){ pfmt(err, "%s: ", file); Xerror("can't open"); return; @@ -394,7 +394,7 @@ Xread(void) break; } file = runq->argv->words->word; - if((f = open(file, OREAD))<0){ + if((f = sys_open(file, OREAD))<0){ pfmt(err, "%s: ", file); Xerror("can't open"); return; @@ -421,7 +421,7 @@ Xrdwr(void) break; } file = runq->argv->words->word; - if((f = open(file, ORDWR))<0){ + if((f = sys_open(file, ORDWR))<0){ pfmt(err, "%s: ", file); Xerror("can't open"); return; @@ -446,7 +446,7 @@ Xpopredir(void) panic("turfredir null!", 0); runq->redir = rp->next; if(rp->type==ROPEN) - close(rp->from); + sys_close(rp->from); free(rp); } diff --git a/sys/src/cmd/rc/exec.h b/sys/src/cmd/rc/exec.h index d2fdfa3..5cb4d44 100644 --- a/sys/src/cmd/rc/exec.h +++ b/sys/src/cmd/rc/exec.h @@ -45,9 +45,9 @@ struct redir{ /* * redir types */ -#define ROPEN 1 /* dup2(from, to); close(from); */ +#define ROPEN 1 /* dup2(from, to); sys_close(from); */ #define RDUP 2 /* dup2(from, to); */ -#define RCLOSE 3 /* close(from); */ +#define RCLOSE 3 /* sys_close(from); */ struct thread{ union code *code; /* code for this thread */ int pc; /* code[pc] is the next instruction */ diff --git a/sys/src/cmd/rc/havefork.c b/sys/src/cmd/rc/havefork.c index 6012b0d..c4ff54a 100644 --- a/sys/src/cmd/rc/havefork.c +++ b/sys/src/cmd/rc/havefork.c @@ -16,7 +16,7 @@ void Xasync(void) { - int null = open("/dev/null", OREAD); + int null = sys_open("/dev/null", OREAD); int pid; char npid[10]; @@ -25,9 +25,9 @@ Xasync(void) return; } Updenv(); - switch(pid = rfork(RFFDG|RFPROC|RFNOTEG)){ + switch(pid = sys_rfork(RFFDG|RFPROC|RFNOTEG)){ case -1: - close(null); + sys_close(null); Xerror("try again"); break; case 0: @@ -38,7 +38,7 @@ Xasync(void) break; default: addwaitpid(pid); - close(null); + sys_close(null); runq->pc = runq->code[runq->pc].i; inttoascii(npid, pid); setvar(ENV_APID, newword(npid, (word *)0)); @@ -68,13 +68,13 @@ Xpipe(void) clearwaitpids(); start(p->code, pc+2, runq->local); runq->ret = 0; - close(pfd[PRD]); + sys_close(pfd[PRD]); pushredir(ROPEN, pfd[PWR], lfd); break; default: addwaitpid(forkid); start(p->code, p->code[pc].i, runq->local); - close(pfd[PWR]); + sys_close(pfd[PWR]); pushredir(ROPEN, pfd[PRD], rfd); p->pc = p->code[pc+1].i; p->pid = forkid; @@ -107,18 +107,18 @@ Xbackq(void) switch(pid = fork()){ case -1: Xerror("try again"); - close(pfd[PRD]); - close(pfd[PWR]); + sys_close(pfd[PRD]); + sys_close(pfd[PWR]); return; case 0: clearwaitpids(); - close(pfd[PRD]); + sys_close(pfd[PRD]); start(runq->code, runq->pc+1, runq->local); pushredir(ROPEN, pfd[PWR], 1); return; default: addwaitpid(pid); - close(pfd[PWR]); + sys_close(pfd[PWR]); f = openfd(pfd[PRD]); s = wd = ewd = 0; v = 0; @@ -187,13 +187,13 @@ Xpipefd(void) case 0: clearwaitpids(); start(p->code, pc+2, runq->local); - close(mainfd); + sys_close(mainfd); pushredir(ROPEN, sidefd, p->code[pc].i==READ?1:0); runq->ret = 0; break; default: addwaitpid(pid); - close(sidefd); + sys_close(sidefd); pushredir(ROPEN, mainfd, mainfd); /* isn't this a noop? */ strcpy(name, Fdprefix); inttoascii(name+strlen(name), mainfd); @@ -242,7 +242,7 @@ execforkexec(void) execexec(); strcpy(buf, "can't exec: "); n = strlen(buf); - errstr(buf+n, ERRMAX-n); + sys_errstr(buf+n, ERRMAX-n); Exit(buf); } addwaitpid(pid); diff --git a/sys/src/cmd/rc/io.c b/sys/src/cmd/rc/io.c index afe3647..7b7ca93 100644 --- a/sys/src/cmd/rc/io.c +++ b/sys/src/cmd/rc/io.c @@ -51,7 +51,7 @@ pfmt(io *f, char *fmt, ...) pwrd(f, va_arg(ap, char *)); break; case 'r': - errstr(err, sizeof err); pstr(f, err); + sys_errstr(err, sizeof err); pstr(f, err); break; case 's': pstr(f, va_arg(ap, char *)); @@ -236,7 +236,7 @@ opencore(char *s, int len) io *f = new(struct io); uint8_t *buf = emalloc(len); - f->fd = -1 /*open("/dev/null", OREAD)*/; + f->fd = -1 /*sys_open("/dev/null", OREAD)*/; f->bufp = f->strp = buf; f->ebuf = buf+len; memmove(buf, s, len); @@ -258,7 +258,7 @@ void closeio(io *io) { if(io->fd >= 0) - close(io->fd); + sys_close(io->fd); if(io->strp) free(io->strp); free(io); diff --git a/sys/src/cmd/rc/jehanne.c b/sys/src/cmd/rc/jehanne.c index e5a247f..b1a9470 100644 --- a/sys/src/cmd/rc/jehanne.c +++ b/sys/src/cmd/rc/jehanne.c @@ -101,7 +101,7 @@ execnewpgrp(void) poplist(); return; } - if(rfork(arg)==-1){ + if(sys_rfork(arg)==-1){ pfmt(err, "rc: %s failed\n", runq->argv->words->word); setstatus("rfork failed"); } @@ -119,7 +119,7 @@ Vinit(void) word *val; Dir *ent; - dir = open("/env", OREAD); + dir = sys_open("/env", OREAD); if(dir<0){ pfmt(err, "rc: can't open /env: %r\n"); return; @@ -133,7 +133,7 @@ Vinit(void) len = ent[i].length; if(len && strncmp(ent[i].name, "fn#", 3)!=0){ snprint(envname, sizeof envname, "/env/%s", ent[i].name); - if((f = open(envname, OREAD))>=0){ + if((f = sys_open(envname, OREAD))>=0){ buf = emalloc(len+1); n = readn(f, buf, len); if (n <= 0) @@ -160,14 +160,14 @@ Vinit(void) } setvar(ent[i].name, val); vlook(ent[i].name)->changed = 0; - close(f); + sys_close(f); free(buf); } } } free(ent); } - close(dir); + sys_close(dir); } void @@ -176,7 +176,7 @@ Xrdfn(void) if(runq->argv->words == 0) poplist(); else { - int f = open(runq->argv->words->word, OREAD); + int f = sys_open(runq->argv->words->word, OREAD); popword(); runq->pc--; if(f >= 0) @@ -228,7 +228,7 @@ Waitfor(int pid, int n) free(w); } - errstr(errbuf, sizeof errbuf); + sys_errstr(errbuf, sizeof errbuf); if(strcmp(errbuf, "interrupted")==0) return -1; return 0; } @@ -259,15 +259,15 @@ addenv(var *v) if(strcmp(ENV_PATH, v->name) == 0 || strcmp(ENV_CDPATH, v->name) == 0){ for(w = v->val; w != nil; w = w->next){ - write(f, w->word, strlen(w->word)); + jehanne_write(f, w->word, strlen(w->word)); if(w->next) - write(f, ":", 1); + jehanne_write(f, ":", 1); } } else { for(w = v->val; w != nil; w = w->next) - write(f, w->word, strlen(w->word)+1L); + jehanne_write(f, w->word, strlen(w->word)+1L); } - close(f); + sys_close(f); } } if(v->fnchanged){ @@ -331,7 +331,7 @@ Execute(word *args, word *path) file[nc++] = '/'; } memmove(file+nc, argv[1], mc); - exec(file, argv+1); + sys_exec(file, argv+1); } rerrstr(file, sizeof file); setstatus(file); @@ -369,7 +369,7 @@ Opendir(char *name) { Dir *db; int f; - f = open(name, OREAD); + f = sys_open(name, OREAD); if(f==-1) return f; db = dirfstat(f); @@ -382,7 +382,7 @@ Opendir(char *name) return f; } free(db); - close(f); + sys_close(f); return -1; } @@ -443,7 +443,7 @@ Closedir(int f) dir[f].n = 0; dir[f].dbuf = 0; } - close(f); + sys_close(f); } int interrupted = 0; void @@ -455,7 +455,7 @@ notifyf(void* v, char *s) goto Out; } pfmt(err, "rc: note: %s\n", s); - noted(NDFLT); + sys_noted(NDFLT); return; Out: if(strcmp(s, "interrupt")!=0 || trap[i]==0){ @@ -466,37 +466,37 @@ Out: pfmt(err, "rc: Too many traps (trap %s), aborting\n", s); abort(); } - noted(NCONT); + sys_noted(NCONT); } void Trapinit(void) { - notify(notifyf); + sys_notify(notifyf); } void Unlink(char *name) { - remove(name); + sys_remove(name); } int Write(int fd, void *buf, int cnt) { - return write(fd, buf, cnt); + return jehanne_write(fd, buf, cnt); } int Read(int fd, void *buf, int cnt) { - return read(fd, buf, cnt); + return jehanne_read(fd, buf, cnt); } int Seek(int fd, int cnt, int whence) { - return seek(fd, cnt, whence); + return sys_seek(fd, cnt, whence); } int @@ -557,7 +557,7 @@ Isatty(int fd) char buf[64]; int l; - if(fd2path(fd, buf, sizeof buf) != 0) + if(sys_fd2path(fd, buf, sizeof buf) != 0) return 0; /* might be #c/cons during boot - fixed 22 april 2005, remove this later */ diff --git a/sys/src/cmd/rc/lex.c b/sys/src/cmd/rc/lex.c index bce20ce..1a815b5 100644 --- a/sys/src/cmd/rc/lex.c +++ b/sys/src/cmd/rc/lex.c @@ -104,10 +104,10 @@ pprompt(void) if(newwdir){ char dir[4096]; int fd; - if((fd=open("/dev/wdir", OWRITE))>=0){ + if((fd=sys_open("/dev/wdir", OWRITE))>=0){ getwd(dir, sizeof(dir)); - write(fd, dir, strlen(dir)); - close(fd); + jehanne_write(fd, dir, strlen(dir)); + sys_close(fd); } newwdir = 0; } diff --git a/sys/src/cmd/rc/simple.c b/sys/src/cmd/rc/simple.c index db91dfd..c2b15b6 100644 --- a/sys/src/cmd/rc/simple.c +++ b/sys/src/cmd/rc/simple.c @@ -90,14 +90,14 @@ doredir(redir *rp) case ROPEN: if(rp->from!=rp->to){ Dup(rp->from, rp->to); - close(rp->from); + sys_close(rp->from); } break; case RDUP: Dup(rp->from, rp->to); break; case RCLOSE: - close(rp->from); + sys_close(rp->from); break; } } @@ -351,7 +351,7 @@ execdot(void) else file = estrdup(zero); - fd = open(file, OREAD); + fd = sys_open(file, OREAD); free(file); if(fd >= 0) break; diff --git a/sys/src/cmd/rio/fsys.c b/sys/src/cmd/rio/fsys.c index 66ccde2..8b7f90f 100644 --- a/sys/src/cmd/rio/fsys.c +++ b/sys/src/cmd/rio/fsys.c @@ -110,7 +110,7 @@ post(char *name, char *envname, int srvfd) if(fd < 0) error(name); snprint(buf, sizeof(buf), "%d", srvfd); - if(write(fd, buf, strlen(buf)) != strlen(buf)) + if(jehanne_write(fd, buf, strlen(buf)) != strlen(buf)) error("srv write"); putenv(envname, name); } @@ -123,11 +123,11 @@ int cexecpipe(int *p0, int *p1) { /* pipe the hard way to get close on exec */ - if(bind("#|", "/mnt/temp", MREPL) < 0) + if(sys_bind("#|", "/mnt/temp", MREPL) < 0) return -1; - *p0 = open("/mnt/temp/data", ORDWR); - *p1 = open("/mnt/temp/data1", ORDWR|OCEXEC); - unmount(nil, "/mnt/temp"); + *p0 = sys_open("/mnt/temp/data", ORDWR); + *p1 = sys_open("/mnt/temp/data1", ORDWR|OCEXEC); + sys_unmount(nil, "/mnt/temp"); if(*p0<0 || *p1<0) return -1; return 0; @@ -145,14 +145,14 @@ filsysinit(Channel *cxfidalloc) if(cexecpipe(&fs->cfd, &fs->sfd) < 0) goto Rescue; fmtinstall('F', fcallfmt); - clockfd = open("/dev/time", OREAD|OCEXEC); - fd = open("/dev/user", OREAD); + clockfd = sys_open("/dev/time", OREAD|OCEXEC); + fd = sys_open("/dev/user", OREAD); strcpy(buf, "Jean-Paul_Belmondo"); if(fd >= 0){ - n = read(fd, buf, sizeof buf-1); + n = jehanne_read(fd, buf, sizeof buf-1); if(n > 0) buf[n] = 0; - close(fd); + sys_close(fd); } fs->user = estrdup(buf); fs->csyncflush = chancreate(sizeof(int), 0); @@ -168,7 +168,7 @@ filsysinit(Channel *cxfidalloc) goto Rescue; snprint(srvwctl, sizeof(srvwctl), "/srv/riowctl.%s.%d", fs->user, pid); post(srvwctl, "wctl", p0); - close(p0); + sys_close(p0); /* * Start server processes @@ -252,13 +252,13 @@ filsysmount(Filsys *fs, int id) { char buf[32]; - close(fs->sfd); /* close server end so mount won't hang if exiting */ + sys_close(fs->sfd); /* close server end so mount won't hang if exiting */ sprint(buf, "%d", id); - if(mount(fs->cfd, -1, "/mnt/wsys", MREPL, buf, '9') < 0){ + if(sys_mount(fs->cfd, -1, "/mnt/wsys", MREPL, buf, '9') < 0){ fprint(2, "mount failed: %r\n"); return -1; } - if(bind("/mnt/wsys", "/dev", MBEFORE) < 0){ + if(sys_bind("/mnt/wsys", "/dev", MBEFORE) < 0){ fprint(2, "bind failed: %r\n"); return -1; } @@ -282,7 +282,7 @@ filsysrespond(Filsys *fs, Xfid *x, Fcall *t, char *err) n = convS2M(t, x->buf, messagesize); if(n <= 0) error("convert error in convS2M"); - if(write(fs->sfd, x->buf, n) != n) + if(jehanne_write(fs->sfd, x->buf, n) != n) error("write error in respond"); if(debug) fprint(2, "rio:->%F\n", t); @@ -714,8 +714,8 @@ getclock(void) { char buf[32]; - seek(clockfd, 0, 0); - read(clockfd, buf, sizeof buf); + sys_seek(clockfd, 0, 0); + jehanne_read(clockfd, buf, sizeof buf); return atoi(buf); } diff --git a/sys/src/cmd/rio/rio.c b/sys/src/cmd/rio/rio.c index 3de1fa3..09428c2 100644 --- a/sys/src/cmd/rio/rio.c +++ b/sys/src/cmd/rio/rio.c @@ -191,10 +191,10 @@ threadmain(int argc, char *argv[]) s = getenv(ENV_CPUTYPE); if(s){ snprint(buf, sizeof(buf), "/arch/%s/aux/rio", s); - bind(buf, "/cmd", MBEFORE); + sys_bind(buf, "/cmd", MBEFORE); free(s); } - bind("/arch/rc/aux/rio", "/cmd", MBEFORE); + sys_bind("/arch/rc/aux/rio", "/cmd", MBEFORE); /* check font before barging ahead */ if(access(fontname, 0) < 0){ @@ -203,7 +203,7 @@ threadmain(int argc, char *argv[]) } putenv("font", fontname); - snarffd = open("/dev/snarf", OREAD|OCEXEC); + snarffd = sys_open("/dev/snarf", OREAD|OCEXEC); gotscreen = access("/dev/screen", AEXIST)==0; if(geninitdraw(nil, derror, nil, "rio", nil, Refnone) < 0){ @@ -271,7 +271,7 @@ putsnarf(void) if(snarffd<0 || nsnarf==0) return; - fd = open("/dev/snarf", OWRITE); + fd = sys_open("/dev/snarf", OWRITE); if(fd < 0) return; /* snarf buffer could be huge, so fprint will truncate; do it in blocks */ @@ -282,7 +282,7 @@ putsnarf(void) if(fprint(fd, "%.*S", n, snarf+i) < 0) break; } - close(fd); + sys_close(fd); } void @@ -295,14 +295,14 @@ getsnarf(void) return; sn = nil; i = 0; - seek(snarffd, 0, 0); + sys_seek(snarffd, 0, 0); for(;;){ if(i > MAXSNARF) break; if((s = realloc(sn, i+1024+1)) == nil) break; sn = s; - if((n = read(snarffd, sn+i, 1024)) <= 0) + if((n = jehanne_read(snarffd, sn+i, 1024)) <= 0) break; i += n; } @@ -320,7 +320,7 @@ initcmd(void *arg) char *cmd; cmd = arg; - rfork(RFENVG|RFFDG|RFNOTEG|RFNAMEG); + sys_rfork(RFENVG|RFFDG|RFNOTEG|RFNAMEG); procexecl(nil, "/cmd/rc", "rc", "-c", cmd, nil); fprint(2, "rio: exec failed: %r\n"); exits("exec"); @@ -360,7 +360,7 @@ killprocs(void) for(i=0; inotefd >= 0) - write(window[i]->notefd, "hangup", 6); + jehanne_write(window[i]->notefd, "hangup", 6); } void @@ -1257,11 +1257,11 @@ kbdproc(void *arg) threadsetname("kbdproc"); - if((fd = open("/dev/cons", OREAD)) < 0){ + if((fd = sys_open("/dev/cons", OREAD)) < 0){ chanprint(c, "%r"); return; } - if((cfd = open("/dev/consctl", OWRITE)) < 0){ + if((cfd = sys_open("/dev/consctl", OWRITE)) < 0){ chanprint(c, "%r"); return; } @@ -1270,14 +1270,14 @@ kbdproc(void *arg) if(sendp(c, nil) <= 0) return; - if((kfd = open("/dev/kbd", OREAD)) >= 0){ - close(fd); + if((kfd = sys_open("/dev/kbd", OREAD)) >= 0){ + sys_close(fd); /* only serve a kbd file per window when we got one */ servekbd = 1; /* read kbd state */ - while((n = read(kfd, buf, sizeof(buf)-1)) > 0){ + while((n = jehanne_read(kfd, buf, sizeof(buf)-1)) > 0){ e = buf+n; e[-1] = 0; e[0] = 0; @@ -1291,7 +1291,7 @@ kbdproc(void *arg) Rune r; e = buf + sizeof(buf); - if((n = read(fd, p, e-p)) <= 0) + if((n = jehanne_read(fd, p, e-p)) <= 0) break; e = p + n; while(p < e && fullrune(p, e - p)){ diff --git a/sys/src/cmd/rio/time.c b/sys/src/cmd/rio/time.c index ffd056a..54189a8 100644 --- a/sys/src/cmd/rio/time.c +++ b/sys/src/cmd/rio/time.c @@ -56,7 +56,7 @@ timerproc(void* _) Timer **t, *x; uint32_t old, new; - rfork(RFFDG); + sys_rfork(RFFDG); threadsetname("TIMERPROC"); t = nil; na = 0; diff --git a/sys/src/cmd/rio/wctl.c b/sys/src/cmd/rio/wctl.c index 382f02f..7b379e7 100644 --- a/sys/src/cmd/rio/wctl.c +++ b/sys/src/cmd/rio/wctl.c @@ -535,7 +535,7 @@ wctlproc(void *v) eofs = 0; for(;;){ buf = emalloc(messagesize); - n = read(wctlfd, buf, messagesize-1); /* room for \0 */ + n = jehanne_read(wctlfd, buf, messagesize-1); /* room for \0 */ if(n < 0) break; if(n == 0){ diff --git a/sys/src/cmd/rio/wind.c b/sys/src/cmd/rio/wind.c index 15a671a..18c360c 100644 --- a/sys/src/cmd/rio/wind.c +++ b/sys/src/cmd/rio/wind.c @@ -91,7 +91,7 @@ wsetname(Window *w) for(i='A'; i<='Z'; i++){ if(nameimage(w->i, w->name, 1) > 0) return; - errstr(err, sizeof err); + sys_errstr(err, sizeof err); if(strcmp(err, "image name in use") != 0) break; w->name[n] = i; @@ -468,8 +468,8 @@ interruptproc(void *v) int *notefd; notefd = v; - write(*notefd, "interrupt", 9); - close(*notefd); + jehanne_write(*notefd, "interrupt", 9); + sys_close(*notefd); free(notefd); } @@ -1216,7 +1216,7 @@ wctlmesg(Window *w, int m, Rectangle r, void *p) case Deleted: wclunk(w); if(w->notefd >= 0) - write(w->notefd, "hangup", 6); + jehanne_write(w->notefd, "hangup", 6); if(w->i!=nil){ proccreate(deletetimeoutproc, estrdup(w->name), 4096); wclosewin(w); @@ -1226,7 +1226,7 @@ wctlmesg(Window *w, int m, Rectangle r, void *p) wclosewin(w); frclear(&w->frame, TRUE); if(w->notefd >= 0) - close(w->notefd); + sys_close(w->notefd); chanfree(w->mc.c); chanfree(w->ck); chanfree(w->cctl); @@ -1439,10 +1439,10 @@ wsetpid(Window *w, int pid, int dolabel) w->label = estrdup(buf); } snprint(buf, sizeof(buf), "/proc/%d/notepg", pid); - w->notefd = open(buf, OWRITE|OCEXEC); + w->notefd = sys_open(buf, OWRITE|OCEXEC); } if(ofd >= 0) - close(ofd); + sys_close(ofd); } void @@ -1460,31 +1460,31 @@ winshell(void *args) cmd = arg[2]; argv = arg[3]; dir = arg[4]; - rfork(RFNAMEG|RFFDG|RFENVG); + sys_rfork(RFNAMEG|RFFDG|RFENVG); if(filsysmount(filsys, w->id) < 0){ fprint(2, "mount failed: %r\n"); sendul(pidc, 0); threadexits("mount failed"); } - close(0); - if(open("/dev/cons", OREAD) < 0){ + sys_close(0); + if(sys_open("/dev/cons", OREAD) < 0){ fprint(2, "can't open /dev/cons: %r\n"); sendul(pidc, 0); threadexits("/dev/cons"); } - close(1); - if(open("/dev/cons", OWRITE) < 0){ + sys_close(1); + if(sys_open("/dev/cons", OWRITE) < 0){ fprint(2, "can't open /dev/cons: %r\n"); sendul(pidc, 0); threadexits("open"); /* BUG? was terminate() */ } if(wclose(w) == 0){ /* remove extra ref hanging from creation */ - notify(nil); + sys_notify(nil); dup(1, 2); if(dir) chdir(dir); procexec(pidc, cmd, argv); - _exits("exec failed"); + sys__exits("exec failed"); } } diff --git a/sys/src/cmd/rio/xfid.c b/sys/src/cmd/rio/xfid.c index 21ef223..e20d599 100644 --- a/sys/src/cmd/rio/xfid.c +++ b/sys/src/cmd/rio/xfid.c @@ -818,7 +818,7 @@ xfidread(Xfid *x) } if(n < 0){ buf[0] = 0; - errstr(buf, sizeof buf); + sys_errstr(buf, sizeof buf); filsysrespond(x->fs, x, &fc, buf); }else{ fc.count = n; diff --git a/sys/src/cmd/rm.c b/sys/src/cmd/rm.c index 27b32e2..a128c3e 100644 --- a/sys/src/cmd/rm.c +++ b/sys/src/cmd/rm.c @@ -21,7 +21,7 @@ err(long e, char *f) print("%s %ulld\n", f, e); } else if(!ignerr){ errbuf[0] = '\0'; - errstr(errbuf, sizeof errbuf); + sys_errstr(errbuf, sizeof errbuf); fprint(2, "rm: %s: %s\n", f, errbuf); } } @@ -37,13 +37,13 @@ rmdir(char *f) int fd, i, j, n, ndir, nname; Dir *dirbuf; - fd = open(f, OREAD); + fd = sys_open(f, OREAD); if(fd < 0){ err(-1, f); return; } n = dirreadall(fd, &dirbuf); - close(fd); + sys_close(fd); if(n < 0){ err(-1, "dirreadall"); return; @@ -59,7 +59,7 @@ rmdir(char *f) ndir = 0; for(i=0; i 0){ - n = read(fd, p+m, Maxblock); + n = jehanne_read(fd, p+m, Maxblock); if(n < 0){ error(Ebufload); break; diff --git a/sys/src/cmd/sam/cmd.c b/sys/src/cmd/sam/cmd.c index d028e1d..61e66b1 100644 --- a/sys/src/cmd/sam/cmd.c +++ b/sys/src/cmd/sam/cmd.c @@ -102,7 +102,7 @@ inputc(void) terminp = termoutp = termline; }else{ do{ - n = read(0, buf+nbuf, 1); + n = jehanne_read(0, buf+nbuf, 1); if(n <= 0) return -1; nbuf += n; diff --git a/sys/src/cmd/sam/disk.c b/sys/src/cmd/sam/disk.c index d5d4ded..6737f3b 100644 --- a/sys/src/cmd/sam/disk.c +++ b/sys/src/cmd/sam/disk.c @@ -110,7 +110,7 @@ diskwrite(Disk *d, Block **bp, Rune *r, uint n) b = disknewblock(d, n); *bp = b; } - if(pwrite(d->fd, r, n*sizeof(Rune), b->addr) != n*sizeof(Rune)) + if(sys_pwrite(d->fd, r, n*sizeof(Rune), b->addr) != n*sizeof(Rune)) panic("write error to temp file"); b->n = n; } @@ -122,6 +122,6 @@ diskread(Disk *d, Block *b, Rune *r, uint n) panic("internal error: diskread"); ntosize(b->n, nil); /* called only for sanity check on Maxblock */ - if(pread(d->fd, r, n*sizeof(Rune), b->addr) != n*sizeof(Rune)) + if(sys_pread(d->fd, r, n*sizeof(Rune), b->addr) != n*sizeof(Rune)) panic("read error from temp file"); } diff --git a/sys/src/cmd/sam/io.c b/sys/src/cmd/sam/io.c index 4cad30e..48ab4f0 100644 --- a/sys/src/cmd/sam/io.c +++ b/sys/src/cmd/sam/io.c @@ -100,7 +100,7 @@ readio(File *f, int *nulls, int setdate, int toterm) if(toterm) raspload(f); }else - for(nt = 0; (n = read(io, buf+b, BLOCKSIZE-b))>0; nt+=(r-genbuf)){ + for(nt = 0; (n = jehanne_read(io, buf+b, BLOCKSIZE-b))>0; nt+=(r-genbuf)){ n += b; b = 0; r = genbuf; @@ -175,7 +175,7 @@ writeio(File *f) void closeio(Posn p) { - close(io); + sys_close(io); io = 0; if(p >= 0) dprint("#%lud\n", p); @@ -192,13 +192,13 @@ bootterm(char *machine, char **argv) if(machine){ dup(remotefd0, 0); dup(remotefd1, 1); - close(remotefd0); - close(remotefd1); + sys_close(remotefd0); + sys_close(remotefd1); argv[0] = "samterm"; - exec(samterm, argv); + sys_exec(samterm, argv); fprint(2, "can't exec: "); perror(samterm); - _exits("damn"); + sys__exits("damn"); } if(pipe(ph2t)==-1 || pipe(pt2h)==-1) panic("pipe"); @@ -206,24 +206,24 @@ bootterm(char *machine, char **argv) case 0: dup(ph2t[0], 0); dup(pt2h[1], 1); - close(ph2t[0]); - close(ph2t[1]); - close(pt2h[0]); - close(pt2h[1]); + sys_close(ph2t[0]); + sys_close(ph2t[1]); + sys_close(pt2h[0]); + sys_close(pt2h[1]); argv[0] = "samterm"; - exec(samterm, argv); + sys_exec(samterm, argv); fprint(2, "can't exec: "); perror(samterm); - _exits("damn"); + sys__exits("damn"); case -1: panic("can't fork samterm"); } dup(pt2h[0], 0); dup(ph2t[1], 1); - close(ph2t[0]); - close(ph2t[1]); - close(pt2h[0]); - close(pt2h[1]); + sys_close(ph2t[0]); + sys_close(ph2t[1]); + sys_close(pt2h[0]); + sys_close(pt2h[1]); } void @@ -259,11 +259,11 @@ connectto(char *machine, char **argv) case 0: dup(p2[0], 0); dup(p1[1], 1); - close(p1[0]); - close(p1[1]); - close(p2[0]); - close(p2[1]); - exec(RXPATH, av); + sys_close(p1[0]); + sys_close(p1[1]); + sys_close(p2[0]); + sys_close(p2[1]); + sys_exec(RXPATH, av); dprint("can't exec %s\n", RXPATH); exits("exec"); @@ -272,8 +272,8 @@ connectto(char *machine, char **argv) exits("fork"); } free(av); - close(p1[1]); - close(p2[0]); + sys_close(p1[1]); + sys_close(p2[0]); } void diff --git a/sys/src/cmd/sam/mesg.c b/sys/src/cmd/sam/mesg.c index c24c731..eac3afa 100644 --- a/sys/src/cmd/sam/mesg.c +++ b/sys/src/cmd/sam/mesg.c @@ -131,7 +131,7 @@ rcvchar(void){ static int i, nleft = 0; if(nleft <= 0){ - nleft = read(0, (char *)buf, sizeof buf); + nleft = jehanne_read(0, (char *)buf, sizeof buf); if(nleft <= 0) return -1; i = 0; @@ -822,7 +822,7 @@ outsend(void) outmsg = outp; if(!outbuffered){ outcount = outmsg-outdata; - if (write(1, (char*) outdata, outcount) != outcount) + if (jehanne_write(1, (char*) outdata, outcount) != outcount) rescue(); outmsg = outdata; return; diff --git a/sys/src/cmd/sam/plan9.c b/sys/src/cmd/sam/plan9.c index b58ac68..2facde5 100644 --- a/sys/src/cmd/sam/plan9.c +++ b/sys/src/cmd/sam/plan9.c @@ -106,12 +106,12 @@ notifyf(void *a, char *s) { USED(a); if(bpipeok && strcmp(s, "sys: write on closed pipe") == 0) - noted(NCONT); + sys_noted(NCONT); if(strcmp(s, "interrupt") == 0) - noted(NCONT); + sys_noted(NCONT); panicking = 1; rescue(); - noted(NDFLT); + sys_noted(NDFLT); } char* diff --git a/sys/src/cmd/sam/sam.c b/sys/src/cmd/sam/sam.c index dd80f52..57f7299 100644 --- a/sys/src/cmd/sam/sam.c +++ b/sys/src/cmd/sam/sam.c @@ -89,7 +89,7 @@ void main(int argc, char *argv[]) home = "/"; if(!dflag) startup(machine, Rflag, termargs, argv); - notify(notifyf); + sys_notify(notifyf); getcurwd(); if(argc>0){ for(i=0; i 0) - close(io); + sys_close(io); /* * back out any logged changes & restore old sequences @@ -343,7 +343,7 @@ edit(File *f, int cmd) addr.r.p2 = f->Buffer.nc; }else if(f->Buffer.nc!=0 || (f->name.s[0] && Strcmp(&genstr, &f->name)!=0)) empty = FALSE; - if((io = open(genc, OREAD))<0) { + if((io = sys_open(genc, OREAD))<0) { if (curfile && curfile->unread) curfile->unread = FALSE; error_r(Eopen, genc); @@ -517,9 +517,9 @@ cd(String *str) s = home; if(chdir(s)) syserror("chdir"); - fd = open("/dev/wdir", OWRITE); + fd = sys_open("/dev/wdir", OWRITE); if(fd > 0) - write(fd, s, strlen(s)); + jehanne_write(fd, s, strlen(s)); dprint("!\n"); Strinit(&owd); Strduplstr(&owd, &curwd); diff --git a/sys/src/cmd/sam/shell.c b/sys/src/cmd/sam/shell.c index 1e2923b..d117abd 100644 --- a/sys/src/cmd/sam/shell.c +++ b/sys/src/cmd/sam/shell.c @@ -33,7 +33,7 @@ plan9(File *f, int type, String *s, int nest) Strduplstr(&plan9cmd, s); if(downloaded){ samerr(errfile); - remove(errfile); + sys_remove(errfile); } if(type!='!' && pipe(pipe1)==-1) error(Epipe); @@ -45,15 +45,15 @@ plan9(File *f, int type, String *s, int nest) if(fd < 0) fd = ocreate("/dev/null", OWRITE, 0666L); dup(fd, 2); - close(fd); + sys_close(fd); /* 2 now points at err file */ if(type == '>') dup(2, 1); else if(type=='!'){ dup(2, 1); - fd = open("/dev/null", OREAD); + fd = sys_open("/dev/null", OREAD); dup(fd, 0); - close(fd); + sys_close(fd); } } if(type != '!') { @@ -61,8 +61,8 @@ plan9(File *f, int type, String *s, int nest) dup(pipe1[1], 1); else if(type == '>') dup(pipe1[0], 0); - close(pipe1[0]); - close(pipe1[1]); + sys_close(pipe1[0]); + sys_close(pipe1[1]); } if(type == '|'){ if(pipe(pipe2) == -1) @@ -71,7 +71,7 @@ plan9(File *f, int type, String *s, int nest) /* * It's ok if we get SIGPIPE here */ - close(pipe2[0]); + sys_close(pipe2[0]); io = pipe2[1]; if(retcode=!setjmp(mainloop)){ /* assignment = */ char *c; @@ -93,12 +93,12 @@ plan9(File *f, int type, String *s, int nest) exits("fork"); } dup(pipe2[0], 0); - close(pipe2[0]); - close(pipe2[1]); + sys_close(pipe2[0]); + sys_close(pipe2[1]); } if(type=='<'){ - close(0); /* so it won't read from terminal */ - open("/dev/null", OREAD); + sys_close(0); /* so it won't read from terminal */ + sys_open("/dev/null", OREAD); } execl(SHPATH, SH, "-c", Strtoc(&plan9cmd), nil); exits("exec"); @@ -111,14 +111,14 @@ plan9(File *f, int type, String *s, int nest) outTl(Hsnarflen, addr.r.p2-addr.r.p1); snarf(f, addr.r.p1, addr.r.p2, &snarfbuf, 0); logdelete(f, addr.r.p1, addr.r.p2); - close(pipe1[1]); + sys_close(pipe1[1]); io = pipe1[0]; f->tdot.p1 = -1; f->ndot.r.p2 = addr.r.p2+readio(f, &nulls, 0, FALSE); f->ndot.r.p1 = addr.r.p2; closeio((Posn)-1); }else if(type=='>'){ - close(pipe1[0]); + sys_close(pipe1[0]); io = pipe1[1]; bpipeok = 1; writeio(f); @@ -145,8 +145,8 @@ checkerrs(void) long l; if(statfile(errfile, 0, 0, 0, &l, 0) > 0 && l != 0){ - if((f=open((char *)errfile, OREAD)) != -1){ - if((n=read(f, buf, sizeof buf-1)) > 0){ + if((f=sys_open((char *)errfile, OREAD)) != -1){ + if((n=jehanne_read(f, buf, sizeof buf-1)) > 0){ for(nl=0,p=buf; nl<3 && p<&buf[n]; p++) if(*p=='\n') nl++; @@ -155,8 +155,8 @@ checkerrs(void) if(p-buf < l-1) dprint("(sam: more in %s)\n", errfile); } - close(f); + sys_close(f); } }else - remove((char *)errfile); + sys_remove((char *)errfile); } diff --git a/sys/src/cmd/sam/sys.c b/sys/src/cmd/sam/sys.c index 91e3445..0775f03 100644 --- a/sys/src/cmd/sam/sys.c +++ b/sys/src/cmd/sam/sys.c @@ -28,7 +28,7 @@ syserror(char *a) if(!inerror){ inerror=TRUE; - errstr(buf, sizeof buf); + sys_errstr(buf, sizeof buf); dprint("%s: ", a); error_s(Eio, buf); } @@ -39,10 +39,10 @@ Read(int f, void *a, int n) { char buf[ERRMAX]; - if(read(f, (char *)a, n)!=n) { + if(jehanne_read(f, (char *)a, n)!=n) { if (lastfile) lastfile->rescuing = 1; - errstr(buf, sizeof buf); + sys_errstr(buf, sizeof buf); if (downloaded) fprint(2, "read error: %s\n", buf); rescue(); @@ -56,7 +56,7 @@ Write(int f, void *a, int n) { int m; - if((m=write(f, (char *)a, n))!=n) + if((m=jehanne_write(f, (char *)a, n))!=n) syserror("write"); return m; } @@ -64,6 +64,6 @@ Write(int f, void *a, int n) void Seek(int f, long n, int w) { - if(seek(f, n, w)==-1) + if(sys_seek(f, n, w)==-1) syserror("seek"); } diff --git a/sys/src/cmd/samterm/mesg.c b/sys/src/cmd/samterm/mesg.c index d000a15..281004c 100644 --- a/sys/src/cmd/samterm/mesg.c +++ b/sys/src/cmd/samterm/mesg.c @@ -519,7 +519,7 @@ outsend(void) panic("outcount>sizeof outdata"); outdata[1]=outcount; outdata[2]=outcount>>8; - if(write(1, (char *)outdata, outcount+HSIZE)!=outcount+HSIZE) + if(jehanne_write(1, (char *)outdata, outcount+HSIZE)!=outcount+HSIZE) panic("write error"); } @@ -660,7 +660,7 @@ hsetsnarf(int nc) s1[n] = 0; snarflen = n; outTs(Tsetsnarf, n); - if(n>0 && write(1, s1, n)!=n) + if(n>0 && jehanne_write(1, s1, n)!=n) panic("snarf write error"); jehanne_free(s1); }else diff --git a/sys/src/cmd/samterm/plan9.c b/sys/src/cmd/samterm/plan9.c index e119999..3ec338b 100644 --- a/sys/src/cmd/samterm/plan9.c +++ b/sys/src/cmd/samterm/plan9.c @@ -65,11 +65,11 @@ screensize(int *w, int *h) int fd, n; char buf[5*12+1]; - fd = open("/dev/screen", OREAD); + fd = sys_open("/dev/screen", OREAD); if(fd < 0) return 0; - n = read(fd, buf, sizeof(buf)-1); - close(fd); + n = jehanne_read(fd, buf, sizeof(buf)-1); + sys_close(fd); if (n != sizeof(buf)-1) return 0; buf[n] = 0; @@ -92,15 +92,15 @@ snarfswap(char *fromsam, int nc, char **tosam) char *s1; int f, n, ss; - f = open("/dev/snarf", 0); + f = sys_open("/dev/snarf", 0); if(f < 0) return -1; ss = SNARFSIZE; if(hversion < 2) ss = 4096; *tosam = s1 = alloc(ss); - n = read(f, s1, ss-1); - close(f); + n = jehanne_read(f, s1, ss-1); + sys_close(f); if(n < 0) n = 0; if (n == 0) { @@ -110,8 +110,8 @@ snarfswap(char *fromsam, int nc, char **tosam) s1[n] = 0; f = jehanne_ocreate("/dev/snarf", OWRITE, 0666); if(f >= 0){ - write(f, fromsam, nc); - close(f); + jehanne_write(f, fromsam, nc); + sys_close(f); } return n; } @@ -126,7 +126,7 @@ dumperrmsg(int count, int type, int count0, int c) void removeextern(void) { - remove(exname); + sys_remove(exname); } Readbuf hostbuf[2]; @@ -146,7 +146,7 @@ extproc(void *argv) i = 0; for(;;){ i = 1-i; /* toggle */ - n = read(*fdp, plumbbuf[i].data, sizeof plumbbuf[i].data); + n = jehanne_read(*fdp, plumbbuf[i].data, sizeof plumbbuf[i].data); if(n <= 0){ jehanne_fprint(2, "samterm: extern read error: %r\n"); threadexits("extern"); /* not a fatal error */ @@ -171,14 +171,14 @@ extstart(void) fd = jehanne_ocreate(exname, OWRITE, 0600); if(fd < 0){ /* assume existing guy is more important */ Err: - close(p[0]); - close(p[1]); + sys_close(p[0]); + sys_close(p[1]); return; } jehanne_sprint(buf, "%d", p[0]); - if(write(fd, buf, jehanne_strlen(buf)) <= 0) + if(jehanne_write(fd, buf, jehanne_strlen(buf)) <= 0) goto Err; - close(fd); + sys_close(fd); /* * leave p[0] open so if the file is removed the event * library won't get an error @@ -248,7 +248,7 @@ plumbproc(void *argv) i = 0; for(;;){ i = 1-i; /* toggle */ - n = read(*fdp, plumbbuf[i].data, READBUFSIZE); + n = jehanne_read(*fdp, plumbbuf[i].data, READBUFSIZE); if(n <= 0){ jehanne_fprint(2, "samterm: plumb read error: %r\n"); threadexits("plumb"); /* not a fatal error */ @@ -273,7 +273,7 @@ plumbstart(void) return -1; plumbc = chancreate(sizeof(int), 0); if(plumbc == nil){ - close(fd); + sys_close(fd); return -1; } arg[0] =plumbc; @@ -293,7 +293,7 @@ hostproc(void *arg) i = 0; for(;;){ i = 1-i; /* toggle */ - n = read(0, hostbuf[i].data, sizeof hostbuf[i].data); + n = jehanne_read(0, hostbuf[i].data, sizeof hostbuf[i].data); if(n <= 0){ if(n==0){ if(exiting) diff --git a/sys/src/cmd/sed.c b/sys/src/cmd/sed.c index 0aa519b..ef41a68 100644 --- a/sys/src/cmd/sed.c +++ b/sys/src/cmd/sed.c @@ -615,7 +615,7 @@ open_file(char *name) if ((bp = malloc(sizeof(Biobuf))) == 0) quit("Out of memory"); - if ((fd = open(name, OWRITE)) < 0 && + if ((fd = sys_open(name, OWRITE)) < 0 && (fd = ocreate(name, OWRITE, 0666)) < 0) quit("Cannot create %s", name); Binit(bp, fd, OWRITE); @@ -1389,7 +1389,7 @@ quit(char *fmt, ...) p = vseprint(p, ep, fmt, arg); va_end(arg); p = seprint(p, ep, "\n"); - write(2, msg, p - msg); + jehanne_write(2, msg, p - msg); errexit(); } diff --git a/sys/src/cmd/seq.c b/sys/src/cmd/seq.c index 8e2faac..d7ec779 100644 --- a/sys/src/cmd/seq.c +++ b/sys/src/cmd/seq.c @@ -96,7 +96,7 @@ main(int argc, char *argv[]){ if(constant) for(j=0; buf[j]==' '; j++) buf[j] ='0'; - write(1, buf, n); + jehanne_write(1, buf, n); } }else{ for(val = min; val >= max; val += incr){ @@ -104,7 +104,7 @@ main(int argc, char *argv[]){ if(constant) for(j=0; buf[j]==' '; j++) buf[j] ='0'; - write(1, buf, n); + jehanne_write(1, buf, n); } } exits(0); diff --git a/sys/src/cmd/sort.c b/sys/src/cmd/sort.c index 52fa1d1..126fe12 100644 --- a/sys/src/cmd/sort.c +++ b/sys/src/cmd/sort.c @@ -154,7 +154,7 @@ main(int argc, char *argv[]) char *s; Biobuf bbuf; - notify(notifyf); /**/ + sys_notify(notifyf); /**/ doargs(argc, argv); if(args.vflag) printargs(); @@ -169,7 +169,7 @@ main(int argc, char *argv[]) Bterm(&bbuf); continue; } - f = open(s, OREAD); + f = sys_open(s, OREAD); if(f < 0) { fprint(2, "sort: open %s: %r\n", s); done("open"); @@ -177,7 +177,7 @@ main(int argc, char *argv[]) Binit(&bbuf, f, OREAD); dofile(&bbuf); Bterm(&bbuf); - close(f); + sys_close(f); } if(args.nfile == 0) { Binit(&bbuf, 0, OREAD); @@ -350,7 +350,7 @@ tempout(void) } args.nline = 0; Bterm(&tb); - close(f); + sys_close(f); } void @@ -359,7 +359,7 @@ done(char *xs) int i; for(i=0; ib); - close(m->fd); + sys_close(m->fd); } free(mp); @@ -1462,7 +1462,7 @@ buildkey(Line *l) k->klen = cl; if(args.vflag) { - if(write(2, l->line, l->llen) != l->llen) + if(jehanne_write(2, l->line, l->llen) != l->llen) exits("write"); for(i=0; iklen; i++) { fprint(2, " %.2x", k->key[i]); diff --git a/sys/src/cmd/split.c b/sys/src/cmd/split.c index 07dd7ef..54aa50f 100644 --- a/sys/src/cmd/split.c +++ b/sys/src/cmd/split.c @@ -161,7 +161,7 @@ openf(void) Bflush(output); Bterm(output); if(fd > 0) - close(fd); + sys_close(fd); fd = ocreate(name,OWRITE,0666); if(fd < 0) { fprint(2, "grep: can't create %s: %r\n", name); diff --git a/sys/src/cmd/srv.c b/sys/src/cmd/srv.c index ae17252..415c39c 100644 --- a/sys/src/cmd/srv.c +++ b/sys/src/cmd/srv.c @@ -43,9 +43,9 @@ ignore(void *a, char *c) } if(strstr(c, "write on closed pipe") == 0){ fprint(2, "write on closed pipe\n"); - noted(NCONT); + sys_noted(NCONT); } - noted(NDFLT); + sys_noted(NDFLT); } int @@ -58,17 +58,17 @@ connectcmd(char *cmd) switch(fork()){ case -1: fprint(2, "fork failed: %r\n"); - _exits("exec"); + sys__exits("exec"); case 0: - rfork(RFNOTEG); + sys_rfork(RFNOTEG); dup(p[0], 0); dup(p[0], 1); - close(p[1]); + sys_close(p[1]); execl("/cmd/rc", "rc", "-c", cmd, nil); fprint(2, "exec failed: %r\n"); - _exits("exec"); + sys__exits("exec"); default: - close(p[0]); + sys_close(p[0]); return p[1]; } } @@ -83,7 +83,7 @@ main(int argc, char *argv[]) char *p, *p2; int domount, reallymount, try, sleeptime; - notify(ignore); + sys_notify(ignore); domount = 0; reallymount = 0; @@ -169,10 +169,10 @@ Again: if(access(srv, AEXIST) == 0){ if(domount){ - fd = open(srv, ORDWR); + fd = sys_open(srv, ORDWR); if(fd >= 0) goto Mount; - remove(srv); + sys_remove(srv); } else{ fprint(2, "srv: %s already exists\n", srv); @@ -180,7 +180,7 @@ Again: } } - alarm(10000); + sys_alarm(10000); if(doexec) fd = connectcmd(dest); else{ @@ -191,7 +191,7 @@ Again: fprint(2, "srv: dial %s: %r\n", dest); exits("dial"); } - alarm(0); + sys_alarm(0); if(sleeptime){ fprint(2, "sleep..."); @@ -204,12 +204,12 @@ Mount: if(domount == 0 || reallymount == 0) exits(0); - if((!doauth && mount(fd, -1, mtpt, mountflag, "", '9') < 0) + if((!doauth && sys_mount(fd, -1, mtpt, mountflag, "", '9') < 0) || (doauth && amount(fd, mtpt, mountflag, "") < 0)){ err[0] = 0; - errstr(err, sizeof err); + sys_errstr(err, sizeof err); if(strstr(err, "Hangup") || strstr(err, "hungup") || strstr(err, "timed out")){ - remove(srv); + sys_remove(srv); if(try == 1) goto Again; } @@ -228,11 +228,11 @@ post(char *srv, int fd) fprint(2, "post...\n"); f = ocreate(srv, OWRITE, 0666); if(f < 0){ - sprint(buf, "create(%s)", srv); + sprint(buf, "sys_create(%s)", srv); error(buf); } sprint(buf, "%d", fd); - if(write(f, buf, strlen(buf)) != strlen(buf)) + if(jehanne_write(f, buf, strlen(buf)) != strlen(buf)) error("write"); } diff --git a/sys/src/cmd/srvfs.c b/sys/src/cmd/srvfs.c index 5c965c9..b5b1d37 100644 --- a/sys/src/cmd/srvfs.c +++ b/sys/src/cmd/srvfs.c @@ -57,27 +57,27 @@ main(int argc, char **argv) exits("pipe"); } - switch(rfork(RFPROC|RFNOWAIT|RFNOTEG|RFFDG)){ + switch(sys_rfork(RFPROC|RFNOWAIT|RFNOTEG|RFFDG)){ case -1: fprint(2, "can't rfork: %r\n"); exits("rfork"); case 0: dup(pipefd[0], 0); dup(pipefd[0], 1); - close(pipefd[0]); - close(pipefd[1]); - exec(ename, arglist); + sys_close(pipefd[0]); + sys_close(pipefd[1]); + sys_exec(ename, arglist); fprint(2, "can't exec exportfs: %r\n"); exits("exec"); default: break; } - close(pipefd[0]); + sys_close(pipefd[0]); if(fprint(pipefd[1], "%s", argv[1]) < 0){ fprint(2, "can't write pipe: %r\n"); exits("write"); } - n = read(pipefd[1], buf, sizeof buf-1); + n = jehanne_read(pipefd[1], buf, sizeof buf-1); if(n < 0){ fprint(2, "can't read pipe: %r\n"); exits("read"); @@ -97,7 +97,7 @@ main(int argc, char **argv) exits("create"); } fprint(fd, "%d", pipefd[1]); - close(fd); - close(pipefd[1]); + sys_close(fd); + sys_close(pipefd[1]); exits(0); } diff --git a/sys/src/cmd/stats.c b/sys/src/cmd/stats.c index a9c0207..87efbee 100644 --- a/sys/src/cmd/stats.c +++ b/sys/src/cmd/stats.c @@ -300,10 +300,10 @@ loadbuf(Machine *m, int *fd) if(*fd < 0) return 0; - seek(*fd, 0, 0); - n = read(*fd, m->buf, sizeof m->buf-1); + sys_seek(*fd, 0, 0); + n = jehanne_read(*fd, m->buf, sizeof m->buf-1); if(n <= 0){ - close(*fd); + sys_close(*fd); *fd = -1; return 0; } @@ -570,12 +570,12 @@ initmach(Machine *m, char *name) } snprint(buf, sizeof buf, "%s/dev/sysmem", mpt); - m->sysmemfd = open(buf, OREAD); + m->sysmemfd = sys_open(buf, OREAD); if(loadbuf(m, &m->sysmemfd) && readsysmem(m, a)) memmove(m->devsysmem, a, sizeof m->devsysmem); snprint(buf, sizeof buf, "%s/dev/sysstat", mpt); - m->statsfd = open(buf, OREAD); + m->statsfd = sys_open(buf, OREAD); if(loadbuf(m, &m->statsfd)){ for(n=0; readnums(m, nelem(m->devsysstat), a, 0); n++) ; @@ -585,12 +585,12 @@ initmach(Machine *m, char *name) m->lgproc = ilog10(m->nproc); snprint(buf, sizeof buf, "%s/net/ether0/stats", mpt); - m->etherfd = open(buf, OREAD); + m->etherfd = sys_open(buf, OREAD); if(loadbuf(m, &m->etherfd) && readnums(m, nelem(m->netetherstats), a, 1)) memmove(m->netetherstats, a, sizeof m->netetherstats); snprint(buf, sizeof buf, "%s/net/ether0/ifstats", mpt); - m->ifstatsfd = open(buf, OREAD); + m->ifstatsfd = sys_open(buf, OREAD); if(loadbuf(m, &m->ifstatsfd)){ /* need to check that this is a wavelan interface */ if(strncmp(m->buf, "Signal: ", 8) == 0 && readnums(m, nelem(m->netetherifstats), a, 1)) @@ -598,19 +598,19 @@ initmach(Machine *m, char *name) } snprint(buf, sizeof buf, "%s/mnt/apm/battery", mpt); - m->batteryfd = open(buf, OREAD); + m->batteryfd = sys_open(buf, OREAD); m->bitsybatfd = -1; if(m->batteryfd >= 0){ if(loadbuf(m, &m->batteryfd) && readnums(m, nelem(m->batterystats), a, 0)) memmove(m->batterystats, a, sizeof(m->batterystats)); }else{ snprint(buf, sizeof buf, "%s/dev/battery", mpt); - m->bitsybatfd = open(buf, OREAD); + m->bitsybatfd = sys_open(buf, OREAD); if(loadbuf(m, &m->bitsybatfd) && readnums(m, 1, a, 0)) memmove(m->batterystats, a, sizeof(m->batterystats)); } snprint(buf, sizeof buf, "%s/dev/cputemp", mpt); - m->tempfd = open(buf, OREAD); + m->tempfd = sys_open(buf, OREAD); if(loadbuf(m, &m->tempfd)) for(n=0; n < nelem(m->temp) && readnums(m, 2, a, 0); n++) m->temp[n] = a[0]; @@ -691,7 +691,7 @@ readmach(Machine *m, int init) } if(m->remote){ atnotify(alarmed, 1); - alarm(5000); + sys_alarm(5000); } if(needsysmem(init) && loadbuf(m, &m->sysmemfd) && readsysmem(m, a)) memmove(m->devsysmem, a, sizeof m->devsysmem); @@ -717,7 +717,7 @@ readmach(Machine *m, int init) for(n=0; n < nelem(m->temp) && readnums(m, 2, a, 0); n++) m->temp[n] = a[0]; if(m->remote){ - alarm(0); + sys_alarm(0); atnotify(alarmed, 0); } } @@ -1206,7 +1206,7 @@ startproc(void (*f)(void), int index) { int pid; - switch(pid = rfork(RFPROC|RFMEM|RFNOWAIT)){ + switch(pid = sys_rfork(RFPROC|RFMEM|RFNOWAIT)){ case -1: fprint(2, "stats: fork failed: %r\n"); killall("fork failed"); @@ -1274,7 +1274,7 @@ main(int argc, char *argv[]) initmach(&mach[0], mysysname); readmach(&mach[0], 1); }else{ - rfork(RFNAMEG); + sys_rfork(RFNAMEG); for(i=j=0; ipid = r->pid; sendp(quit, s); if(r->tfd >= 0) - close(r->tfd); + sys_close(r->tfd); if(r->cfd >= 0) - close(r->cfd); + sys_close(r->cfd); threadexits(nil); } void cwrite(Reader *r, char *cmd, int ignore_errors) { - if (write(r->cfd, cmd, strlen(cmd)) < 0 && !ignore_errors) + if (jehanne_write(r->cfd, cmd, strlen(cmd)) < 0 && !ignore_errors) die(r); } @@ -85,18 +85,18 @@ reader(void *v) r.msg = s = mallocz(sizeof(Msg), 1); snprint(s->buf, sizeof(s->buf), "/proc/%d/ctl", r.pid); - if ((r.cfd = open(s->buf, OWRITE)) < 0) + if ((r.cfd = sys_open(s->buf, OWRITE)) < 0) die(&r); snprint(s->buf, sizeof(s->buf), "/proc/%d/syscall", r.pid); - if ((r.tfd = open(s->buf, OREAD)) < 0) + if ((r.tfd = sys_open(s->buf, OREAD)) < 0) die(&r); StartReading: cwrite(&r, "stop", 0); cwrite(&r, "startsyscall", 0); - wakeup = awake(750); - while((n = pread(r.tfd, s->buf, sizeof(s->buf)-1, 0)) > 0){ + wakeup = sys_awake(750); + while((n = sys_pread(r.tfd, s->buf, sizeof(s->buf)-1, 0)) > 0){ forgivewkp(wakeup); if(strstr(s->buf, " rfork ") != nil){ rf = strdup(s->buf); @@ -118,7 +118,7 @@ StartReading: r.msg = s = mallocz(sizeof(Msg), 1); cwrite(&r, "startsyscall", 1); - wakeup = awake(500); + wakeup = sys_awake(500); } if(awakened(wakeup)){ rf = smprint("/proc/%d/status", r.pid); @@ -159,14 +159,14 @@ writer(int lastpid) lastpid = s->pid; if(lastc != '\n'){ lastc = '\n'; - write(output, &lastc, 1); + jehanne_write(output, &lastc, 1); } if(s->buf[1] == '=') fprint(output, "%d ...", lastpid); } n = strlen(s->buf); if(n > 0){ - write(output, s->buf, n); + jehanne_write(output, s->buf, n); lastc = s->buf[n-1]; } free(s); @@ -235,10 +235,10 @@ ParseArguments: if (pid < 0) sysfatal("fork failed: %r"); if(pid == 0) { - write(open(smprint("/proc/%d/ctl", getpid()), OWRITE|OCEXEC), "hang", 4); - exec(cmd, args); + jehanne_write(sys_open(smprint("/proc/%d/ctl", getpid()), OWRITE|OCEXEC), "hang", 4); + sys_exec(cmd, args); if(cmd[0] != '/') - exec(smprint("/cmd/%s", cmd), args); + sys_exec(smprint("/cmd/%s", cmd), args); sysfatal("exec %s failed: %r", cmd); } } else { diff --git a/sys/src/cmd/tail.c b/sys/src/cmd/tail.c index ee10e7b..40e9785 100644 --- a/sys/src/cmd/tail.c +++ b/sys/src/cmd/tail.c @@ -99,7 +99,7 @@ main(int argc, char **argv) count--; if(argc > 2) usage(); - if(argc > 1 && (file=open(argv[1], OREAD)) < 0) + if(argc > 1 && (file=sys_open(argv[1], OREAD)) < 0) fatal(argv[1]); seekable = isseekable(file); @@ -316,7 +316,7 @@ reverse(void) int64_t tseek(int64_t o, int p) { - o = seek(file, o, p); + o = sys_seek(file, o, p); if(o == -1) fatal(""); return o; @@ -325,7 +325,7 @@ tseek(int64_t o, int p) int32_t tread(char *buf, int32_t n) { - int r = read(file, buf, n); + int r = jehanne_read(file, buf, n); if(r == -1) fatal(""); return r; @@ -362,7 +362,7 @@ fatal(char *s) { char buf[ERRMAX]; - errstr(buf, sizeof buf); + sys_errstr(buf, sizeof buf); fprint(2, "tail: %s: %s\n", s, buf); exits(s); } @@ -383,7 +383,7 @@ isseekable(int fd) { int64_t m; - m = seek(fd, 0, 1); + m = sys_seek(fd, 0, 1); if(m < 0) return 0; return 1; diff --git a/sys/src/cmd/tar.c b/sys/src/cmd/tar.c index f93f418..fc90507 100644 --- a/sys/src/cmd/tar.c +++ b/sys/src/cmd/tar.c @@ -187,7 +187,7 @@ cope(char *name, int fd, void *buf, int32_t len, Off off) /* pretend we read len bytes of zeroes */ memset(buf, 0, len); if (off >= 0) /* seekable? */ - seek(fd, off + len, 0); + sys_seek(fd, off + len, 0); return len; } @@ -197,8 +197,8 @@ eread(char *name, int fd, void *buf, int32_t len) int rd; Off off; - off = seek(fd, 0, 1); /* for coping with errors */ - rd = read(fd, buf, len); + off = sys_seek(fd, 0, 1); /* for coping with errors */ + rd = jehanne_read(fd, buf, len); if (rd < 0) rd = cope(name, fd, buf, len, off); return rd; @@ -210,7 +210,7 @@ ereadn(char *name, int fd, void *buf, int32_t len) int rd; Off off; - off = seek(fd, 0, 1); + off = sys_seek(fd, 0, 1); rd = readn(fd, buf, len); if (rd < 0) rd = cope(name, fd, buf, len, off); @@ -223,7 +223,7 @@ ewrite(char *name, int fd, void *buf, int32_t len) int rd; werrstr(""); - rd = write(fd, buf, len); + rd = jehanne_write(fd, buf, len); if (rd != len) sysfatal("error writing %s: %r", name); return rd; @@ -275,7 +275,7 @@ push(int fd, char *cmd, int input, Pushstate *ps) dup(pifds[Wr], Stdout); else dup(pifds[Rd], Stdin); - close(pifds[input? Rd: Wr]); + sys_close(pifds[input? Rd: Wr]); dup(fd, (input? Stdin: Stdout)); s = s_new(); if (cmd[0] != '/') @@ -285,7 +285,7 @@ push(int fd, char *cmd, int input, Pushstate *ps) sysfatal("can't exec %s: %r", cmd); default: nfd = pifds[input? Rd: Wr]; - close(pifds[input? Wr: Rd]); + sys_close(pifds[input? Wr: Rd]); break; } ps->rfd = nfd; @@ -300,7 +300,7 @@ pushclose(Pushstate *ps) if (ps->fd < 0 || ps->rfd < 0 || !ps->open) return "not open"; - close(ps->rfd); + sys_close(ps->rfd); ps->rfd = -1; ps->open = 0; while ((wm = wait()) != nil && wm->pid != ps->kid) @@ -335,7 +335,7 @@ refill(int ar, char *bufs, int justhdr) if (done) return nil; - blkoff = seek(ar, 0, 1); /* note position for `tar r' */ + blkoff = sys_seek(ar, 0, 1); /* note position for `tar r' */ if (first) seekable = blkoff >= 0; /* try to size non-pipe input at first read */ @@ -355,7 +355,7 @@ refill(int ar, char *bufs, int justhdr) } } else if (justhdr && seekable && nexthdr - blkoff >= bytes) { /* optimisation for huge archive members on seekable media */ - if (seek(ar, bytes, 1) < 0) + if (sys_seek(ar, bytes, 1) < 0) sysfatal("can't seek on archive %s: %r", arname); n = bytes; } else @@ -782,7 +782,7 @@ addtreetoar(int ar, char *file, char *shortf, int fd) n = dirreadall(fd, &dirents); if (n < 0) fprint(2, "%s: dirreadall %s: %r\n", argv0, file); - close(fd); + sys_close(fd); if (n <= 0) return; @@ -832,7 +832,7 @@ addtoar(int ar, char *file, char *shortf) if (Debug) fprint(2, "opening %s # %s\n", shortf, file); - fd = open(shortf, OREAD); + fd = sys_open(shortf, OREAD); if (fd < 0) { fprint(2, "%s: can't open %s: %r\n", argv0, file); if (name) @@ -848,7 +848,7 @@ addtoar(int ar, char *file, char *shortf) if (mkhdr(hbp, dir, file) < 0) { putbackblk(ar); free(dir); - close(fd); + sys_close(fd); if (name) s_free(name); return; @@ -876,7 +876,7 @@ addtoar(int ar, char *file, char *shortf) memset(hbp->data + n, 0, bytes - n); putblkmany(ar, blksread); } - close(fd); + sys_close(fd); if (verbose) fprint(2, "%s\n", file); } @@ -897,7 +897,7 @@ replace(char **argv) if (usefile && docreate) ar = ocreate(usefile, OWRITE, 0666); else if (usefile) - ar = open(usefile, ORDWR); + ar = sys_open(usefile, ORDWR); else ar = Stdout; if (docreate && docompress) { @@ -924,7 +924,7 @@ replace(char **argv) * now seek back over the (big) archive block containing it, * and back up curblk ptr over end-of-archive Tblock in memory. */ - if (seek(ar, blkoff, 0) < 0) + if (sys_seek(ar, blkoff, 0) < 0) sysfatal("can't seek back over end-of-archive in %s: %r", arname); curblk--; @@ -944,7 +944,7 @@ replace(char **argv) if (comp) return pushclose(&ps); if (ar > Stderr) - close(ar); + sys_close(ar); return nil; } @@ -1018,9 +1018,9 @@ makedir(char *s) if (access(s, AEXIST) == 0) return -1; - f = create(s, OREAD, DMDIR | 0777); + f = sys_create(s, OREAD, DMDIR | 0777); if (f >= 0) - close(f); + sys_close(f); else cantcreate(s, DMDIR); return f; @@ -1050,9 +1050,9 @@ xaccess(char *name, int mode) int rv; err[0] = 0; - errstr(err, sizeof err); + sys_errstr(err, sizeof err); rv = access(name, mode); - errstr(err, sizeof err); + sys_errstr(err, sizeof err); return rv; } @@ -1203,7 +1203,7 @@ extract1(int ar, Hdr *hp, char *fname) */ if (settime) wrmeta(fd, hp, mtime, mode); - close(fd); + sys_close(fd); } } @@ -1274,7 +1274,7 @@ extract(char **argv) Pushstate ps; if (usefile) - ar = open(usefile, OREAD); + ar = sys_open(usefile, OREAD); else ar = Stdin; comp = compmethod(usefile); @@ -1296,7 +1296,7 @@ extract(char **argv) if (comp) return pushclose(&ps); if (ar > Stderr) - close(ar); + sys_close(ar); return nil; } diff --git a/sys/src/cmd/tee.c b/sys/src/cmd/tee.c index 8058e4d..6996638 100644 --- a/sys/src/cmd/tee.c +++ b/sys/src/cmd/tee.c @@ -54,10 +54,10 @@ main(int argc, char **argv) n = 0; while(*argv) { if(aflag) { - openf[n] = open(argv[0], OWRITE); + openf[n] = sys_open(argv[0], OWRITE); if(openf[n] < 0) openf[n] = ocreate(argv[0], OWRITE, 0666); - seek(openf[n], 0L, 2); + sys_seek(openf[n], 0L, 2); } else openf[n] = ocreate(argv[0], OWRITE, 0666); if(openf[n] < 0) { @@ -69,11 +69,11 @@ main(int argc, char **argv) openf[n++] = 1; for(;;) { - r = read(0, in, sizeof in); + r = jehanne_read(0, in, sizeof in); if(r <= 0) exits(nil); for(i=0; i wbuf) - if (write(fd, wbuf, wptr-wbuf) != wptr-wbuf) + if (jehanne_write(fd, wbuf, wptr-wbuf) != wptr-wbuf) sysfatal("write error: %r"); wptr = wbuf; } diff --git a/sys/src/cmd/uniq.c b/sys/src/cmd/uniq.c index 52239e0..7d1e7ec 100644 --- a/sys/src/cmd/uniq.c +++ b/sys/src/cmd/uniq.c @@ -58,7 +58,7 @@ main(int argc, char *argv[]) argv++; continue; } - f = open(argv[1], OREAD); + f = sys_open(argv[1], OREAD); if(f < 0) sysfatal("cannot open %s", argv[1]); break; diff --git a/sys/src/cmd/unmount.c b/sys/src/cmd/unmount.c index 2c42038..95c2ba5 100644 --- a/sys/src/cmd/unmount.c +++ b/sys/src/cmd/unmount.c @@ -34,7 +34,7 @@ main(int argc, char *argv[]) } /* unmount takes arguments in the same order as mount */ - r = unmount(mnted, mtpt); + r = sys_unmount(mnted, mtpt); if(r < 0) sysfatal("%s: %r", mtpt); exits(0); diff --git a/sys/src/cmd/usb/disk/disk.c b/sys/src/cmd/usb/disk/disk.c index 9429a80..ce48619 100644 --- a/sys/src/cmd/usb/disk/disk.c +++ b/sys/src/cmd/usb/disk/disk.c @@ -233,8 +233,8 @@ static void ding(void * _, char *msg) { if(strstr(msg, "alarm") != nil) - noted(NCONT); - noted(NDFLT); + sys_noted(NCONT); + sys_noted(NDFLT); } #endif @@ -429,7 +429,7 @@ umsrequest(Umsc *umsc, ScsiPtr *cmd, ScsiPtr *data, int *status) } /* issue tunnelled scsi command */ - if(write(ums->epout->dfd, &cbw, CbwLen) != CbwLen){ + if(jehanne_write(ums->epout->dfd, &cbw, CbwLen) != CbwLen){ fprint(2, "disk: cmd: %r\n"); goto Fail; } @@ -438,9 +438,9 @@ umsrequest(Umsc *umsc, ScsiPtr *cmd, ScsiPtr *data, int *status) nio = data->count; if(nio != 0){ if(data->write) - n = write(ums->epout->dfd, data->p, nio); + n = jehanne_write(ums->epout->dfd, data->p, nio); else{ - n = read(ums->epin->dfd, data->p, nio); + n = jehanne_read(ums->epin->dfd, data->p, nio); left = nio - n; if (n >= 0 && left > 0) /* didn't fill data->p? */ memset(data->p + n, 0, left); @@ -457,11 +457,11 @@ umsrequest(Umsc *umsc, ScsiPtr *cmd, ScsiPtr *data, int *status) } /* read the transfer's status */ - n = read(ums->epin->dfd, &csw, CswLen); + n = jehanne_read(ums->epin->dfd, &csw, CswLen); if(n <= 0){ /* n == 0 means "stalled" */ unstall(dev, ums->epin, Ein); - n = read(ums->epin->dfd, &csw, CswLen); + n = jehanne_read(ums->epin->dfd, &csw, CswLen); } if(n != CswLen || strncmp(csw.signature, "USBS", 4) != 0){ diff --git a/sys/src/cmd/usb/disk/scsireq.c b/sys/src/cmd/usb/disk/scsireq.c index d66324d..391f871 100644 --- a/sys/src/cmd/usb/disk/scsireq.c +++ b/sys/src/cmd/usb/disk/scsireq.c @@ -583,7 +583,7 @@ request(int fd, ScsiPtr *cmd, ScsiPtr *data, int *status) *status = STok; /* send SCSI command */ - if(write(fd, cmd->p, cmd->count) != cmd->count){ + if(jehanne_write(fd, cmd->p, cmd->count) != cmd->count){ fprint(2, "scsireq: write cmd: %r\n"); *status = Status_SW; return -1; @@ -591,17 +591,17 @@ request(int fd, ScsiPtr *cmd, ScsiPtr *data, int *status) /* read or write actual data */ werrstr(""); -// alarm(5*1000); +// sys_alarm(5*1000); if(data->write) - n = write(fd, data->p, data->count); + n = jehanne_write(fd, data->p, data->count); else { - n = read(fd, data->p, data->count); + n = jehanne_read(fd, data->p, data->count); if (n < 0) memset(data->p, 0, data->count); else if (n < data->count) memset(data->p + n, 0, data->count - n); } -// alarm(0); +// sys_alarm(0); if (n != data->count && n <= 0) { if (debug) fprint(2, @@ -614,7 +614,7 @@ request(int fd, ScsiPtr *cmd, ScsiPtr *data, int *status) /* read status */ buf[0] = '\0'; - r = read(fd, buf, sizeof buf-1); + r = jehanne_read(fd, buf, sizeof buf-1); if(exabyte && r <= 0 || !exabyte && r < 0){ fprint(2, "scsireq: read status: %r\n"); *status = Status_SW; @@ -826,7 +826,7 @@ SRclose(ScsiReq *rp) rp->status = Status_BADARG; return -1; } - close(rp->fd); + sys_close(rp->fd); rp->flags = 0; return 0; } @@ -951,7 +951,7 @@ SRopenraw(ScsiReq *rp, char *unit) rp->unit = unit; snprint(name, sizeof name, "%s/raw", unit); - if((rp->fd = open(name, ORDWR)) == -1){ + if((rp->fd = sys_open(name, ORDWR)) == -1){ rp->status = STtimeout; return -1; } diff --git a/sys/src/cmd/usb/ether/asix.c b/sys/src/cmd/usb/ether/asix.c index 00cf0e0..3cc5409 100644 --- a/sys/src/cmd/usb/ether/asix.c +++ b/sys/src/cmd/usb/ether/asix.c @@ -234,7 +234,7 @@ asixreceive(Dev *ep) int n; b = allocb(Maxpkt+4); - if((n = read(ep->dfd, b->wp, b->lim - b->base)) < 0){ + if((n = jehanne_read(ep->dfd, b->wp, b->lim - b->base)) < 0){ freeb(b); return -1; } @@ -273,7 +273,7 @@ asixtransmit(Dev *ep, Block *b) PUT4(b->wp, mask); b->wp += 4; } - write(ep->dfd, b->rp, BLEN(b)); + jehanne_write(ep->dfd, b->rp, BLEN(b)); freeb(b); } diff --git a/sys/src/cmd/usb/ether/aue.c b/sys/src/cmd/usb/ether/aue.c index 0ff58b6..805437a 100644 --- a/sys/src/cmd/usb/ether/aue.c +++ b/sys/src/cmd/usb/ether/aue.c @@ -190,7 +190,7 @@ auereceive(Dev *ep) int n; b = allocb(Maxpkt+4); - if((n = read(ep->dfd, b->wp, b->lim - b->base)) < 0){ + if((n = jehanne_read(ep->dfd, b->wp, b->lim - b->base)) < 0){ freeb(b); return -1; } @@ -218,7 +218,7 @@ auetransmit(Dev *ep, Block *b) n = BLEN(b); b->rp -= 2; PUT2(b->rp, n); - write(ep->dfd, b->rp, BLEN(b)); + jehanne_write(ep->dfd, b->rp, BLEN(b)); freeb(b); } diff --git a/sys/src/cmd/usb/ether/cdc.c b/sys/src/cmd/usb/ether/cdc.c index f73270a..df45e41 100644 --- a/sys/src/cmd/usb/ether/cdc.c +++ b/sys/src/cmd/usb/ether/cdc.c @@ -38,7 +38,7 @@ cdcreceive(Dev *ep) int n; b = allocb(Maxpkt); - if((n = read(ep->dfd, b->wp, b->lim - b->base)) < 0){ + if((n = jehanne_read(ep->dfd, b->wp, b->lim - b->base)) < 0){ freeb(b); return -1; } @@ -53,7 +53,7 @@ cdctransmit(Dev *ep, Block *b) int n; n = BLEN(b); - if(write(ep->dfd, b->rp, n) < 0){ + if(jehanne_write(ep->dfd, b->rp, n) < 0){ freeb(b); return; } @@ -66,7 +66,7 @@ cdctransmit(Dev *ep, Block *b) * should do the same? */ if((n % ep->maxpkt) == 0) - write(ep->dfd, "", 0); + jehanne_write(ep->dfd, "", 0); } int diff --git a/sys/src/cmd/usb/ether/rndis.c b/sys/src/cmd/usb/ether/rndis.c index 557e0b6..7e9a52d 100644 --- a/sys/src/cmd/usb/ether/rndis.c +++ b/sys/src/cmd/usb/ether/rndis.c @@ -87,7 +87,7 @@ rndisreceive(Dev *ep) int doff, dlen; b = allocb(Maxpkt); - if((n = read(ep->dfd, b->rp, b->lim - b->base)) >= 0){ + if((n = jehanne_read(ep->dfd, b->rp, b->lim - b->base)) >= 0){ if(n < 44) werrstr("short packet: %d bytes", n); else if(GET4(b->rp) != 1) @@ -123,7 +123,7 @@ rndistransmit(Dev *ep, Block *b) PUT4(b->rp+8, 44-8); /* data offset */ PUT4(b->rp+12, n); /* data length */ memset(b->rp+16, 0, 7*4); - write(ep->dfd, b->rp, 44+n); + jehanne_write(ep->dfd, b->rp, 44+n); freeb(b); } diff --git a/sys/src/cmd/usb/ether/smsc.c b/sys/src/cmd/usb/ether/smsc.c index 1797bc3..c4ab4d7 100644 --- a/sys/src/cmd/usb/ether/smsc.c +++ b/sys/src/cmd/usb/ether/smsc.c @@ -235,7 +235,7 @@ smscreceive(Dev *ep) b = allocb(Hsburst*512); else b = allocb(Maxpkt+4); - if((n = read(ep->dfd, b->wp, b->lim - b->base)) < 0){ + if((n = jehanne_read(ep->dfd, b->wp, b->lim - b->base)) < 0){ freeb(b); return -1; } @@ -268,7 +268,7 @@ smsctransmit(Dev *ep, Block *b) b->rp -= 8; PUT4(b->rp, n | Txfirst | Txlast); PUT4(b->rp+4, n); - write(ep->dfd, b->rp, BLEN(b)); + jehanne_write(ep->dfd, b->rp, BLEN(b)); freeb(b); } diff --git a/sys/src/cmd/usb/ether/url.c b/sys/src/cmd/usb/ether/url.c index eba7c76..56bd290 100644 --- a/sys/src/cmd/usb/ether/url.c +++ b/sys/src/cmd/usb/ether/url.c @@ -268,7 +268,7 @@ urlreceive(Dev *ep) int n; b = allocb(Maxpkt+4); - if((n = read(ep->dfd, b->wp, b->lim - b->base)) < 0){ + if((n = jehanne_read(ep->dfd, b->wp, b->lim - b->base)) < 0){ freeb(b); return -1; } @@ -296,7 +296,7 @@ urltransmit(Dev *ep, Block *b) memset(b->wp, 0, Mfl-n); b->wp += (Mfl-n); } - write(ep->dfd, b->rp, BLEN(b)); + jehanne_write(ep->dfd, b->rp, BLEN(b)); freeb(b); } diff --git a/sys/src/cmd/usb/joy/joy.c b/sys/src/cmd/usb/joy/joy.c index dfd5b76..9828b56 100644 --- a/sys/src/cmd/usb/joy/joy.c +++ b/sys/src/cmd/usb/joy/joy.c @@ -256,11 +256,11 @@ sethipri(void) int fd; snprint(fn, sizeof(fn), "/proc/%d/ctl", getpid()); - fd = open(fn, OWRITE); + fd = sys_open(fn, OWRITE); if(fd < 0) return; fprint(fd, "pri 13"); - close(fd); + sys_close(fd); } typedef struct Joy Joy; @@ -353,7 +353,7 @@ joywork(void *a) kbfatal(f, "joy: weird mouse maxpkt"); memset(p.p, 0, sizeof(p.p)); - c = read(f->ep->dfd, p.p, f->ep->maxpkt); + c = jehanne_read(f->ep->dfd, p.p, f->ep->maxpkt); if(c <= 0){ if(c < 0) rerrstr(err, sizeof(err)); diff --git a/sys/src/cmd/usb/kb/kb.c b/sys/src/cmd/usb/kb/kb.c index 2eab708..d8d6028 100644 --- a/sys/src/cmd/usb/kb/kb.c +++ b/sys/src/cmd/usb/kb/kb.c @@ -373,9 +373,9 @@ static void hdfree(Hiddev *f) { if(f->kinfd >= 0) - close(f->kinfd); + sys_close(f->kinfd); if(f->minfd >= 0) - close(f->minfd); + sys_close(f->minfd); if(f->ep != nil) closedev(f->ep); if(f->dev != nil) @@ -404,7 +404,7 @@ hdrecover(Hiddev *f) int i; if(canqlock(&l)){ - close(f->dev->dfd); + sys_close(f->dev->dfd); devctl(f->dev, "reset"); for(i=0; i<4; i++){ sleep(500); @@ -434,9 +434,9 @@ putscan(Hiddev *f, uint8_t sc, uint8_t up) return; s[1] = up | sc&Keymask; if(isext(sc)) - write(f->kinfd, s, 2); + jehanne_write(f->kinfd, s, 2); else - write(f->kinfd, s+1, 1); + jehanne_write(f->kinfd, s+1, 1); } static void @@ -610,11 +610,11 @@ sethipri(void) int fd; snprint(fn, sizeof(fn), "/proc/%d/ctl", getpid()); - fd = open(fn, OWRITE); + fd = sys_open(fn, OWRITE); if(fd < 0) return; fprint(fd, "pri 13"); - close(fd); + sys_close(fd); } static void @@ -639,7 +639,7 @@ readerproc(void* a) hdfatal(f, "hid: weird maxpkt"); memset(p.p, 0, sizeof(p.p)); - c = read(f->ep->dfd, p.p, f->ep->maxpkt); + c = jehanne_read(f->ep->dfd, p.p, f->ep->maxpkt); if(c <= 0){ if(c < 0) rerrstr(err, sizeof(err)); @@ -667,7 +667,7 @@ readerproc(void* a) } if(f->kinfd < 0){ - f->kinfd = open("/dev/kbin", OWRITE); + f->kinfd = sys_open("/dev/kbin", OWRITE); if(f->kinfd < 0) hdfatal(f, "open /dev/kbin"); @@ -713,13 +713,13 @@ readerproc(void* a) fprint(2, "ptr: b=%x m=%x x=%d y=%d z=%d\n", p.b, p.m, p.x, p.y, p.z); if(f->minfd < 0){ - f->minfd = open("/dev/mousein", OWRITE); + f->minfd = sys_open("/dev/mousein", OWRITE); if(f->minfd < 0) hdfatal(f, "open /dev/mousein"); } seprint(mbuf, mbuf+sizeof(mbuf), "m%11d %11d %11d", p.x, p.y, b); - write(f->minfd, mbuf, strlen(mbuf)); + jehanne_write(f->minfd, mbuf, strlen(mbuf)); lastb = b; } diff --git a/sys/src/cmd/usb/lib/dev.c b/sys/src/cmd/usb/lib/dev.c index 0369a98..35180d8 100644 --- a/sys/src/cmd/usb/lib/dev.c +++ b/sys/src/cmd/usb/lib/dev.c @@ -53,7 +53,7 @@ openep(Dev *d, int id) Usbdev *ud; char name[40]; - if(access("/dev/usb", AEXIST) < 0 && bind("#u", "/dev", MBEFORE) < 0) + if(access("/dev/usb", AEXIST) < 0 && sys_bind("#u", "/dev", MBEFORE) < 0) return nil; if(d->cfd < 0 || d->usb == nil){ werrstr("device not configured"); @@ -116,7 +116,7 @@ opendev(char *fn) Dev *d; int l; - if(access("/dev/usb", AEXIST) < 0 && bind("#u", "/dev", MBEFORE) < 0) + if(access("/dev/usb", AEXIST) < 0 && sys_bind("#u", "/dev", MBEFORE) < 0) return nil; d = emallocz(sizeof(Dev), 1); incref(&d->ref); @@ -132,7 +132,7 @@ opendev(char *fn) d->dir = emallocz(l + 30, 0); strcpy(d->dir, fn); strcpy(d->dir+l, "/ctl"); - d->cfd = open(d->dir, ORDWR|OCEXEC); + d->cfd = sys_open(d->dir, ORDWR|OCEXEC); d->dir[l] = 0; d->id = nameid(fn); if(d->cfd < 0){ @@ -152,7 +152,7 @@ opendevdata(Dev *d, int mode) char buf[80]; /* more than enough for a usb path */ seprint(buf, buf+sizeof(buf), "%s/data", d->dir); - d->dfd = open(buf, mode|OCEXEC); + d->dfd = sys_open(buf, mode|OCEXEC); return d->dfd; } @@ -338,9 +338,9 @@ closedev(Dev *d) if(d->free != nil) d->free(d->aux); if(d->cfd >= 0) - close(d->cfd); + sys_close(d->cfd); if(d->dfd >= 0) - close(d->dfd); + sys_close(d->dfd); d->cfd = d->dfd = -1; free(d->dir); d->dir = nil; @@ -430,7 +430,7 @@ cmdreq(Dev *d, int type, int req, int value, int index, uint8_t *data, int count index, count, ndata+8, hd); free(hd); } - n = write(d->dfd, wp, 8+ndata); + n = jehanne_write(d->dfd, wp, 8+ndata); if(wp != buf) free(wp); if(n < 0) @@ -447,7 +447,7 @@ cmdrep(Dev *d, void *buf, int nb) { char *hd; - nb = read(d->dfd, buf, nb); + nb = jehanne_read(d->dfd, buf, nb); if(nb >0 && usbdebug > 2){ hd = hexstr(buf, nb); fprint(2, "%s: in[%d] %s\n", d->dir, nb, hd); @@ -528,7 +528,7 @@ devctl(Dev *dev, char *fmt, ...) va_start(arg, fmt); e = vseprint(buf, buf+sizeof(buf), fmt, arg); va_end(arg); - return write(dev->cfd, buf, e-buf); + return jehanne_write(dev->cfd, buf, e-buf); } Dev * diff --git a/sys/src/cmd/usb/serial/ftdi.c b/sys/src/cmd/usb/serial/ftdi.c index 175bfe3..259b510 100644 --- a/sys/src/cmd/usb/serial/ftdi.c +++ b/sys/src/cmd/usb/serial/ftdi.c @@ -1280,7 +1280,7 @@ wait4write(Serialport *p, uint8_t *data, int count) fd = p->epout->dfd; qunlock(&ser->ql); - count = write(fd, b, count+off); + count = jehanne_write(fd, b, count+off); qlock(&ser->ql); free(b); return count; @@ -1356,7 +1356,7 @@ epreader(void *u) if (pk == nil) pk = emallocz(sizeof(Packser), 1); Eagain: - rcount = read(dfd, pk->b, sizeof pk->b); + rcount = jehanne_read(dfd, pk->b, sizeof pk->b); if(serialdebug > 5) dsprint(2, "%d %#ux%#ux ", rcount, p->data[0], p->data[1]); diff --git a/sys/src/cmd/usb/serial/prolific.c b/sys/src/cmd/usb/serial/prolific.c index ef9fcc2..bdebea4 100644 --- a/sys/src/cmd/usb/serial/prolific.c +++ b/sys/src/cmd/usb/serial/prolific.c @@ -558,7 +558,7 @@ plreadstatus(Serialport *p) qlock(&ser->ql); dfd = p->epintr->dfd; qunlock(&ser->ql); - nr = read(dfd, buf, sizeof buf); + nr = jehanne_read(dfd, buf, sizeof buf); qlock(&ser->ql); rerrstr(err, sizeof err); if(nr < 0 && strstr(err, "timed out") == nil){ diff --git a/sys/src/cmd/usb/serial/serial.c b/sys/src/cmd/usb/serial/serial.c index 6d00cd4..0c7b545 100644 --- a/sys/src/cmd/usb/serial/serial.c +++ b/sys/src/cmd/usb/serial/serial.c @@ -261,7 +261,7 @@ serialctl(Serialport *p, char *cmd) if(ser->wait4write != nil) nw = ser->wait4write(p, &x, 1); else - nw = write(p->epout->dfd, &x, 1); + nw = jehanne_write(p->epout->dfd, &x, 1); if(nw != 1){ serialrecover(ser, p, p->epout, ""); return -1; @@ -456,11 +456,11 @@ Again: } else { dfd = p->epin->dfd; qunlock(&ser->ql); - rcount = read(dfd, data, count); + rcount = jehanne_read(dfd, data, count); } if(rcount < 0) { err[0] = 0; - errstr(err, sizeof err); + sys_errstr(err, sizeof err); if(p->rq->flush == 0 && strstr(err, "timed out") != nil) goto Again; respond(req, err); @@ -491,11 +491,11 @@ procwrite(Req *req) } else { dfd = p->epout->dfd; qunlock(&ser->ql); - wcount = write(dfd, data, count); + wcount = jehanne_write(dfd, data, count); } if(wcount != count) { err[0] = 0; - errstr(err, sizeof err); + sys_errstr(err, sizeof err); respond(req, err); qlock(&ser->ql); diff --git a/sys/src/cmd/usb/serial/silabs.c b/sys/src/cmd/usb/serial/silabs.c index 8ef1688..9a2c918 100644 --- a/sys/src/cmd/usb/serial/silabs.c +++ b/sys/src/cmd/usb/serial/silabs.c @@ -140,7 +140,7 @@ wait4data(Serialport *p, uint8_t *data, int count) int n; qunlock(&p->s->ql); - while ((n = read(p->epin->dfd, data, count)) == 0) + while ((n = jehanne_read(p->epin->dfd, data, count)) == 0) ; qlock(&p->s->ql); return n; diff --git a/sys/src/cmd/usb/usbd/hub.c b/sys/src/cmd/usb/usbd/hub.c index e721cba..0d2da30 100644 --- a/sys/src/cmd/usb/usbd/hub.c +++ b/sys/src/cmd/usb/usbd/hub.c @@ -158,8 +158,8 @@ configroothub(Hub *h) d = h->dev; h->nport = 2; h->maxpkt = 8; - seek(d->cfd, 0, 0); - nr = read(d->cfd, buf, sizeof(buf)-1); + sys_seek(d->cfd, 0, 0); + nr = jehanne_read(d->cfd, buf, sizeof(buf)-1); if(nr < 0) goto Done; buf[nr] = 0; @@ -402,8 +402,8 @@ portattach(Hub *h, int p, int sts) fprint(2, "%s: %s: port %d: newdev: %r\n", argv0, d->dir, p); goto Fail; } - seek(d->cfd, 0, 0); - nr = read(d->cfd, buf, sizeof(buf)-1); + sys_seek(d->cfd, 0, 0); + nr = jehanne_read(d->cfd, buf, sizeof(buf)-1); if(nr == 0){ fprint(2, "%s: %s: port %d: newdev: eof\n", argv0, d->dir, p); goto Fail; @@ -534,7 +534,7 @@ portresetwanted(Hub *h, int p) pp = &h->port[p]; nd = pp->dev; - if(nd != nil && nd->cfd >= 0 && pread(nd->cfd, buf, 5, 0LL) == 5) + if(nd != nil && nd->cfd >= 0 && sys_pread(nd->cfd, buf, 5, 0LL) == 5) return strncmp(buf, "reset", 5) == 0; else return 0; @@ -583,7 +583,7 @@ portreset(Hub *h, int p) goto Fail; } if(nd->dfd >= 0){ - close(nd->dfd); + sys_close(nd->dfd); nd->dfd = -1; } return; @@ -681,7 +681,7 @@ work(void) int i; hubs = nil; - while((fn = rendezvous(work, nil)) != nil){ + while((fn = sys_rendezvous(work, nil)) != nil){ dprint(2, "%s: %s starting\n", argv0, fn); h = newhub(fn, nil); if(h == nil) diff --git a/sys/src/cmd/usb/usbd/usbd.c b/sys/src/cmd/usb/usbd/usbd.c index 631b93b..eb9f1e2 100644 --- a/sys/src/cmd/usb/usbd/usbd.c +++ b/sys/src/cmd/usb/usbd/usbd.c @@ -410,7 +410,7 @@ attachdev(Port *p) } /* close control endpoint so driver can open it */ - close(d->dfd); + sys_close(d->dfd); d->dfd = -1; /* assign stable name based on device descriptor */ @@ -448,7 +448,7 @@ checkidle(void) if(busyfd < 0 || reqlast == nil || evlast == nil || evlast->prev > 0) return; - close(busyfd); + sys_close(busyfd); busyfd = -1; } @@ -470,30 +470,30 @@ main(int argc, char **argv) busyfd = ocreate("/env/usbbusy", ORCLOSE, 0600); quotefmtinstall(); initevent(); - rfork(RFNOTEG); - switch(rfork(RFPROC|RFMEM|RFNOWAIT)){ + sys_rfork(RFNOTEG); + switch(sys_rfork(RFPROC|RFMEM|RFNOWAIT)){ case -1: sysfatal("rfork: %r"); case 0: work(); exits(nil); } if(argc == 0){ - if((fd = open("/dev/usb", OREAD)) < 0){ - rendezvous(work, nil); + if((fd = sys_open("/dev/usb", OREAD)) < 0){ + sys_rendezvous(work, nil); sysfatal("/dev/usb: %r"); } nd = dirreadall(fd, &d); - close(fd); + sys_close(fd); if(nd < 2){ - rendezvous(work, nil); + sys_rendezvous(work, nil); sysfatal("/dev/usb: no hubs"); } for(i = 0; i < nd; i++) if(strcmp(d[i].name, "ctl") != 0) - rendezvous(work, smprint("/dev/usb/%s", d[i].name)); + sys_rendezvous(work, smprint("/dev/usb/%s", d[i].name)); free(d); }else for(i = 0; i < argc; i++) - rendezvous(work, estrdup9p(argv[i])); - rendezvous(work, nil); + sys_rendezvous(work, estrdup9p(argv[i])); + sys_rendezvous(work, nil); postsharesrv(&usbdsrv, nil, "usb", "usbd"); exits(nil); } diff --git a/sys/src/cmd/vt/main.c b/sys/src/cmd/vt/main.c index d2a8c82..cd808f5 100644 --- a/sys/src/cmd/vt/main.c +++ b/sys/src/cmd/vt/main.c @@ -163,14 +163,14 @@ runcmd(void *args) char **argv = args; char *cmd; - rfork(RFNAMEG); + sys_rfork(RFNAMEG); mountcons(); - rfork(RFFDG); - close(0); - open("/dev/cons", OREAD); - close(1); - open("/dev/cons", OWRITE); + sys_rfork(RFFDG); + sys_close(0); + sys_open("/dev/cons", OREAD); + sys_close(1); + sys_open("/dev/cons", OWRITE); dup(1, 2); cmd = nil; @@ -250,7 +250,7 @@ threadmain(int argc, char **argv) break; case 'l': p = EARGF(usage()); - logfd = create(p, OWRITE|OCEXEC, 0666); + logfd = sys_create(p, OWRITE|OCEXEC, 0666); if(logfd < 0) sysfatal("could not create log file: %s: %r", p); break; @@ -850,12 +850,12 @@ setdim(int ht, int wid) exportsize(); - fd = open("/dev/wctl", OWRITE); + fd = sys_open("/dev/wctl", OWRITE); if(fd >= 0){ ht = (ymax+1) * ftsize.y + 2*INSET + 2*Borderwidth; wid = (xmax+1) * ftsize.x + ftsize.x + 2*INSET + 2*Borderwidth; fprint(fd, "resize -dx %d -dy %d\n", wid, ht); - close(fd); + sys_close(fd); } } diff --git a/sys/src/cmd/vt/vt.c b/sys/src/cmd/vt/vt.c index 980fc99..4d2b429 100644 --- a/sys/src/cmd/vt/vt.c +++ b/sys/src/cmd/vt/vt.c @@ -958,9 +958,9 @@ osc(void) } } buf[i] = 0; - if((fd = open("/dev/label", OWRITE)) >= 0) { + if((fd = sys_open("/dev/label", OWRITE)) >= 0) { fprint(fd, "%S", buf); - close(fd); + sys_close(fd); } break; } diff --git a/sys/src/cmd/xargs.c b/sys/src/cmd/xargs.c index 052c8c9..4faca5a 100644 --- a/sys/src/cmd/xargs.c +++ b/sys/src/cmd/xargs.c @@ -71,11 +71,11 @@ main(int argc, char **argv) case -1: sysfatal("fork: %r"); case 0: - exec(*nargv, nargv); + sys_exec(*nargv, nargv); if(**nargv != '/' && strncmp(*nargv, "./", 2) != 0 && strncmp(*nargv, "../", 3) != 0){ *nargv = smprint("/cmd/%s", *nargv); - exec(*nargv, nargv); + sys_exec(*nargv, nargv); } sysfatal("exec: %r"); } diff --git a/sys/src/kern/amd64/dat.h b/sys/src/kern/amd64/dat.h index 1d14b50..07250a3 100644 --- a/sys/src/kern/amd64/dat.h +++ b/sys/src/kern/amd64/dat.h @@ -47,7 +47,7 @@ typedef struct PCMmap PCMmap; #pragma incomplete BIOS32si #pragma incomplete Ureg -#define MAXSYSARG 6 /* for mount(fd, afd, mpt, flag, arg, dc) */ +#define MAXSYSARG 6 /* for sys_mount(fd, afd, mpt, flag, arg, dc) */ /* * parameters for sysproc.c diff --git a/sys/src/kern/amd64/syscall.c b/sys/src/kern/amd64/syscall.c index 5be6cab..7b7ce7c 100644 --- a/sys/src/kern/amd64/syscall.c +++ b/sys/src/kern/amd64/syscall.c @@ -33,7 +33,7 @@ typedef struct { } NFrame; /* - * Return user to state before notify() + * Return user to state before sys_notify() */ static void noted(Ureg* cur, uintptr_t arg0) diff --git a/sys/src/kern/boot/aux.c b/sys/src/kern/boot/aux.c index 37ace16..09ef0ca 100644 --- a/sys/src/kern/boot/aux.c +++ b/sys/src/kern/boot/aux.c @@ -15,7 +15,7 @@ sendmsg(int fd, char *msg) int n; n = jehanne_strlen(msg); - if(write(fd, msg, n) != n) + if(jehanne_write(fd, msg, n) != n) return -1; return 0; } @@ -26,7 +26,7 @@ savelogsproc(void) int in, out, r, w; char buf[1024]; - out = open("/sys/log/kernel", OWRITE); + out = sys_open("/sys/log/kernel", OWRITE); if(out < 0){ out = jehanne_ocreate("/sys/log/kernel", OWRITE, 0600); if(out < 0){ @@ -35,29 +35,29 @@ savelogsproc(void) } } - in = open("/dev/kmesg", OREAD); - while((r = read(in, buf, sizeof buf)) > 0){ - w = write(out, buf, r); + in = sys_open("/dev/kmesg", OREAD); + while((r = jehanne_read(in, buf, sizeof buf)) > 0){ + w = jehanne_write(out, buf, r); if(w <= 0){ jehanne_fprint(2, "savelogs: error writing logs: %r\n"); return; } } - close(in); + sys_close(in); - in = open("/dev/kprint", OREAD); - while((r = read(in, buf, sizeof buf)) > 0){ - w = write(out, buf, r); + in = sys_open("/dev/kprint", OREAD); + while((r = jehanne_read(in, buf, sizeof buf)) > 0){ + w = jehanne_write(out, buf, r); if(w <= 0){ jehanne_fprint(2, "savelogs: error writing logs: %r\n"); return; } } - close(in); + sys_close(in); jehanne_fprint(2, "savelogs: /dev/kprint closed: %r\n"); - close(out); + sys_close(out); } void @@ -68,7 +68,7 @@ savelogs(void) return; } - switch(rfork(RFPROC|RFNOWAIT|RFNOTEG|RFREND|RFFDG)){ + switch(sys_rfork(RFPROC|RFNOWAIT|RFNOTEG|RFREND|RFFDG)){ case -1: jehanne_print("boot: savelogs: fork failed: %r\n"); case 0: @@ -84,7 +84,7 @@ warning(char *s) char buf[ERRMAX]; buf[0] = '\0'; - errstr(buf, sizeof buf); + sys_errstr(buf, sizeof buf); jehanne_fprint(2, "boot: %s: %s\n", s, buf); } @@ -94,7 +94,7 @@ fatal(char *s) char buf[ERRMAX]; buf[0] = '\0'; - errstr(buf, sizeof buf); + sys_errstr(buf, sizeof buf); jehanne_fprint(2, "boot: %s: %s\n", s, buf); jehanne_exits(0); } @@ -105,15 +105,15 @@ readfile(char *name, char *buf, int len) int f, n; buf[0] = 0; - f = open(name, OREAD); + f = sys_open(name, OREAD); if(f < 0){ jehanne_fprint(2, "readfile: cannot open %s (%r)\n", name); return -1; } - n = read(f, buf, len-1); + n = jehanne_read(f, buf, len-1); if(n >= 0) buf[n] = 0; - close(f); + sys_close(f); return 0; } @@ -122,11 +122,11 @@ writefile(char *name, char *buf, int len) { int f, n; - f = open(name, OWRITE); + f = sys_open(name, OWRITE); if(f < 0) return -1; - n = write(f, buf, len); - close(f); + n = jehanne_write(f, buf, len); + sys_close(f); return (n != len) ? -1 : 0; } @@ -142,8 +142,8 @@ setenv(char *name, char *val) jehanne_fprint(2, "create %s: %r\n", ename); return; } - write(f, val, jehanne_strlen(val)); - close(f); + jehanne_write(f, val, jehanne_strlen(val)); + sys_close(f); } void @@ -164,9 +164,9 @@ srvcreate(char *name, int fd) if(f < 0) fatal(buf); jehanne_sprint(buf, "%d", fd); - if(write(f, buf, jehanne_strlen(buf)) != jehanne_strlen(buf)) + if(jehanne_write(f, buf, jehanne_strlen(buf)) != jehanne_strlen(buf)) fatal("write"); - close(f); + sys_close(f); } void @@ -174,8 +174,8 @@ catchint(void *a, char *note) { USED(a); if(jehanne_strcmp(note, "alarm") == 0) - noted(NCONT); - noted(NDFLT); + sys_noted(NCONT); + sys_noted(NDFLT); } int @@ -188,16 +188,16 @@ outin(char *prompt, char *def, int len) len = sizeof(buf)-1; if(cpuflag){ - notify(catchint); - alarm(15*1000); + sys_notify(catchint); + sys_alarm(15*1000); } jehanne_print("%s[%s]: ", prompt, *def ? def : "no default"); jehanne_memset(buf, 0, sizeof buf); - n = read(0, buf, len); + n = jehanne_read(0, buf, len); if(cpuflag){ - alarm(0); - notify(0); + sys_alarm(0); + sys_notify(0); } if(n < 0){ @@ -222,7 +222,7 @@ void shell(char *c, char *d) case -1: jehanne_print("configrc: fork failed: %r\n"); case 0: - exec(rcPath, (const char**)argv); + sys_exec(rcPath, (const char**)argv); fatal("can't exec rc"); default: break; diff --git a/sys/src/kern/boot/boot.c b/sys/src/kern/boot/boot.c index b1bc29d..12edafc 100644 --- a/sys/src/kern/boot/boot.c +++ b/sys/src/kern/boot/boot.c @@ -46,9 +46,9 @@ boot(int argc, char *argv[]) char buf[32]; AuthInfo *ai; - open("/dev/cons", OREAD); - open("/dev/cons", OWRITE); - open("/dev/cons", OWRITE); + sys_open("/dev/cons", OREAD); + sys_open("/dev/cons", OWRITE); + sys_open("/dev/cons", OWRITE); jehanne_fmtinstall('r', jehanne_errfmt); @@ -70,11 +70,11 @@ boot(int argc, char *argv[]) * init will reinitialize its namespace. * #ec gets us plan9.ini settings (*var variables). */ - bind("#ec", "/env", MREPL); - bind("#e", "/env", MBEFORE|MCREATE); - bind("#s", "/srv", MREPL|MCREATE); - bind("#p", "/proc", MREPL|MCREATE); - bind("#σ", "/shr", MREPL); + sys_bind("#ec", "/env", MREPL); + sys_bind("#e", "/env", MBEFORE|MCREATE); + sys_bind("#s", "/srv", MREPL|MCREATE); + sys_bind("#p", "/proc", MREPL|MCREATE); + sys_bind("#σ", "/shr", MREPL); jehanne_print("Diex vos sait! Je m'appelle Jehanne O:-)\n"); #ifdef DEBUG jehanne_print("argc=%d\n", argc); @@ -136,7 +136,7 @@ jehanne_print("\n"); jehanne_print("version..."); buf[0] = '\0'; - n = fversion(fd, 0, buf, sizeof buf); + n = sys_fversion(fd, 0, buf, sizeof buf); if(n < 0) fatal("can't init 9P"); @@ -148,50 +148,50 @@ jehanne_print("\n"); /* * create the name space, mount the root fs */ - if(bind("/", "/", MREPL) < 0) + if(sys_bind("/", "/", MREPL) < 0) fatal("bind /"); rp = jehanne_getenv("rootspec"); if(rp == nil) rp = ""; - afd = fauth(fd, rp); + afd = sys_fauth(fd, rp); if(afd >= 0){ ai = auth_proxy(afd, auth_getkey, "proto=p9any role=client"); if(ai == nil) jehanne_print("authentication failed (%r), trying mount anyways\n"); } - if(mount(fd, afd, "/root", MREPL|MCREATE, rp, '9') < 0) + if(sys_mount(fd, afd, "/root", MREPL|MCREATE, rp, '9') < 0) fatal("mount /"); rsp = rp; rp = jehanne_getenv("rootdir"); if(rp == nil) rp = rootdir; - if(bind(rp, "/", MAFTER|MCREATE) < 0){ + if(sys_bind(rp, "/", MAFTER|MCREATE) < 0){ if(jehanne_strncmp(rp, "/root", 5) == 0){ jehanne_fprint(2, "boot: couldn't bind $rootdir=%s to root: %r\n", rp); fatal("second bind /"); } jehanne_snprint(rootbuf, sizeof rootbuf, "/root/%s", rp); rp = rootbuf; - if(bind(rp, "/", MAFTER|MCREATE) < 0){ + if(sys_bind(rp, "/", MAFTER|MCREATE) < 0){ jehanne_fprint(2, "boot: couldn't bind $rootdir=%s to root: %r\n", rp); if(jehanne_strcmp(rootbuf, "/root//plan9") == 0){ jehanne_fprint(2, "**** warning: remove rootdir=/plan9 entry from plan9.ini\n"); rp = "/root"; - if(bind(rp, "/", MAFTER|MCREATE) < 0) + if(sys_bind(rp, "/", MAFTER|MCREATE) < 0) fatal("second bind /"); }else fatal("second bind /"); } } - close(fd); + sys_close(fd); setenv("rootdir", rp); savelogs(); settime(islocal, afd, rsp); if(afd > 0) - close(afd); + sys_close(afd); cmd = jehanne_getenv("init"); if(cmd == nil){ @@ -210,7 +210,7 @@ jehanne_print("\n"); iargv[iargc] = nil; - exec(cmd, (const char**)iargv); + sys_exec(cmd, (const char**)iargv); fatal(cmd); } @@ -311,7 +311,7 @@ usbinit(void) case -1: jehanne_print("usbinit: fork failed: %r\n"); case 0: - exec(usbrcPath, (const char**)argv); + sys_exec(usbrcPath, (const char**)argv); fatal("can't exec usbd"); default: break; @@ -358,7 +358,7 @@ startconsole(void) case -1: fatal("starting screenconsole"); case 0: - exec(screenconsolePath, (const char**)av); + sys_exec(screenconsolePath, (const char**)av); fatal("execing screenconsole"); default: break; @@ -369,20 +369,20 @@ startconsole(void) jehanne_sleep(250); } /* replace 0, 1 and 2 */ - if((i = open("#s/screenconsole", ORDWR)) < 0) + if((i = sys_open("#s/screenconsole", ORDWR)) < 0) fatal("open #s/screenconsole"); - if(mount(i, -1, "/dev", MBEFORE, "", '9') < 0) + if(sys_mount(i, -1, "/dev", MBEFORE, "", '9') < 0) fatal("mount /dev"); - if((i = open("/dev/cons", OREAD))<0) + if((i = sys_open("/dev/cons", OREAD))<0) fatal("open /dev/cons, OREAD"); if(jehanne_dup(i, 0) != 0) fatal("jehanne_dup(i, 0)"); - close(i); - if((i = open("/dev/cons", OWRITE))<0) + sys_close(i); + if((i = sys_open("/dev/cons", OWRITE))<0) fatal("open /dev/cons, OWRITE"); if(jehanne_dup(i, 1) != 1) fatal("jehanne_dup(i, 1)"); - close(i); + sys_close(i); if(jehanne_dup(1, 2) != 2) fatal("jehanne_dup(1, 2)"); return 0; @@ -415,7 +415,7 @@ startcomconsole(void) case -1: fatal("starting comconsole"); case 0: - exec(comconsolePath, (const char**)av); + sys_exec(comconsolePath, (const char**)av); fatal("execing comconsole"); default: break; @@ -426,20 +426,20 @@ startcomconsole(void) jehanne_sleep(250); } /* replace 0, 1 and 2 */ - if((i = open("#s/comconsole", ORDWR)) < 0) + if((i = sys_open("#s/comconsole", ORDWR)) < 0) fatal("open #s/comconsole"); - if(mount(i, -1, "/dev", MBEFORE, "", '9') < 0) + if(sys_mount(i, -1, "/dev", MBEFORE, "", '9') < 0) fatal("mount /dev"); - if((i = open("/dev/cons", OREAD))<0) + if((i = sys_open("/dev/cons", OREAD))<0) fatal("open /dev/cons, OREAD"); if(jehanne_dup(i, 0) != 0) fatal("jehanne_dup(i, 0)"); - close(i); - if((i = open("/dev/cons", OWRITE))<0) + sys_close(i); + if((i = sys_open("/dev/cons", OWRITE))<0) fatal("open /dev/cons, OWRITE"); if(jehanne_dup(i, 1) != 1) fatal("jehanne_dup(i, 1)"); - close(i); + sys_close(i); if(jehanne_dup(1, 2) != 2) fatal("jehanne_dup(1, 2)"); return 0; @@ -453,7 +453,7 @@ bindBoot(void) if(b == nil || b->name == nil) return; while(b->name){ - bind(b->name, b->old, b->flag); + sys_bind(b->name, b->old, b->flag); ++b; } } @@ -469,7 +469,7 @@ unbindBoot(void) ++b; while(--b >= bootbinds){ - unmount(b->name, b->old); + sys_unmount(b->name, b->old); } } @@ -483,27 +483,27 @@ kbmap(void) f = jehanne_getenv("kbmap"); if(f == nil) return; - if(bind("#κ", "/dev", MAFTER) < 0){ + if(sys_bind("#κ", "/dev", MAFTER) < 0){ warning("can't bind #κ"); return; } - in = open(f, OREAD); + in = sys_open(f, OREAD); if(in < 0){ warning("can't open kbd map"); return; } - out = open("/dev/kbmap", OWRITE); + out = sys_open("/dev/kbmap", OWRITE); if(out < 0) { warning("can't open /dev/kbmap"); - close(in); + sys_close(in); return; } - while((n = read(in, buf, sizeof(buf))) > 0) - if(write(out, buf, n) != n){ + while((n = jehanne_read(in, buf, sizeof(buf))) > 0) + if(jehanne_write(out, buf, n) != n){ warning("write to /dev/kbmap failed"); break; } - close(in); - close(out); + sys_close(in); + sys_close(out); } diff --git a/sys/src/kern/boot/bootauth.c b/sys/src/kern/boot/bootauth.c index 40d5c26..5621f29 100644 --- a/sys/src/kern/boot/bootauth.c +++ b/sys/src/kern/boot/bootauth.c @@ -48,7 +48,7 @@ authentication(int cpuflag) case -1: fatal("starting factotum"); case 0: - exec(factotumPath, (const char**)av); + sys_exec(factotumPath, (const char**)av); fatal("execing factotum"); default: break; @@ -72,11 +72,11 @@ glenda(void) if(s == nil) s = "glenda"; - fd = open("#c/hostowner", OWRITE); + fd = sys_open("#c/hostowner", OWRITE); if(fd >= 0){ - if(write(fd, s, jehanne_strlen(s)) != jehanne_strlen(s)) + if(jehanne_write(fd, s, jehanne_strlen(s)) != jehanne_strlen(s)) jehanne_fprint(2, "setting #c/hostowner to %s: %r\n", s); - close(fd); + sys_close(fd); } jehanne_fprint(2, "Set hostowner to %s\n", s); } diff --git a/sys/src/kern/boot/bootcache.c b/sys/src/kern/boot/bootcache.c index ce87357..31fb0de 100644 --- a/sys/src/kern/boot/bootcache.c +++ b/sys/src/kern/boot/bootcache.c @@ -22,7 +22,7 @@ cache(int fd) *partition = 0; - bind("#S", "/dev", MAFTER); + sys_bind("#S", "/dev", MAFTER); readfile("#e/cfs", buf, sizeof(buf)); if(*buf){ argc = jehanne_tokenize(buf, argv, 4); @@ -67,21 +67,21 @@ cache(int fd) case -1: fatal("fork"); case 0: - close(p[1]); + sys_close(p[1]); if(jehanne_dup(fd, 0) != 0) fatal("jehanne_dup(fd, 0)"); - close(fd); + sys_close(fd); if(jehanne_dup(p[0], 1) != 1) fatal("jehanne_dup(p[0], 1)"); - close(p[0]); + sys_close(p[0]); if(fflag) jehanne_execl("/boot/cfs", "bootcfs", "-rs", "-f", partition, 0); else jehanne_execl("/boot/cfs", "bootcfs", "-s", "-f", partition, 0); break; default: - close(p[0]); - close(fd); + sys_close(p[0]); + sys_close(fd); fd = p[1]; break; } diff --git a/sys/src/kern/boot/bootip.c b/sys/src/kern/boot/bootip.c index c8d0507..080f684 100644 --- a/sys/src/kern/boot/bootip.c +++ b/sys/src/kern/boot/bootip.c @@ -59,18 +59,18 @@ jehanne_print("ipconfig..."); } ARGEND; /* bind in an ip interface */ - if(bind("#I", mpoint, MAFTER) < 0) + if(sys_bind("#I", mpoint, MAFTER) < 0) fatal("bind #I\n"); if(jehanne_access(ipconfigPath, AEXEC) < 0) fatal("cannot access ipconfig"); - if(jehanne_access("#l0", AEXIST) == 0 && bind("#l0", mpoint, MAFTER) < 0) + if(jehanne_access("#l0", AEXIST) == 0 && sys_bind("#l0", mpoint, MAFTER) < 0) jehanne_print("bind #l0: %r\n"); - if(jehanne_access("#l1", AEXIST) == 0 && bind("#l1", mpoint, MAFTER) < 0) + if(jehanne_access("#l1", AEXIST) == 0 && sys_bind("#l1", mpoint, MAFTER) < 0) jehanne_print("bind #l1: %r\n"); - if(jehanne_access("#l2", AEXIST) == 0 && bind("#l2", mpoint, MAFTER) < 0) + if(jehanne_access("#l2", AEXIST) == 0 && sys_bind("#l2", mpoint, MAFTER) < 0) jehanne_print("bind #l2: %r\n"); - if(jehanne_access("#l3", AEXIST) == 0 && bind("#l3", mpoint, MAFTER) < 0) + if(jehanne_access("#l3", AEXIST) == 0 && sys_bind("#l3", mpoint, MAFTER) < 0) jehanne_print("bind #l3: %r\n"); jehanne_werrstr(""); @@ -79,7 +79,7 @@ jehanne_print("ipconfig..."); case -1: fatal("fork configuring ip"); case 0: - exec(ipconfigPath, (const char**)arg); + sys_exec(ipconfigPath, (const char**)arg); fatal("execing ipconfig"); default: break; @@ -169,17 +169,17 @@ netenv(char *attr, uint8_t *ip) ipmove(ip, IPnoaddr); jehanne_snprint(buf, sizeof(buf), "#ec/%s", attr); - fd = open(buf, OREAD); + fd = sys_open(buf, OREAD); if(fd < 0) return; - n = read(fd, buf, sizeof(buf)-1); + n = jehanne_read(fd, buf, sizeof(buf)-1); if(n > 0){ buf[n] = 0; if (parseip(ip, buf) == -1) jehanne_fprint(2, "netenv: can't parse ip %s\n", buf); } - close(fd); + sys_close(fd); } static void @@ -191,11 +191,11 @@ netndb(char *attr, uint8_t *ip) ipmove(ip, IPnoaddr); jehanne_snprint(buf, sizeof(buf), "%s/ndb", mpoint); - fd = open(buf, OREAD); + fd = sys_open(buf, OREAD); if(fd < 0) return; - n = read(fd, buf, sizeof(buf)-1); - close(fd); + n = jehanne_read(fd, buf, sizeof(buf)-1); + sys_close(fd); if(n <= 0) return; buf[n] = 0; diff --git a/sys/src/kern/boot/bootrc.c b/sys/src/kern/boot/bootrc.c index b8773c6..b9b42ce 100644 --- a/sys/src/kern/boot/bootrc.c +++ b/sys/src/kern/boot/bootrc.c @@ -20,14 +20,14 @@ configrc(Method* m) { void configloopback(void); configloopback(); - bind("#S", "/dev", MAFTER); + sys_bind("#S", "/dev", MAFTER); char *argv[] = {"rc", "-m", rcmainPath, "-i", 0,}; jehanne_print("Step 1. Run an rc. Set things up.\n"); switch(jehanne_fork()){ case -1: jehanne_print("configrc: fork failed: %r\n"); case 0: - exec(rcPath, (const char**)argv); + sys_exec(rcPath, (const char**)argv); fatal("can't exec rc"); default: break; @@ -39,7 +39,7 @@ configrc(Method* m) case -1: jehanne_print("configrc: fork failed: %r\n"); case 0: - exec(rcPath, (const char**)argv); + sys_exec(rcPath, (const char**)argv); fatal("can't exec rc"); default: break; @@ -57,7 +57,7 @@ connectrc(void) // Later, make this anything. jehanne_snprint(buf, sizeof buf, "/srv/fossil"); - fd = open("#s/fossil", 2); + fd = sys_open("#s/fossil", 2); if (fd < 0) jehanne_werrstr("dial %s: %r", buf); return fd; diff --git a/sys/src/kern/boot/doauthenticate.c b/sys/src/kern/boot/doauthenticate.c index 226d8f3..1408fb6 100644 --- a/sys/src/kern/boot/doauthenticate.c +++ b/sys/src/kern/boot/doauthenticate.c @@ -21,7 +21,7 @@ readn(int fd, void *buf, int32_t len) p = buf; for(n = 0; n < len; n += m){ - m = read(fd, p+n, len-n); + m = jehanne_read(fd, p+n, len-n); if(m <= 0) return -1; } @@ -44,8 +44,8 @@ fromauth(Method *mp, char *trbuf, char *tbuf) return error; } - if(write(afd, trbuf, TICKREQLEN) < 0 || read(afd, &t, 1) != 1){ - close(afd); + if(jehanne_write(afd, trbuf, TICKREQLEN) < 0 || jehanne_read(afd, &t, 1) != 1){ + sys_close(afd); jehanne_sprint(error, "%s: %r", pbmsg); return error; } @@ -72,7 +72,7 @@ fromauth(Method *mp, char *trbuf, char *tbuf) break; } - close(afd); + sys_close(afd); return msg; } @@ -97,7 +97,7 @@ doauthenticate(int fd, Method *mp) msg = fromauth(mp, trbuf, tbuf); jehanne_print("authenticating..."); if(msg == 0) - if(fauth(fd, tbuf) >= 0) + if(sys_fauth(fd, tbuf) >= 0) return; /* didn't work, go for the security hole */ diff --git a/sys/src/kern/boot/embed.c b/sys/src/kern/boot/embed.c index bc5abce..253c29d 100644 --- a/sys/src/kern/boot/embed.c +++ b/sys/src/kern/boot/embed.c @@ -46,11 +46,11 @@ connectembed(void) jehanne_free(dir); jehanne_print("paqfs..."); - if(bind("#0", "/dev", MREPL) < 0) + if(sys_bind("#0", "/dev", MREPL) < 0) fatal("bind #0"); - if(bind("#c", "/dev", MAFTER) < 0) + if(sys_bind("#c", "/dev", MAFTER) < 0) fatal("bind #c"); - if(bind("#p", "/proc", MREPL) < 0) + if(sys_bind("#p", "/proc", MREPL) < 0) fatal("bind #p"); if(jehanne_pipe(p)<0) fatal("pipe"); @@ -71,15 +71,15 @@ connectembed(void) fatal("jehanne_dup(p[0], 0)"); if(jehanne_dup(p[1], 1) != 1) fatal("jehanne_dup(p[1], 1)"); - close(p[0]); - close(p[1]); - exec("/boot/paqfs", (const char**)arg); + sys_close(p[0]); + sys_close(p[1]); + sys_exec("/boot/paqfs", (const char**)arg); fatal("can't exec paqfs"); default: break; } jehanne_waitpid(); - close(p[1]); + sys_close(p[1]); return p[0]; } diff --git a/sys/src/kern/boot/getpasswd.c b/sys/src/kern/boot/getpasswd.c index 69f87ae..28ed1a9 100644 --- a/sys/src/kern/boot/getpasswd.c +++ b/sys/src/kern/boot/getpasswd.c @@ -15,23 +15,23 @@ getpasswd(char *p, int len) char c; int i, n, fd; - fd = open("#c/consctl", OWRITE); + fd = sys_open("#c/consctl", OWRITE); if(fd < 0) fatal("can't open consctl; please reboot"); - write(fd, "rawon", 5); + jehanne_write(fd, "rawon", 5); Prompt: jehanne_print("password: "); n = 0; for(;;){ do{ - i = read(0, &c, 1); + i = jehanne_read(0, &c, 1); if(i < 0) fatal("can't read cons; please reboot"); }while(i == 0); switch(c){ case '\n': p[n] = '\0'; - close(fd); + sys_close(fd); jehanne_print("\n"); return; case '\b': diff --git a/sys/src/kern/boot/local.c b/sys/src/kern/boot/local.c index 24db4d5..403b7b0 100644 --- a/sys/src/kern/boot/local.c +++ b/sys/src/kern/boot/local.c @@ -85,7 +85,7 @@ jehanne_print("configlocal: disk is %s\n", disk); static int print1(int fd, char *s) { - return write(fd, s, jehanne_strlen(s)); + return jehanne_write(fd, s, jehanne_strlen(s)); } void @@ -93,15 +93,15 @@ configloopback(void) { int fd; - if((fd = open("/net/ipifc/clone", ORDWR)) < 0){ - bind("#I", "/net", MAFTER); - if((fd = open("/net/ipifc/clone", ORDWR)) < 0) + if((fd = sys_open("/net/ipifc/clone", ORDWR)) < 0){ + sys_bind("#I", "/net", MAFTER); + if((fd = sys_open("/net/ipifc/clone", ORDWR)) < 0) fatal("open /net/ipifc/clone for loopback"); } if(print1(fd, "bind loopback /dev/null") < 0 || print1(fd, "add 127.0.0.1 255.255.255.255") < 0) fatal("write /net/ipifc/clone for loopback"); - close(fd); + sys_close(fd); } int @@ -122,7 +122,7 @@ connecthjfs(void) /* start hjfs */ jehanne_print("hjfs(%s)...", partition); shell("-c", jehanne_smprint("%s -f '%s' -n 'boot'", hjfsPath, partition)); - fd = open("#s/boot", ORDWR); + fd = sys_open("#s/boot", ORDWR); if(fd < 0){ jehanne_print("open #s/boot: %r\n"); return -1; @@ -135,15 +135,15 @@ connectlocal(void) { int fd; - if(bind("#0", "/dev", MREPL) < 0) + if(sys_bind("#0", "/dev", MREPL) < 0) fatal("bind #0"); - if(bind("#c", "/dev", MAFTER) < 0) + if(sys_bind("#c", "/dev", MAFTER) < 0) fatal("bind #c"); - if(bind("#p", "/proc", MREPL) < 0) + if(sys_bind("#p", "/proc", MREPL) < 0) fatal("bind #p"); - bind("#S", "/dev", MAFTER); - bind("#k", "/dev", MAFTER); - bind("#æ", "/dev", MAFTER); + sys_bind("#S", "/dev", MAFTER); + sys_bind("#k", "/dev", MAFTER); + sys_bind("#æ", "/dev", MAFTER); if((fd = connecthjfs()) < 0){ shell("-i", nil); return -1; diff --git a/sys/src/kern/boot/nopsession.c b/sys/src/kern/boot/nopsession.c index 6021904..38f0952 100644 --- a/sys/src/kern/boot/nopsession.c +++ b/sys/src/kern/boot/nopsession.c @@ -22,14 +22,14 @@ rpc(int fd, int type) hdr.type = type; hdr.tag = NOTAG; n = convS2M(&hdr, buf); - if(write(fd, buf, n) != n) + if(jehanne_write(fd, buf, n) != n) fatal("write rpc"); jehanne_print("..."); p = buf; l = 0; while(l < 3) { - n = read(fd, p, 3); + n = jehanne_read(fd, p, 3); if(n <= 0) fatal("read rpc"); if(n == 2 && l == 0 && buf[0] == 'O' && buf[1] == 'K') diff --git a/sys/src/kern/boot/paq.c b/sys/src/kern/boot/paq.c index 3492d2c..c82c62f 100644 --- a/sys/src/kern/boot/paq.c +++ b/sys/src/kern/boot/paq.c @@ -24,17 +24,17 @@ configpaq(Method* m) int fd; int i; - if(bind("#F", "/dev", MAFTER) < 0) + if(sys_bind("#F", "/dev", MAFTER) < 0) fatal("bind #c"); - if(bind("#p", "/proc", MREPL) < 0) + if(sys_bind("#p", "/proc", MREPL) < 0) fatal("bind #p"); - fd = open("/dev/flash/flashctl", OWRITE); + fd = sys_open("/dev/flash/flashctl", OWRITE); if(fd < 0) fatal("opening flashctl"); for(i = 0; i < nelem(fparts); i++) if(jehanne_fprint(fd, fparts[i]) < 0) fatal(fparts[i]); - close(fd); + sys_close(fd); } int @@ -62,15 +62,15 @@ connectpaq(void) fatal("jehanne_dup(p[0], 0)"); if(jehanne_dup(p[1], 1) != 1) fatal("jehanne_dup(p[1], 1)"); - close(p[0]); - close(p[1]); - exec("/boot/paqfs", (const char**)arg); + sys_close(p[0]); + sys_close(p[1]); + sys_exec("/boot/paqfs", (const char**)arg); fatal("can't exec paqfs"); default: break; } jehanne_waitpid(); - close(p[1]); + sys_close(p[1]); return p[0]; } diff --git a/sys/src/kern/boot/sac.c b/sys/src/kern/boot/sac.c index 3002136..384d9fb 100644 --- a/sys/src/kern/boot/sac.c +++ b/sys/src/kern/boot/sac.c @@ -25,23 +25,23 @@ configsac(Method *mp) /* * create the name space, mount the root fs */ - if(bind("/", "/", MREPL) < 0) + if(sys_bind("/", "/", MREPL) < 0) fatal("bind /"); - if(bind("#C", "/", MAFTER) < 0) + if(sys_bind("#C", "/", MAFTER) < 0) fatal("bind /"); /* fixed sysname - enables correct namespace file */ - fd = open("#c/sysname", OWRITE); + fd = sys_open("#c/sysname", OWRITE); if(fd < 0) fatal("open sysname"); - write(fd, "brick", 5); - close(fd); + jehanne_write(fd, "brick", 5); + sys_close(fd); - fd = open("#c/hostowner", OWRITE); + fd = sys_open("#c/hostowner", OWRITE); if(fd < 0) fatal("open sysname"); - write(fd, "brick", 5); - close(fd); + jehanne_write(fd, "brick", 5); + sys_close(fd); jehanne_sprint(cmd, "/arch/%s/init", cputype); jehanne_print("starting %s\n", cmd); diff --git a/sys/src/kern/boot/settime.c b/sys/src/kern/boot/settime.c index 6ea2923..21003ad 100644 --- a/sys/src/kern/boot/settime.c +++ b/sys/src/kern/boot/settime.c @@ -23,13 +23,13 @@ static int setlocaltime(char* timebuf, int s){ int n, f, t; t=0; - f = open("#r/rtc", ORDWR); + f = sys_open("#r/rtc", ORDWR); if(f >= 0){ - if((n = read(f, timebuf, s-1)) > 0){ + if((n = jehanne_read(f, timebuf, s-1)) > 0){ timebuf[n] = '\0'; t = 1; } - close(f); + sys_close(f); }else do{ jehanne_strcpy(timebuf, "yymmddhhmm[ss]"); outin("\ndate/time ", timebuf, s); @@ -58,31 +58,31 @@ settime(int islocal, int afd, char *rp) /* * set the time from the access time of the root */ - f = open(timeserver, ORDWR); + f = sys_open(timeserver, ORDWR); if(f < 0) return; - if(mount(f, afd, "/tmp", MREPL, rp, '9') < 0){ + if(sys_mount(f, afd, "/tmp", MREPL, rp, '9') < 0){ warning("settime mount"); - close(f); + sys_close(f); if((!islocal) && (setlocaltime(timebuf, sizeof(timebuf)) == 0)) return; } else { - close(f); + sys_close(f); if(jehanne_stat("/tmp", statbuf, sizeof statbuf) < 0) fatal("stat"); jehanne_convM2D(statbuf, sizeof statbuf, &dir[0], (char*)&dir[1]); jehanne_sprint(timebuf, "%ld", dir[0].atime); - unmount(0, "/tmp"); + sys_unmount(0, "/tmp"); } } if((!islocal) && (jehanne_strcmp(timebuf,"0")==0)) setlocaltime(timebuf, sizeof(timebuf)); - f = open("#c/time", OWRITE); - if(write(f, timebuf, jehanne_strlen(timebuf)) < 0) + f = sys_open("#c/time", OWRITE); + if(jehanne_write(f, timebuf, jehanne_strlen(timebuf)) < 0) warning("can't set #c/time"); - close(f); + sys_close(f); jehanne_print("\n"); } diff --git a/sys/src/kern/port/chan.c b/sys/src/kern/port/chan.c index 5776578..e2ce557 100644 --- a/sys/src/kern/port/chan.c +++ b/sys/src/kern/port/chan.c @@ -1311,7 +1311,7 @@ namec(char *aname, int amode, long omode, long perm) * but Jehanne disable them to improve security. * * Who actually need them can bind #c and #p somewhere - * before rfork(RFNOMNT) + * before sys_rfork(RFNOMNT) */ if(up->pgrp->noattach && jehanne_utfrune("|0de", r)==nil) error(Enoattach); diff --git a/sys/src/kern/port/initcode.c b/sys/src/kern/port/initcode.c index c7a2f2a..1385a96 100644 --- a/sys/src/kern/port/initcode.c +++ b/sys/src/kern/port/initcode.c @@ -62,11 +62,11 @@ initboot(void) if (jehanne_access(initrd, AREAD) < 0) return -1; - switch(pid = rfork(RFFDG|RFREND|RFPROC)){ + switch(pid = sys_rfork(RFFDG|RFREND|RFPROC)){ case -1: return -1; case 0: - exec(rofs, (const char**)args); + sys_exec(rofs, (const char**)args); jehanne_exits("initcode: exec: rofs"); default: /* wait for agent to really be there */ @@ -79,11 +79,11 @@ initboot(void) } break; } - if((i = open(bootfs, ORDWR)) < 0) + if((i = sys_open(bootfs, ORDWR)) < 0) return -1; - if(mount(i, -1, bootdir, MREPL, "", '9') < 0) + if(sys_mount(i, -1, bootdir, MREPL, "", '9') < 0) return -1; - remove(bootfs); + sys_remove(bootfs); return jehanne_access(boot, AEXEC); } @@ -101,15 +101,15 @@ startboot(int argc, char **argv) for(i = 0; i < sizeof buf; ++i) buf[i] = '\0'; - bind(self, dev, MREPL); - bind(c, dev, MAFTER); - bind(ec, env, MAFTER); - bind(e, env, MCREATE|MAFTER); - bind(s, srv, MREPL|MCREATE); + sys_bind(self, dev, MREPL); + sys_bind(c, dev, MAFTER); + sys_bind(ec, env, MAFTER); + sys_bind(e, env, MCREATE|MAFTER); + sys_bind(s, srv, MREPL|MCREATE); if (initboot() == 0) - exec(boot, (const char**)args); + sys_exec(boot, (const char**)args); - errstr(buf, sizeof buf - 1); - _exits(buf); + sys_errstr(buf, sizeof buf - 1); + sys__exits(buf); } diff --git a/sys/src/kern/port/sysproc.c b/sys/src/kern/port/sysproc.c index c0f1f73..a65d85f 100644 --- a/sys/src/kern/port/sysproc.c +++ b/sys/src/kern/port/sysproc.c @@ -617,9 +617,9 @@ sysawait(char *p, int n) Waitmsg w; /* - * int await(char* s, int n); + * int sys_await(char* s, int n); * should really be - * usize await(char* s, usize n); + * usize sys_await(char* s, usize n); */ p = validaddr(p, n, 1); @@ -682,7 +682,7 @@ sysnotify(void* a0) validaddr(a0, sizeof(void*), 0); /* - * int notify(void (*f)(void*, char*)); + * int sys_notify(void (*f)(void*, char*)); */ up->notify = (void (*)(void*, char*))a0; diff --git a/sys/src/kern/port/umem/segments.c b/sys/src/kern/port/umem/segments.c index afa896b..d30c854 100644 --- a/sys/src/kern/port/umem/segments.c +++ b/sys/src/kern/port/umem/segments.c @@ -521,7 +521,7 @@ segment_share(ProcSegment **s) case SgLoad: if(segment->image % NLOAD == 0 && segment->permissions&SgWrite){ - /* text segment in debug mode: on rfork(whatever) + /* text segment in debug mode: on sys_rfork(whatever) * it is going to be copied as a readonly */ segment_info(segment, &info); diff --git a/sys/src/lib/9p/auth.c b/sys/src/lib/9p/auth.c index e1d47c3..1436f54 100644 --- a/sys/src/lib/9p/auth.c +++ b/sys/src/lib/9p/auth.c @@ -25,7 +25,7 @@ auth9p(Req *r) Afid *afid; afid = emalloc9p(sizeof(Afid)); - afid->afd = open("/mnt/factotum/rpc", ORDWR); + afid->afd = sys_open("/mnt/factotum/rpc", ORDWR); if(afid->afd < 0) goto error; @@ -61,7 +61,7 @@ error: if(afid->aname) free(afid->aname); if(afid->afd >= 0) - close(afid->afd); + sys_close(afid->afd); free(afid); responderror(r); } @@ -148,7 +148,7 @@ authdestroy(Fid *fid) if((fid->qid.type & QTAUTH) && (afid = fid->aux) != nil){ if(afid->rpc) auth_freerpc(afid->rpc); - close(afid->afd); + sys_close(afid->afd); free(afid->uname); free(afid->aname); free(afid); diff --git a/sys/src/lib/9p/listen.c b/sys/src/lib/9p/listen.c index 5ac0477..7f70ba9 100644 --- a/sys/src/lib/9p/listen.c +++ b/sys/src/lib/9p/listen.c @@ -74,7 +74,7 @@ srvproc(void *v) static void srvfree(Srv *s) { - close(s->infd); + sys_close(s->infd); free(s->addr); free(s); } @@ -87,9 +87,9 @@ getremotesys(char *ndir) snprint(buf, sizeof buf, "%s/remote", ndir); sys = nil; - fd = open(buf, OREAD); + fd = sys_open(buf, OREAD); if(fd >= 0){ - n = read(fd, buf, sizeof(buf)-1); + n = jehanne_read(fd, buf, sizeof(buf)-1); if(n>0){ buf[n-1] = 0; serv = strchr(buf, '!'); @@ -97,7 +97,7 @@ getremotesys(char *ndir) *serv = 0; sys = estrdup9p(buf); } - close(fd); + sys_close(fd); } if(sys == nil) sys = estrdup9p("unknown"); diff --git a/sys/src/lib/9p/post.c b/sys/src/lib/9p/post.c index 050b4f2..b0aa509 100644 --- a/sys/src/lib/9p/post.c +++ b/sys/src/lib/9p/post.c @@ -54,18 +54,18 @@ _postmountsrv(Srv *s, char *name, char *mtpt, int flag) * safety net. */ if(!s->leavefdsopen){ - rfork(RFFDG); - rendezvous(0, 0); - close(s->infd); + sys_rfork(RFFDG); + sys_rendezvous(0, 0); + sys_close(s->infd); if(s->infd != s->outfd) - close(s->outfd); + sys_close(s->outfd); } if(mtpt){ if(amount(s->srvfd, mtpt, flag, "") == -1) sysfatal("mount %s: %r", mtpt); }else - close(s->srvfd); + sys_close(s->srvfd); } void @@ -103,18 +103,18 @@ _postsharesrv(Srv *s, char *name, char *mtpt, char *desc) * safety net. */ if(!s->leavefdsopen){ - rfork(RFFDG); - rendezvous(0, 0); - close(s->infd); + sys_rfork(RFFDG); + sys_rendezvous(0, 0); + sys_close(s->infd); if(s->infd != s->outfd) - close(s->outfd); + sys_close(s->outfd); } if(mtpt){ if(sharefd(mtpt, desc, s->srvfd) < 0) sysfatal("sharefd %s: %r", mtpt); }else - close(s->srvfd); + sys_close(s->srvfd); } @@ -125,9 +125,9 @@ postproc(void *v) s = v; if(!s->leavefdsopen){ - rfork(RFNOTEG); - rendezvous(0, 0); - close(s->srvfd); + sys_rfork(RFNOTEG); + sys_rendezvous(0, 0); + sys_close(s->srvfd); } srv(s); } diff --git a/sys/src/lib/9p/queue.c b/sys/src/lib/9p/queue.c index 4b9600b..4f28672 100644 --- a/sys/src/lib/9p/queue.c +++ b/sys/src/lib/9p/queue.c @@ -14,17 +14,17 @@ _reqqueueproc(void *v) char *buf; q = v; - rfork(RFNOTEG); + sys_rfork(RFNOTEG); buf = smprint("/proc/%d/ctl", getpid()); - fd = open(buf, OWRITE); + fd = sys_open(buf, OWRITE); free(buf); for(;;){ qlock(&q->ql); q->flush = 0; if(fd >= 0) - write(fd, "nointerrupt", 11); + jehanne_write(fd, "nointerrupt", 11); q->cur = nil; while(q->next == (Queueelem *)q) rsleep(&q->r); diff --git a/sys/src/lib/9p/rfork.c b/sys/src/lib/9p/rfork.c index 23a051a..af5a4e8 100644 --- a/sys/src/lib/9p/rfork.c +++ b/sys/src/lib/9p/rfork.c @@ -7,14 +7,14 @@ static void rforker(void (*fn)(void*), void *arg, int flag) { - switch(rfork(RFPROC|RFMEM|RFNOWAIT|flag)){ + switch(sys_rfork(RFPROC|RFMEM|RFNOWAIT|flag)){ case -1: sysfatal("rfork: %r"); default: return; case 0: fn(arg); - _exits(0); + sys__exits(0); } } diff --git a/sys/src/lib/9p/srv.c b/sys/src/lib/9p/srv.c index 1d89b5e..ffaffa7 100644 --- a/sys/src/lib/9p/srv.c +++ b/sys/src/lib/9p/srv.c @@ -481,7 +481,7 @@ ropen(Req *r, char *error) return; if(chatty9p){ snprint(errbuf, sizeof errbuf, "fid mode is 0x%ux\n", r->ifcall.mode); - write(2, errbuf, strlen(errbuf)); + jehanne_write(2, errbuf, strlen(errbuf)); } r->fid->omode = r->ifcall.mode; r->fid->qid = r->ofcall.qid; @@ -910,7 +910,7 @@ if(chatty9p) assert(n > 2); if(r->pool) /* not a fake */ closereq(removereq(r->pool, r->ifcall.tag)); - m = write(srv->outfd, srv->wbuf, n); + m = jehanne_write(srv->outfd, srv->wbuf, n); if(m != n) fprint(2, "lib9p srv: write %d returned %d on fd %d: %r", n, m, srv->outfd); qunlock(&srv->wlock); @@ -961,7 +961,7 @@ postfd(char *name, int pfd) if(fprint(fd, "%d", pfd) < 0){ if(chatty9p) fprint(2, "write fails: %r\n"); - close(fd); + sys_close(fd); return -1; } if(chatty9p) @@ -976,8 +976,8 @@ sharefd(char *name, char *desc, int pfd) char buf[80]; snprint(buf, sizeof buf, "#σc/%s", name); - if((fd = create(buf, OREAD, 0700|DMDIR)) >= 0) - close(fd); + if((fd = sys_create(buf, OREAD, 0700|DMDIR)) >= 0) + sys_close(fd); snprint(buf, sizeof buf, "#σc/%s/%s", name, desc); if(chatty9p) fprint(2, "sharefd %s\n", buf); @@ -990,10 +990,10 @@ sharefd(char *name, char *desc, int pfd) if(fprint(fd, "%d\n", pfd) < 0){ if(chatty9p) fprint(2, "write fails: %r\n"); - close(fd); + sys_close(fd); return -1; } - close(fd); + sys_close(fd); if(chatty9p) fprint(2, "sharefd successful\n"); return 0; diff --git a/sys/src/lib/auth/amount.c b/sys/src/lib/auth/amount.c index 14e75b4..1982425 100644 --- a/sys/src/lib/auth/amount.c +++ b/sys/src/lib/auth/amount.c @@ -25,14 +25,14 @@ amount(int fd, char *mntpt, int flags, char *aname) int rv, afd; AuthInfo *ai; - afd = fauth(fd, aname); + afd = sys_fauth(fd, aname); if(afd >= 0){ ai = auth_proxy(afd, amount_getkey, "proto=p9any role=client"); if(ai != nil) auth_freeAI(ai); } - rv = mount(fd, afd, mntpt, flags, aname, '9'); + rv = sys_mount(fd, afd, mntpt, flags, aname, '9'); if(afd >= 0) - close(afd); + sys_close(afd); return rv; } diff --git a/sys/src/lib/auth/auth_challenge.c b/sys/src/lib/auth/auth_challenge.c index 5ce93ef..07443e0 100644 --- a/sys/src/lib/auth/auth_challenge.c +++ b/sys/src/lib/auth/auth_challenge.c @@ -23,7 +23,7 @@ auth_challenge(char *fmt, ...) return nil; } - if((c->afd = open("/mnt/factotum/rpc", ORDWR)) < 0){ + if((c->afd = sys_open("/mnt/factotum/rpc", ORDWR)) < 0){ Error: auth_freechal(c); free(p); @@ -93,7 +93,7 @@ auth_response(Chalstate *c) } Out: - close(c->afd); + sys_close(c->afd); auth_freerpc(c->rpc); c->afd = -1; c->rpc = nil; @@ -107,7 +107,7 @@ auth_freechal(Chalstate *c) return; if(c->afd >= 0) - close(c->afd); + sys_close(c->afd); if(c->rpc != nil) auth_freerpc(c->rpc); diff --git a/sys/src/lib/auth/auth_chuid.c b/sys/src/lib/auth/auth_chuid.c index fc36986..f25d49c 100644 --- a/sys/src/lib/auth/auth_chuid.c +++ b/sys/src/lib/auth/auth_chuid.c @@ -28,22 +28,22 @@ auth_chuid(AuthInfo *ai, char *ns) } /* change uid */ - fd = open("#¤/capuse", OWRITE); + fd = sys_open("#¤/capuse", OWRITE); if(fd < 0){ werrstr("opening #¤/capuse: %r"); return -1; } - rv = write(fd, ai->cap, strlen(ai->cap)); - close(fd); + rv = jehanne_write(fd, ai->cap, strlen(ai->cap)); + sys_close(fd); if(rv < 0){ werrstr("writing %s to #¤/capuse: %r", ai->cap); return -1; } /* get a link to factotum as new user */ - fd = open("/srv/factotum", ORDWR); + fd = sys_open("/srv/factotum", ORDWR); if(fd >= 0) - mount(fd, -1, "/mnt", MREPL, "", '9'); + sys_mount(fd, -1, "/mnt", MREPL, "", '9'); /* set up new namespace */ return newns(ai->cuid, ns); diff --git a/sys/src/lib/auth/auth_getuserpasswd.c b/sys/src/lib/auth/auth_getuserpasswd.c index fa4359d..0374857 100644 --- a/sys/src/lib/auth/auth_getuserpasswd.c +++ b/sys/src/lib/auth/auth_getuserpasswd.c @@ -35,7 +35,7 @@ auth_getuserpasswd(AuthGetkey *getkey, char *fmt, ...) rpc = nil; params = nil; - fd = open("/mnt/factotum/rpc", ORDWR); + fd = sys_open("/mnt/factotum/rpc", ORDWR); if(fd < 0) goto out; rpc = auth_allocrpc(fd); @@ -70,6 +70,6 @@ auth_getuserpasswd(AuthGetkey *getkey, char *fmt, ...) out: free(params); auth_freerpc(rpc); - close(fd); + sys_close(fd); return up; } diff --git a/sys/src/lib/auth/auth_proxy.c b/sys/src/lib/auth/auth_proxy.c index faaf6d7..b77bef2 100644 --- a/sys/src/lib/auth/auth_proxy.c +++ b/sys/src/lib/auth/auth_proxy.c @@ -129,7 +129,7 @@ fauth_proxy(int fd, AuthRpc *rpc, AuthGetkey *getkey, char *params) } strcpy(oerr, "UNKNOWN AUTH ERROR"); - errstr(oerr, sizeof oerr); + sys_errstr(oerr, sizeof oerr); if(dorpc(rpc, "start", params, strlen(params), getkey) != ARok){ werrstr("fauth_proxy start: %r"); @@ -145,10 +145,10 @@ fauth_proxy(int fd, AuthRpc *rpc, AuthGetkey *getkey, char *params) free(buf); a = auth_getinfo(rpc); /* no error, restore whatever was there */ - errstr(oerr, sizeof oerr); + sys_errstr(oerr, sizeof oerr); return a; case ARok: - if(write(fd, rpc->arg, rpc->narg) != rpc->narg){ + if(jehanne_write(fd, rpc->arg, rpc->narg) != rpc->narg){ werrstr("auth_proxy write fd: %r"); goto Error; } @@ -160,7 +160,7 @@ fauth_proxy(int fd, AuthRpc *rpc, AuthGetkey *getkey, char *params) m = atoi(rpc->arg); if(m <= n || m > AuthRpcMax) break; - m = read(fd, buf + n, m - n); + m = jehanne_read(fd, buf + n, m - n); if(m <= 0){ if(m == 0) werrstr("auth_proxy short read"); @@ -205,7 +205,7 @@ auth_proxy(int fd, AuthGetkey *getkey, char *fmt, ...) } ai = nil; - afd = open("/mnt/factotum/rpc", ORDWR); + afd = sys_open("/mnt/factotum/rpc", ORDWR); if(afd < 0){ werrstr("opening /mnt/factotum/rpc: %r"); free(p); @@ -217,7 +217,7 @@ auth_proxy(int fd, AuthGetkey *getkey, char *fmt, ...) ai = fauth_proxy(fd, rpc, getkey, p); auth_freerpc(rpc); } - close(afd); + sys_close(afd); free(p); return ai; } diff --git a/sys/src/lib/auth/auth_respond.c b/sys/src/lib/auth/auth_respond.c index 92e1605..271dfd2 100644 --- a/sys/src/lib/auth/auth_respond.c +++ b/sys/src/lib/auth/auth_respond.c @@ -31,11 +31,11 @@ auth_respond(void *chal, uint32_t nchal, char *user, uint32_t nuser, void *resp, AuthRpc *rpc; Attr *a; - if((afd = open("/mnt/factotum/rpc", ORDWR)) < 0) + if((afd = sys_open("/mnt/factotum/rpc", ORDWR)) < 0) return -1; if((rpc = auth_allocrpc(afd)) == nil){ - close(afd); + sys_close(afd); return -1; } @@ -49,7 +49,7 @@ auth_respond(void *chal, uint32_t nchal, char *user, uint32_t nuser, void *resp, || dorpc(rpc, "write", chal, nchal, getkey) != ARok || dorpc(rpc, "read", nil, 0, getkey) != ARok){ free(p); - close(afd); + sys_close(afd); auth_freerpc(rpc); return -1; } @@ -66,7 +66,7 @@ auth_respond(void *chal, uint32_t nchal, char *user, uint32_t nuser, void *resp, user[0] = '\0'; _freeattr(a); - close(afd); + sys_close(afd); auth_freerpc(rpc); return nresp; } diff --git a/sys/src/lib/auth/auth_rpc.c b/sys/src/lib/auth/auth_rpc.c index 75e7cd4..d48ad19 100644 --- a/sys/src/lib/auth/auth_rpc.c +++ b/sys/src/lib/auth/auth_rpc.c @@ -72,13 +72,13 @@ auth_rpc(AuthRpc *rpc, char *verb, void *a, int na) memmove(rpc->obuf, verb, l); rpc->obuf[l] = ' '; memmove(rpc->obuf+l+1, a, na); - if((n=write(rpc->afd, rpc->obuf, l+1+na)) != l+1+na){ + if((n=jehanne_write(rpc->afd, rpc->obuf, l+1+na)) != l+1+na){ if(n >= 0) werrstr("auth_rpc short write"); return ARrpcfailure; } - if((n=read(rpc->afd, rpc->ibuf, AuthRpcMax)) < 0) + if((n=jehanne_read(rpc->afd, rpc->ibuf, AuthRpcMax)) < 0) return ARrpcfailure; rpc->ibuf[n] = '\0'; diff --git a/sys/src/lib/auth/auth_wep.c b/sys/src/lib/auth/auth_wep.c index b683833..347b358 100644 --- a/sys/src/lib/auth/auth_wep.c +++ b/sys/src/lib/auth/auth_wep.c @@ -22,7 +22,7 @@ auth_wep(char *dev, char *fmt, ...) return rv; } - fd = open("/mnt/factotum/rpc", ORDWR); + fd = sys_open("/mnt/factotum/rpc", ORDWR); if(fd < 0) return rv; @@ -44,7 +44,7 @@ auth_wep(char *dev, char *fmt, ...) } auth_freerpc(rpc); } - close(fd); + sys_close(fd); return rv; } diff --git a/sys/src/lib/auth/newns.c b/sys/src/lib/auth/newns.c index 69b2529..d61810f 100644 --- a/sys/src/lib/auth/newns.c +++ b/sys/src/lib/auth/newns.c @@ -41,7 +41,7 @@ static int freecloserpc(AuthRpc *rpc) { if(rpc){ - close(rpc->afd); + sys_close(rpc->afd); auth_freerpc(rpc); } return -1; @@ -58,13 +58,13 @@ buildns(int newns, char *user, char *file) rpc = nil; /* try for factotum now because later is impossible */ - afd = open("/mnt/factotum/rpc", ORDWR); + afd = sys_open("/mnt/factotum/rpc", ORDWR); if(afd < 0 && newnsdebug) fprint(2, "open /mnt/factotum/rpc: %r\n"); if(afd >= 0){ rpc = auth_allocrpc(afd); if(rpc == nil) - close(afd); + sys_close(afd); } /* rpc != nil iff afd >= 0 */ @@ -81,7 +81,7 @@ buildns(int newns, char *user, char *file) return freecloserpc(rpc); } if(newns){ - rfork(RFENVG|RFCNAMEG); + sys_rfork(RFENVG|RFCNAMEG); setenv(ENV_USER, user); snprint(home, sizeof home, "/usr/%s", user); setenv(ENV_HOME, home); @@ -145,15 +145,15 @@ famount(int fd, AuthRpc *rpc, char *mntpt, int flags, char *aname) AuthInfo *ai; int ret; - afd = fauth(fd, aname); + afd = sys_fauth(fd, aname); if(afd >= 0){ ai = fauth_proxy(afd, rpc, amount_getkey, "proto=p9any role=client"); if(ai != nil) auth_freeAI(ai); } - ret = mount(fd, afd, mntpt, flags, aname, '9'); + ret = sys_mount(fd, afd, mntpt, flags, aname, '9'); if(afd >= 0) - close(afd); + sys_close(afd); return ret; } @@ -196,17 +196,17 @@ nsop(char *fn, int argc, char *argv[], AuthRpc *rpc) cdroot |= nsfile(fn, b, rpc); Bterm(b); }else if(strcmp(argv0, "clear") == 0 && argc == 0) - rfork(RFCNAMEG); + sys_rfork(RFCNAMEG); else if(strcmp(argv0, "bind") == 0 && argc == 2){ - if(bind(argv[0], argv[1], flags) < 0 && newnsdebug) + if(sys_bind(argv[0], argv[1], flags) < 0 && newnsdebug) fprint(2, "%s: bind: %s %s: %r\n", fn, argv[0], argv[1]); }else if(strcmp(argv0, "unmount") == 0){ if(argc == 1) - unmount(nil, argv[0]); + sys_unmount(nil, argv[0]); else if(argc == 2) - unmount(argv[0], argv[1]); + sys_unmount(argv[0], argv[1]); }else if(strcmp(argv0, "mount") == 0){ - fd = open(argv[0], ORDWR); + fd = sys_open(argv[0], ORDWR); if(argc == 2){ if(famount(fd, rpc, argv[1], flags, "") < 0 && newnsdebug) fprint(2, "%s: mount: %s %s: %r\n", fn, argv[0], argv[1]); @@ -214,7 +214,7 @@ nsop(char *fn, int argc, char *argv[], AuthRpc *rpc) if(famount(fd, rpc, argv[1], flags, argv[2]) < 0 && newnsdebug) fprint(2, "%s: mount: %s %s %s: %r\n", fn, argv[0], argv[1], argv[2]); } - close(fd); + sys_close(fd); }else if(strcmp(argv0, "cd") == 0 && argc == 1){ if(chdir(argv[0]) == 0 && *argv[0] == '/') cdroot = 1; @@ -325,9 +325,9 @@ expandarg(char *arg, char *buf) strcpy(env, "#e/"); strncpy(env+3, p, len); env[3+len] = '\0'; - fd = open(env, OREAD); + fd = sys_open(env, OREAD); if(fd >= 0){ - len = read(fd, &buf[n], ANAMELEN - 1); + len = jehanne_read(fd, &buf[n], ANAMELEN - 1); /* some singleton environment variables have trailing NULs */ /* lists separate entries with NULs; we arbitrarily take the first element */ if(len > 0){ @@ -336,7 +336,7 @@ expandarg(char *arg, char *buf) len = x - &buf[n]; n += len; } - close(fd); + sys_close(fd); } } len = strlen(arg); @@ -358,10 +358,10 @@ setenv(char *name, char *val) if(f < 0) return -1; s = strlen(val); - if(write(f, val, s) != s){ - close(f); + if(jehanne_write(f, val, s) != s){ + sys_close(f); return -1; } - close(f); + sys_close(f); return 0; } diff --git a/sys/src/lib/authsrv/_asgetpakkey.c b/sys/src/lib/authsrv/_asgetpakkey.c index 6b48b07..27e3bdf 100644 --- a/sys/src/lib/authsrv/_asgetpakkey.c +++ b/sys/src/lib/authsrv/_asgetpakkey.c @@ -17,7 +17,7 @@ _asgetpakkey(int fd, Ticketreq *tr, Authkey *a) } tr->type = type; authpak_new(&p, a, y, 1); - if(write(fd, y, PAKYLEN) != PAKYLEN + if(jehanne_write(fd, y, PAKYLEN) != PAKYLEN || _asrdresp(fd, (char*)y, PAKYLEN) != PAKYLEN){ memset(&p, 0, sizeof(p)); return -1; diff --git a/sys/src/lib/authsrv/_asgetresp.c b/sys/src/lib/authsrv/_asgetresp.c index 21b3194..4af2b45 100644 --- a/sys/src/lib/authsrv/_asgetresp.c +++ b/sys/src/lib/authsrv/_asgetresp.c @@ -13,7 +13,7 @@ _asgetresp(int fd, Ticket *t, Authenticator *a, Authkey *k) memset(a, 0, sizeof(Authenticator)); strcpy(err, "AS protocol botch"); - errstr(err, ERRMAX); + sys_errstr(err, ERRMAX); if(_asrdresp(fd, buf, 0) < 0) return -1; @@ -38,7 +38,7 @@ _asgetresp(int fd, Ticket *t, Authenticator *a, Authkey *k) } } - errstr(err, ERRMAX); + sys_errstr(err, ERRMAX); return 0; } diff --git a/sys/src/lib/authsrv/_asgetticket.c b/sys/src/lib/authsrv/_asgetticket.c index f14d0da..c511e24 100644 --- a/sys/src/lib/authsrv/_asgetticket.c +++ b/sys/src/lib/authsrv/_asgetticket.c @@ -9,7 +9,7 @@ _asgetticket(int fd, Ticketreq *tr, char *tbuf, int tbuflen) int i, n, m, r; strcpy(err, "AS protocol botch"); - errstr(err, ERRMAX); + sys_errstr(err, ERRMAX); if(_asrequest(fd, tr) < 0) return -1; @@ -31,7 +31,7 @@ _asgetticket(int fd, Ticketreq *tr, char *tbuf, int tbuflen) tbuflen -= n; } - errstr(err, ERRMAX); + sys_errstr(err, ERRMAX); return r; } diff --git a/sys/src/lib/authsrv/_asrdresp.c b/sys/src/lib/authsrv/_asrdresp.c index ff6da58..16b41b4 100644 --- a/sys/src/lib/authsrv/_asrdresp.c +++ b/sys/src/lib/authsrv/_asrdresp.c @@ -10,7 +10,7 @@ _asrdresp(int fd, char *buf, int len) int n; char error[64]; - if(read(fd, buf, 1) != 1){ + if(jehanne_read(fd, buf, 1) != 1){ werrstr(pbmsg); return -1; } diff --git a/sys/src/lib/authsrv/_asrequest.c b/sys/src/lib/authsrv/_asrequest.c index ececa7b..c1534ce 100644 --- a/sys/src/lib/authsrv/_asrequest.c +++ b/sys/src/lib/authsrv/_asrequest.c @@ -9,7 +9,7 @@ _asrequest(int fd, Ticketreq *tr) int n; n = convTR2M(tr, trbuf, sizeof(trbuf)); - if(write(fd, trbuf, n) != n) + if(jehanne_write(fd, trbuf, n) != n) return -1; return 0; diff --git a/sys/src/lib/authsrv/readnvram.c b/sys/src/lib/authsrv/readnvram.c index 9d90a37..af3b678 100644 --- a/sys/src/lib/authsrv/readnvram.c +++ b/sys/src/lib/authsrv/readnvram.c @@ -53,10 +53,10 @@ readcons(char *prompt, char *def, int raw, char *buf, int nbuf) int fdin, fdout, ctl, n, m; char line[10]; - fdin = open("/dev/cons", OREAD); + fdin = sys_open("/dev/cons", OREAD); if(fdin < 0) fdin = 0; - fdout = open("/dev/cons", OWRITE); + fdout = sys_open("/dev/cons", OWRITE); if(fdout < 0) fdout = 1; if(def != nil) @@ -64,22 +64,22 @@ readcons(char *prompt, char *def, int raw, char *buf, int nbuf) else fprint(fdout, "%s: ", prompt); if(raw){ - ctl = open("/dev/consctl", OWRITE); + ctl = sys_open("/dev/consctl", OWRITE); if(ctl >= 0) - write(ctl, "rawon", 5); + jehanne_write(ctl, "rawon", 5); } else ctl = -1; m = 0; for(;;){ - n = read(fdin, line, 1); + n = jehanne_read(fdin, line, 1); if(n == 0){ - close(ctl); + sys_close(ctl); werrstr("readcons: EOF"); return nil; } if(n < 0){ - close(ctl); + sys_close(ctl); werrstr("can't read cons"); return nil; } @@ -87,9 +87,9 @@ readcons(char *prompt, char *def, int raw, char *buf, int nbuf) exits(0); if(n == 0 || line[0] == '\n' || line[0] == '\r'){ if(raw){ - write(ctl, "rawoff", 6); - write(fdout, "\n", 1); - close(ctl); + jehanne_write(ctl, "rawoff", 6); + jehanne_write(fdout, "\n", 1); + sys_close(ctl); } buf[m] = '\0'; if(buf[0]=='\0' && def) @@ -157,9 +157,9 @@ findnvram(Nvrwhere *locp) v[0] = ""; v[1] = nil; } - fd = open(v[0], ORDWR); + fd = sys_open(v[0], ORDWR); if (fd < 0) - fd = open(v[0], OREAD); + fd = sys_open(v[0], OREAD); safelen = sizeof(Nvrsafe); if(strstr(v[0], "/9fat") == nil) safeoff = 0; @@ -176,7 +176,7 @@ findnvram(Nvrwhere *locp) safelen = 512; safeoff = finddosfile(fd, i == 2? v[1]: "plan9.nvr"); if(safeoff < 0){ /* didn't find plan9.nvr? */ - close(fd); + sys_close(fd); fd = -1; } } @@ -186,14 +186,14 @@ findnvram(Nvrwhere *locp) for(i=0; i= 0) - close(loc.fd); + sys_close(loc.fd); return err? -1: 0; } @@ -419,7 +419,7 @@ finddosfile(int fd, char *file) /* read boot block, check for sanity */ b = (Dosboot*)secbuf; - if(read(fd, secbuf, sizeof(secbuf)) != sizeof(secbuf)) + if(jehanne_read(fd, secbuf, sizeof(secbuf)) != sizeof(secbuf)) return -1; if(b->magic[0] != 0xEB || b->magic[1] != 0x3C || b->magic[2] != 0x90) return -1; @@ -427,7 +427,7 @@ finddosfile(int fd, char *file) if(sectsize != 512) return -1; rootoff = (GETSHORT(b->nresrv) + b->nfats*GETSHORT(b->fatsize)) * sectsize; - if(seek(fd, rootoff, 0) < 0) + if(sys_seek(fd, rootoff, 0) < 0) return -1; nroot = GETSHORT(b->rootsize); rootsects = (nroot*sizeof(Dosdir)+sectsize-1)/sectsize; @@ -439,7 +439,7 @@ finddosfile(int fd, char *file) * this easier */ root = malloc(rootsects*sectsize); - if(read(fd, root, rootsects*sectsize) != rootsects*sectsize) + if(jehanne_read(fd, root, rootsects*sectsize) != rootsects*sectsize) return -1; n = -1; for(dp = root; dp < &root[nroot]; dp++) diff --git a/sys/src/lib/bio/bflush.c b/sys/src/lib/bio/bflush.c index d20a085..59c540c 100644 --- a/sys/src/lib/bio/bflush.c +++ b/sys/src/lib/bio/bflush.c @@ -21,7 +21,7 @@ Bflush(Biobufhdr *bp) n = bp->bsize+bp->ocount; if(n == 0) return 0; - c = write(bp->fid, bp->bbuf, n); + c = jehanne_write(bp->fid, bp->bbuf, n); if(n == c) { bp->offset += n; bp->ocount = -bp->bsize; diff --git a/sys/src/lib/bio/bgetc.c b/sys/src/lib/bio/bgetc.c index c7cad5a..d7064fb 100644 --- a/sys/src/lib/bio/bgetc.c +++ b/sys/src/lib/bio/bgetc.c @@ -33,7 +33,7 @@ loop: * buffer to allow that many ungets. */ memmove(bp->bbuf-Bungetsize, bp->ebuf-Bungetsize, Bungetsize); - i = read(bp->fid, bp->bbuf, bp->bsize); + i = jehanne_read(bp->fid, bp->bbuf, bp->bsize); bp->gbuf = bp->bbuf; if(i <= 0) { bp->state = Bracteof; diff --git a/sys/src/lib/bio/binit.c b/sys/src/lib/bio/binit.c index e542c2a..8934a8e 100644 --- a/sys/src/lib/bio/binit.c +++ b/sys/src/lib/bio/binit.c @@ -130,7 +130,7 @@ Bopen(char *name, int mode) fprint(2, "Bopen: unknown mode %#x\n", mode); return 0; case OREAD: - f = open(name, mode); + f = sys_open(name, mode); break; case OWRITE: f = ocreate(name, mode, 0666); @@ -153,7 +153,7 @@ Bterm(Biobufhdr *bp) r = Bflush(bp); if(bp->flag == Bmagic) { bp->flag = 0; - close(bp->fid); + sys_close(bp->fid); bp->fid = -1; /* prevent accidents */ free(bp); } diff --git a/sys/src/lib/bio/brdline.c b/sys/src/lib/bio/brdline.c index 6bdc5b6..b41b70f 100644 --- a/sys/src/lib/bio/brdline.c +++ b/sys/src/lib/bio/brdline.c @@ -55,7 +55,7 @@ Brdline(Biobufhdr *bp, int delim) */ ip = (char*)bp->bbuf + i; while(i < bp->bsize) { - j = read(bp->fid, ip, bp->bsize-i); + j = jehanne_read(bp->fid, ip, bp->bsize-i); if(j <= 0) { /* * end of file with no delim diff --git a/sys/src/lib/bio/brdstr.c b/sys/src/lib/bio/brdstr.c index 379209d..ab81eeb 100644 --- a/sys/src/lib/bio/brdstr.c +++ b/sys/src/lib/bio/brdstr.c @@ -76,7 +76,7 @@ Brdstr(Biobufhdr *bp, int delim, int nulldelim) for(;;){ ip = (char*)bp->bbuf + i; while(i < bp->bsize) { - j = read(bp->fid, ip, bp->bsize-i); + j = jehanne_read(bp->fid, ip, bp->bsize-i); if(j <= 0 && i == 0) return p; if(j <= 0 && i > 0){ diff --git a/sys/src/lib/bio/bread.c b/sys/src/lib/bio/bread.c index 9208739..4be202f 100644 --- a/sys/src/lib/bio/bread.c +++ b/sys/src/lib/bio/bread.c @@ -29,7 +29,7 @@ Bread(Biobufhdr *bp, void *ap, int32_t count) if(n == 0) { if(bp->state != Bractive) break; - i = read(bp->fid, bp->bbuf, bp->bsize); + i = jehanne_read(bp->fid, bp->bbuf, bp->bsize); if(i <= 0) { bp->state = Bracteof; if(i < 0) diff --git a/sys/src/lib/bio/bseek.c b/sys/src/lib/bio/bseek.c index 3cbde1b..194d813 100644 --- a/sys/src/lib/bio/bseek.c +++ b/sys/src/lib/bio/bseek.c @@ -52,14 +52,14 @@ Bseek(Biobufhdr *bp, int64_t offset, int base) /* * reset the buffer */ - n = seek(bp->fid, n, base); + n = sys_seek(bp->fid, n, base); bp->icount = 0; bp->gbuf = bp->ebuf; break; case Bwactive: Bflush(bp); - n = seek(bp->fid, offset, base); + n = sys_seek(bp->fid, offset, base); break; } bp->offset = n; diff --git a/sys/src/lib/bio/bwrite.c b/sys/src/lib/bio/bwrite.c index e811a00..027b7ca 100644 --- a/sys/src/lib/bio/bwrite.c +++ b/sys/src/lib/bio/bwrite.c @@ -30,12 +30,12 @@ Bwrite(Biobufhdr *bp, void *ap, int32_t count) if(n == 0) { if(bp->state != Bwactive) return Beof; - i = write(bp->fid, bp->bbuf, bp->bsize); + i = jehanne_write(bp->fid, bp->bbuf, bp->bsize); if(i != bp->bsize) { - errstr(errbuf, sizeof errbuf); + sys_errstr(errbuf, sizeof errbuf); if(strstr(errbuf, "interrupt") == nil) bp->state = Binactive; - errstr(errbuf, sizeof errbuf); + sys_errstr(errbuf, sizeof errbuf); return Beof; } bp->offset += i; diff --git a/sys/src/lib/c/9sys/access.c b/sys/src/lib/c/9sys/access.c index d71f476..160bceb 100644 --- a/sys/src/lib/c/9sys/access.c +++ b/sys/src/lib/c/9sys/access.c @@ -36,9 +36,9 @@ jehanne_access(const char *name, int mode) }; reqmode = omode[mode&AMASK]; - fd = open(name, reqmode); + fd = sys_open(name, reqmode); if(fd >= 0){ - close(fd); + sys_close(fd); return 0; } diff --git a/sys/src/lib/c/9sys/announce.c b/sys/src/lib/c/9sys/announce.c index 3ff0447..95fdd2e 100644 --- a/sys/src/lib/c/9sys/announce.c +++ b/sys/src/lib/c/9sys/announce.c @@ -40,7 +40,7 @@ jehanne_announce(const char *addr, char *dir) /* * get a control channel */ - ctl = open(netdir, ORDWR); + ctl = sys_open(netdir, ORDWR); if(ctl<0){ jehanne_werrstr("announce opening %s: %r", netdir); return -1; @@ -48,7 +48,7 @@ jehanne_announce(const char *addr, char *dir) cp = jehanne_strrchr(netdir, '/'); if(cp == nil){ jehanne_werrstr("announce arg format %s", netdir); - close(ctl); + sys_close(ctl); return -1; } *cp = 0; @@ -57,10 +57,10 @@ jehanne_announce(const char *addr, char *dir) * find out which line we have */ n = jehanne_snprint(buf, sizeof(buf), "%s/", netdir); - m = read(ctl, &buf[n], sizeof(buf)-n-1); + m = jehanne_read(ctl, &buf[n], sizeof(buf)-n-1); if(m <= 0){ jehanne_werrstr("announce reading %s: %r", netdir); - close(ctl); + sys_close(ctl); return -1; } buf[n+m] = 0; @@ -69,9 +69,9 @@ jehanne_announce(const char *addr, char *dir) * make the call */ n = jehanne_snprint(buf2, sizeof(buf2), "announce %s", naddr); - if(write(ctl, buf2, n)!=n){ + if(jehanne_write(ctl, buf2, n)!=n){ jehanne_werrstr("announce writing %s: %r", netdir); - close(ctl); + sys_close(ctl); return -1; } @@ -99,7 +99,7 @@ jehanne_listen(const char *dir, char *newdir) * open listen, wait for a call */ jehanne_snprint(buf, sizeof(buf), "%s/listen", dir); - ctl = open(buf, ORDWR); + ctl = sys_open(buf, ORDWR); if(ctl < 0){ jehanne_werrstr("listen opening %s: %r", buf); return -1; @@ -112,15 +112,15 @@ jehanne_listen(const char *dir, char *newdir) buf[sizeof(buf) - 1] = 0; cp = jehanne_strrchr(buf, '/'); if(cp == nil){ - close(ctl); + sys_close(ctl); jehanne_werrstr("listen arg format %s", dir); return -1; } *++cp = 0; n = cp-buf; - m = read(ctl, cp, sizeof(buf) - n - 1); + m = jehanne_read(ctl, cp, sizeof(buf) - n - 1); if(m <= 0){ - close(ctl); + sys_close(ctl); jehanne_werrstr("listen reading %s/listen: %r", dir); return -1; } @@ -154,10 +154,10 @@ jehanne_accept(int ctl, const char *dir) num++; n = jehanne_snprint(buf, sizeof(buf), "accept %s", num); - write(ctl, buf, n); /* ignore return value, network might not need accepts */ + jehanne_write(ctl, buf, n); /* ignore return value, network might not need accepts */ jehanne_snprint(buf, sizeof(buf), "%s/data", dir); - return open(buf, ORDWR); + return sys_open(buf, ORDWR); } /* @@ -177,7 +177,7 @@ jehanne_reject(int ctl, const char *dir, const char *cause) num++; jehanne_snprint(buf, sizeof(buf), "reject %s %s", num, cause); n = jehanne_strlen(buf); - if(write(ctl, buf, n) != n) + if(jehanne_write(ctl, buf, n) != n) return -1; return 0; } @@ -248,16 +248,16 @@ nettrans(const char *addr, char *naddr, int na, char *file, int nf) * ask the connection server */ jehanne_snprint(buf, sizeof(buf), "%s/cs", netdir); - fd = open(buf, ORDWR); + fd = sys_open(buf, ORDWR); if(fd < 0) return identtrans(netdir, addr, naddr, na, file, nf); - if(write(fd, addr, jehanne_strlen(addr)) < 0){ - close(fd); + if(jehanne_write(fd, addr, jehanne_strlen(addr)) < 0){ + sys_close(fd); return -1; } - seek(fd, 0, 0); - n = read(fd, buf, sizeof(buf)-1); - close(fd); + sys_seek(fd, 0, 0); + n = jehanne_read(fd, buf, sizeof(buf)-1); + sys_close(fd); if(n <= 0) return -1; buf[n] = 0; diff --git a/sys/src/lib/c/9sys/awakened.c b/sys/src/lib/c/9sys/awakened.c index c5349c8..94e4b6e 100644 --- a/sys/src/lib/c/9sys/awakened.c +++ b/sys/src/lib/c/9sys/awakened.c @@ -23,13 +23,13 @@ int jehanne_awakened(int64_t wakeup) { /* awake returns the ticks of the scheduled wakeup in negative, - * thus a wakeup is in the past iff (-awake(0)) >= (-wakeup) + * thus a wakeup is in the past iff (-sys_awake(0)) >= (-wakeup) * - * NOTE: this is not a macro so that we can change the awake() + * NOTE: this is not a macro so that we can change the sys_awake() * implementation in the future, without affecting the client code. */ assert(wakeup < 0); - return wakeup >= awake(0); + return wakeup >= sys_awake(0); } int @@ -38,13 +38,13 @@ jehanne_forgivewkp(int64_t wakeup) /* awake returns the ticks of the scheduled wakeup in negative, * and is able to remove a wakeup provided such value. * - * jehanne_forgivewkp() is just a wrapper to hide awake()'s details that + * jehanne_forgivewkp() is just a wrapper to hide sys_awake()'s details that * could change in the future and make client code easier to * read. * - * NOTE: this is not a macro so that we can change the awake() + * NOTE: this is not a macro so that we can change the sys_awake() * implementation in the future, without affecting the client code. */ assert(wakeup < 0); - return awake(wakeup); + return sys_awake(wakeup); } diff --git a/sys/src/lib/c/9sys/chdir.c b/sys/src/lib/c/9sys/chdir.c index 99af29e..a2c7674 100644 --- a/sys/src/lib/c/9sys/chdir.c +++ b/sys/src/lib/c/9sys/chdir.c @@ -27,12 +27,12 @@ jehanne_chdir(const char *dirname) tmp = jehanne_getpid(); jehanne_snprint(buf, sizeof(buf), "/proc/%d/wdir", tmp); - fd = open(buf, OWRITE); + fd = sys_open(buf, OWRITE); if(fd < 0) - fd = open("#0/wdir", OWRITE); + fd = sys_open("#0/wdir", OWRITE); if(fd < 0) return fd; - tmp = write(fd, dirname, 1+jehanne_strlen(dirname)); - close(fd); + tmp = jehanne_write(fd, dirname, 1+jehanne_strlen(dirname)); + sys_close(fd); return tmp; } diff --git a/sys/src/lib/c/9sys/ctime.c b/sys/src/lib/c/9sys/ctime.c index f8e776c..2221124 100644 --- a/sys/src/lib/c/9sys/ctime.c +++ b/sys/src/lib/c/9sys/ctime.c @@ -226,14 +226,14 @@ readtimezone(void) int i; jehanne_memset(buf, 0, sizeof(buf)); - i = open("/env/timezone", OREAD); + i = sys_open("/env/timezone", OREAD); if(i < 0) goto error; - if(read(i, buf, sizeof(buf)) >= sizeof(buf)){ - close(i); + if(jehanne_read(i, buf, sizeof(buf)) >= sizeof(buf)){ + sys_close(i); goto error; } - close(i); + sys_close(i); p = buf; if(rd_name(&p, timezone.stname)) goto error; diff --git a/sys/src/lib/c/9sys/dial.c b/sys/src/lib/c/9sys/dial.c index 0bfd65c..47f5da9 100644 --- a/sys/src/lib/c/9sys/dial.c +++ b/sys/src/lib/c/9sys/dial.c @@ -103,7 +103,7 @@ dialimpl(const char *dest, const char *local, char *dir, int *cfdp) if(rv >= 0) return rv; err[0] = '\0'; - errstr(err, sizeof err); + sys_errstr(err, sizeof err); if(jehanne_strstr(err, "refused") != 0){ jehanne_werrstr("%s", err); return rv; @@ -114,7 +114,7 @@ dialimpl(const char *dest, const char *local, char *dir, int *cfdp) return rv; alterr[0] = 0; - errstr(alterr, sizeof alterr); + sys_errstr(alterr, sizeof alterr); if(jehanne_strstr(alterr, "translate") || jehanne_strstr(alterr, "does not exist")) jehanne_werrstr("%s", err); else @@ -123,7 +123,7 @@ dialimpl(const char *dest, const char *local, char *dir, int *cfdp) } /* - * the thread library can't cope with rfork(RFMEM|RFPROC), + * the thread library can't cope with sys_rfork(RFMEM|RFPROC), * so it must override this with a private version of dial. */ int (*_dial)(const char *, const char *, char *, int *) = dialimpl; @@ -163,14 +163,14 @@ freedest(Dest *dp) jehanne_free(dp->conn); jehanne_free(dp); if (oalarm >= 0) - alarm(oalarm); + sys_alarm(oalarm); } static void closeopenfd(int *fdp) { if (*fdp >= 0) { - close(*fdp); + sys_close(*fdp); *fdp = -1; } } @@ -220,7 +220,7 @@ reap(Dest *dp) { char exitsts[2*ERRMAX]; - if (outstandingprocs(dp) && await(exitsts, sizeof exitsts) >= 0) { + if (outstandingprocs(dp) && sys_await(exitsts, sizeof exitsts) >= 0) { notedeath(dp, exitsts); return 0; } @@ -301,7 +301,7 @@ static void pickuperr(char *besterr, char *err) { err[0] = '\0'; - errstr(err, ERRMAX); + sys_errstr(err, ERRMAX); if(jehanne_strstr(err, "does not exist") == 0) jehanne_strcpy(besterr, err); } @@ -329,7 +329,7 @@ dialmulti(DS *ds, Dest *dp) while(dp->winner < 0 && *dp->nextaddr != '\0' && parsecs(dp, &clone, &dest) >= 0) { kidme = dp->nkid++; /* make private copy on stack */ - kid = rfork(RFPROC|RFMEM); /* spin off a call attempt */ + kid = sys_rfork(RFPROC|RFMEM); /* spin off a call attempt */ if (kid < 0) --dp->nkid; else if (kid == 0) { @@ -342,7 +342,7 @@ dialmulti(DS *ds, Dest *dp) rv = call(clone, dest, ds, dp, &dp->conn[kidme]); if(rv < 0) pickuperr(besterr, err); - _exits(besterr); /* avoid atexit callbacks */ + sys__exits(besterr); /* avoid atexit callbacks */ } } *besterr = '\0'; @@ -366,7 +366,7 @@ csdial(DS *ds) if(dp == nil) return -1; dp->winner = -1; - dp->oalarm = alarm(0); + dp->oalarm = sys_alarm(0); if (connsalloc(dp, 1) < 0) { /* room for a single conn. */ freedest(dp); return -1; @@ -376,7 +376,7 @@ csdial(DS *ds) * open connection server */ jehanne_snprint(buf, sizeof(buf), "%s/cs", ds->netdir); - fd = open(buf, ORDWR); + fd = sys_open(buf, ORDWR); if(fd < 0){ /* no connection server, don't translate */ jehanne_snprint(clone, sizeof(clone), "%s/%s/clone", ds->netdir, ds->proto); @@ -391,8 +391,8 @@ csdial(DS *ds) * e.g., net!cs.bell-labs.com!smtp */ jehanne_snprint(buf, sizeof(buf), "%s!%s", ds->proto, ds->rem); - if(write(fd, buf, jehanne_strlen(buf)) < 0){ - close(fd); + if(jehanne_write(fd, buf, jehanne_strlen(buf)) < 0){ + sys_close(fd); freedest(dp); return -1; } @@ -404,11 +404,11 @@ csdial(DS *ds) * * assumes that we'll get one record per read. */ - seek(fd, 0, 0); + sys_seek(fd, 0, 0); addrs = 0; addrp = dp->nextaddr = dp->addrlist; bleft = sizeof dp->addrlist - 2; /* 2 is room for \n\0 */ - while(bleft > 0 && (n = read(fd, addrp, bleft)) > 0) { + while(bleft > 0 && (n = jehanne_read(fd, addrp, bleft)) > 0) { if (addrp[n-1] != '\n') addrp[n++] = '\n'; addrs++; @@ -422,9 +422,9 @@ csdial(DS *ds) * have been truncated and ignore it. we really don't expect this * to happen. */ - if (addrs > 0 && bleft <= 0 && read(fd, &c, 1) == 1) + if (addrs > 0 && bleft <= 0 && jehanne_read(fd, &c, 1) == 1) addrs--; - close(fd); + sys_close(fd); *besterr = 0; rv = -1; /* pessimistic default */ @@ -467,12 +467,12 @@ call(char *clone, char *dest, DS *ds, Dest *dp, Conn *conn) jehanne_snprint(cname, sizeof cname, "%s/%s", ds->netdir, p); conn->pid = jehanne_getpid(); - conn->cfd = cfd = open(cname, ORDWR); + conn->cfd = cfd = sys_open(cname, ORDWR); if(cfd < 0) return -1; /* get directory name */ - n = read(cfd, name, sizeof(name)-1); + n = jehanne_read(cfd, name, sizeof(name)-1); if(n < 0){ closeopenfd(&conn->cfd); return -1; @@ -490,29 +490,29 @@ call(char *clone, char *dest, DS *ds, Dest *dp, Conn *conn) /* should be no alarm pending now; re-instate caller's alarm, if any */ calleralarm = dp->oalarm > 0; if (calleralarm) - alarm(dp->oalarm); + sys_alarm(dp->oalarm); else if (dp->naddrs > 1) /* in a sub-process? */ - alarm(Maxconnms); + sys_alarm(Maxconnms); /* connect */ if(ds->local) jehanne_snprint(name, sizeof(name), "connect %s %s", dest, ds->local); else jehanne_snprint(name, sizeof(name), "connect %s", dest); - if(write(cfd, name, jehanne_strlen(name)) < 0){ + if(jehanne_write(cfd, name, jehanne_strlen(name)) < 0){ closeopenfd(&conn->cfd); return -1; } - oalarm = alarm(0); /* don't let alarm interrupt critical section */ + oalarm = sys_alarm(0); /* don't let alarm interrupt critical section */ if (calleralarm) dp->oalarm = oalarm; /* time has passed, so update user's */ /* open data connection */ - conn->dfd = fd = open(data, ORDWR); + conn->dfd = fd = sys_open(data, ORDWR); if(fd < 0){ closeopenfd(&conn->cfd); - alarm(dp->oalarm); + sys_alarm(dp->oalarm); return -1; } if(ds->cfdp == nil) @@ -525,7 +525,7 @@ call(char *clone, char *dest, DS *ds, Dest *dp, Conn *conn) dp->winner = n; jehanne_qunlock(&dp->winlck); } - alarm(calleralarm? dp->oalarm: 0); + sys_alarm(calleralarm? dp->oalarm: 0); return fd; } diff --git a/sys/src/lib/c/9sys/dirfstat.c b/sys/src/lib/c/9sys/dirfstat.c index 670a31f..69fb18f 100644 --- a/sys/src/lib/c/9sys/dirfstat.c +++ b/sys/src/lib/c/9sys/dirfstat.c @@ -29,7 +29,7 @@ jehanne_dirfstat(int fd) if(d == nil) return nil; buf = (uint8_t*)&d[1]; - n = fstat(fd, buf, BIT16SZ+nd); + n = sys_fstat(fd, buf, BIT16SZ+nd); if(n < BIT16SZ){ jehanne_free(d); return nil; diff --git a/sys/src/lib/c/9sys/dirfwstat.c b/sys/src/lib/c/9sys/dirfwstat.c index 022aa5c..5d0c02c 100644 --- a/sys/src/lib/c/9sys/dirfwstat.c +++ b/sys/src/lib/c/9sys/dirfwstat.c @@ -22,7 +22,7 @@ jehanne_dirfwstat(int fd, Dir *d) if(buf == nil) return -1; jehanne_convD2M(d, buf, r); - r = fwstat(fd, buf, r); + r = sys_fwstat(fd, buf, r); jehanne_free(buf); return r; } diff --git a/sys/src/lib/c/9sys/dirread.c b/sys/src/lib/c/9sys/dirread.c index 35a9a59..b655d5c 100644 --- a/sys/src/lib/c/9sys/dirread.c +++ b/sys/src/lib/c/9sys/dirread.c @@ -70,7 +70,7 @@ jehanne_dirread(int fd, Dir **d) buf = jehanne_malloc(DIRMAX); if(buf == nil) return -1; - ts = read(fd, buf, DIRMAX); + ts = jehanne_read(fd, buf, DIRMAX); if(ts >= 0) ts = dirpackage(buf, ts, d); jehanne_free(buf); @@ -92,7 +92,7 @@ jehanne_dirreadall(int fd, Dir **d) return -1; } buf = nbuf; - n = read(fd, buf+ts, DIRMAX); + n = jehanne_read(fd, buf+ts, DIRMAX); if(n <= 0) break; ts += n; diff --git a/sys/src/lib/c/9sys/dup.c b/sys/src/lib/c/9sys/dup.c index c7c5519..51a68b9 100644 --- a/sys/src/lib/c/9sys/dup.c +++ b/sys/src/lib/c/9sys/dup.c @@ -27,12 +27,12 @@ jehanne_dup(int oldfd, int newfd) in.fd[0] = oldfd; in.fd[1] = newfd; - f = create("#d/new", -1, in.aslong); + f = sys_create("#d/new", -1, in.aslong); if(f == -1) return -1; if(f >= 0){ /* this should never happen */ - close(f); + sys_close(f); return -1; } out.aslong = ~f; diff --git a/sys/src/lib/c/9sys/fork.c b/sys/src/lib/c/9sys/fork.c index 7703044..745e8a2 100644 --- a/sys/src/lib/c/9sys/fork.c +++ b/sys/src/lib/c/9sys/fork.c @@ -13,5 +13,5 @@ int jehanne_fork(void) { - return rfork(RFPROC|RFFDG|RFREND); + return sys_rfork(RFPROC|RFFDG|RFREND); } diff --git a/sys/src/lib/c/9sys/getenv.c b/sys/src/lib/c/9sys/getenv.c index 46703ff..e253252 100644 --- a/sys/src/lib/c/9sys/getenv.c +++ b/sys/src/lib/c/9sys/getenv.c @@ -38,9 +38,9 @@ jehanne_getenv(const char *name) if(jehanne_strcmp(path+5, name) != 0) goto BadName; - f = open(path, OREAD); + f = sys_open(path, OREAD); if(f < 0){ - /* try with #e, in case of a previous rfork(RFCNAMEG) + /* try with #e, in case of a previous sys_rfork(RFCNAMEG) * * NOTE: /env is bound to #ec by default, so we * cannot simply use always #e instead of /env. Also @@ -48,20 +48,20 @@ jehanne_getenv(const char *name) * slow and not flexible enough. */ jehanne_snprint(path, sizeof path, "#e/%s", name); - f = open(path, OREAD); + f = sys_open(path, OREAD); if(f < 0) return nil; } - l = seek(f, 0, 2); + l = sys_seek(f, 0, 2); value = jehanne_malloc(l+1); if(value == nil) goto Done; jehanne_setmalloctag(value, jehanne_getcallerpc()); - seek(f, 0, 0); - if(read(f, value, l) >= 0) + sys_seek(f, 0, 0); + if(jehanne_read(f, value, l) >= 0) value[l] = '\0'; Done: - close(f); + sys_close(f); return value; BadName: diff --git a/sys/src/lib/c/9sys/getnetconninfo.c b/sys/src/lib/c/9sys/getnetconninfo.c index 3c9f814..b550c75 100644 --- a/sys/src/lib/c/9sys/getnetconninfo.c +++ b/sys/src/lib/c/9sys/getnetconninfo.c @@ -22,9 +22,9 @@ getendpoint(char *dir, char *file, char **sysp, char **servp) sys = serv = 0; jehanne_snprint(buf, sizeof buf, "%s/%s", dir, file); - fd = open(buf, OREAD); + fd = sys_open(buf, OREAD); if(fd >= 0){ - n = read(fd, buf, sizeof(buf)-1); + n = jehanne_read(fd, buf, sizeof(buf)-1); if(n>0){ buf[n-1] = 0; serv = jehanne_strchr(buf, '!'); @@ -34,7 +34,7 @@ getendpoint(char *dir, char *file, char **sysp, char **servp) } sys = jehanne_strdup(buf); } - close(fd); + sys_close(fd); } if(serv == 0) serv = unknown; @@ -56,7 +56,7 @@ jehanne_getnetconninfo(const char *dir, int fd) /* get a directory address via fd */ if(dir == nil || *dir == 0){ - if(fd2path(fd, path, sizeof(path)) < 0) + if(sys_fd2path(fd, path, sizeof(path)) < 0) return nil; cp = jehanne_strrchr(path, '/'); if(cp == nil) diff --git a/sys/src/lib/c/9sys/getpid.c b/sys/src/lib/c/9sys/getpid.c index 5eed694..3bf1485 100644 --- a/sys/src/lib/c/9sys/getpid.c +++ b/sys/src/lib/c/9sys/getpid.c @@ -23,6 +23,6 @@ int jehanne_getpid(void) { int pid; - pid = (int)remove("#0/pid"); + pid = (int)sys_remove("#0/pid"); return pid; } diff --git a/sys/src/lib/c/9sys/getppid.c b/sys/src/lib/c/9sys/getppid.c index 62d4c22..4fc453d 100644 --- a/sys/src/lib/c/9sys/getppid.c +++ b/sys/src/lib/c/9sys/getppid.c @@ -23,6 +23,6 @@ int jehanne_getppid(void) { int pid; - pid = (int)remove("#0/ppid"); + pid = (int)sys_remove("#0/ppid"); return pid; } diff --git a/sys/src/lib/c/9sys/getwd.c b/sys/src/lib/c/9sys/getwd.c index 559e6db..363c6fe 100644 --- a/sys/src/lib/c/9sys/getwd.c +++ b/sys/src/lib/c/9sys/getwd.c @@ -32,14 +32,14 @@ jehanne_getwd(char *buf, int nbuf) long n; int fd; - fd = open("#0/wdir", OREAD); + fd = sys_open("#0/wdir", OREAD); if(fd < 0) return 0; - n = read(fd, nil, -1); + n = jehanne_read(fd, nil, -1); if(n == ~0) /* an error occurred */ return 0; if(nbuf >= ~n) - n = read(fd, buf, nbuf); - close(fd); + n = jehanne_read(fd, buf, nbuf); + sys_close(fd); return n; } diff --git a/sys/src/lib/c/9sys/iounit.c b/sys/src/lib/c/9sys/iounit.c index 36a4418..5668863 100644 --- a/sys/src/lib/c/9sys/iounit.c +++ b/sys/src/lib/c/9sys/iounit.c @@ -22,11 +22,11 @@ jehanne_iounit(int fd) char buf[128], *args[10]; jehanne_snprint(buf, sizeof buf, "#d/%dctl", fd); - cfd = open(buf, OREAD); + cfd = sys_open(buf, OREAD); if(cfd < 0) return 0; - i = read(cfd, buf, sizeof buf-1); - close(cfd); + i = jehanne_read(cfd, buf, sizeof buf-1); + sys_close(cfd); if(i <= 0) return 0; buf[i] = '\0'; diff --git a/sys/src/lib/c/9sys/nsec.c b/sys/src/lib/c/9sys/nsec.c index 2025e00..3e4db3e 100644 --- a/sys/src/lib/c/9sys/nsec.c +++ b/sys/src/lib/c/9sys/nsec.c @@ -23,8 +23,8 @@ unsigned long jehanne_nsec(void) { long r; - r = remove("/dev/time"); + r = sys_remove("/dev/time"); if(r == -1) - r = remove("#c/time"); + r = sys_remove("#c/time"); return r; } diff --git a/sys/src/lib/c/9sys/ocreate.c b/sys/src/lib/c/9sys/ocreate.c index b2df87e..e153827 100644 --- a/sys/src/lib/c/9sys/ocreate.c +++ b/sys/src/lib/c/9sys/ocreate.c @@ -19,7 +19,7 @@ #include #include -/* ocreate works like the Plan 9 create(2) syscall, but with different races. +/* osys_create works like the Plan 9 create(2) syscall, but with different races. * In Plan 9 tjere os a race due to the different behaviour between the * create syscall and the Tcreate message in 9P2000 when the file already exists: * see https://github.com/brho/plan9/blob/master/sys/src/9/port/chan.c#L1564-L1603 @@ -41,11 +41,11 @@ jehanne_ocreate(const char *path, unsigned int omode, unsigned int perm) int fd; Dir *s; - fd = open(path, omode|OTRUNC); + fd = sys_open(path, omode|OTRUNC); if(fd < 0){ - fd = create(path, omode, perm); + fd = sys_create(path, omode, perm); if(fd < 0){ - fd = open(path, omode|OTRUNC); + fd = sys_open(path, omode|OTRUNC); if(fd < 0) goto Done; } else { @@ -55,7 +55,7 @@ jehanne_ocreate(const char *path, unsigned int omode, unsigned int perm) s = jehanne_dirfstat(fd); if(s == nil){ - close(fd); + sys_close(fd); return -1; } if(s->mode != perm){ diff --git a/sys/src/lib/c/9sys/pexec.c b/sys/src/lib/c/9sys/pexec.c index c946454..8169cec 100644 --- a/sys/src/lib/c/9sys/pexec.c +++ b/sys/src/lib/c/9sys/pexec.c @@ -27,12 +27,12 @@ jehanne_pexec(const char *f, char *args[]) int n, i; if(f[0] == '/' || (epath = jehanne_getenv(ENV_PATH)) == nil) - return exec(f, (const char**)args); + return sys_exec(f, (const char**)args); n = jehanne_getfields(epath, entries, nelem(entries), 1, ":"); for(i = 0; i < n; ++i){ path = jehanne_smprint("%s/%s", entries[i], f); - exec(path, args); + sys_exec(path, args); jehanne_free(path); } diff --git a/sys/src/lib/c/9sys/pipe.c b/sys/src/lib/c/9sys/pipe.c index 07dba02..3810005 100644 --- a/sys/src/lib/c/9sys/pipe.c +++ b/sys/src/lib/c/9sys/pipe.c @@ -22,7 +22,7 @@ int jehanne_pipe(int pipes[2]) { FdPair pset; - pset.aslong = remove("#0/pipes"); + pset.aslong = sys_remove("#0/pipes"); if(pset.aslong == -1) return -1; pipes[0] = pset.fd[0]; diff --git a/sys/src/lib/c/9sys/postnote.c b/sys/src/lib/c/9sys/postnote.c index b073897..85f6b0d 100644 --- a/sys/src/lib/c/9sys/postnote.c +++ b/sys/src/lib/c/9sys/postnote.c @@ -26,10 +26,10 @@ openprocnotes(int pid) int32_t f; jehanne_sprint(file, "#p/%d/note", pid); - f = open(file, OWRITE); + f = sys_open(file, OWRITE); if(f < 0){ jehanne_sprint(file, "/proc/%d/note", pid); - f = open(file, OWRITE); + f = sys_open(file, OWRITE); } if(f < 0) jehanne_werrstr("postnote: cannot open neither #p/%d/note nor /proc/%d/note", pid, pid); @@ -43,10 +43,10 @@ opengroupnotes(int pid) int32_t f; jehanne_sprint(file, "#p/%d/notepg", pid); - f = open(file, OWRITE); + f = sys_open(file, OWRITE); if(f < 0){ jehanne_sprint(file, "/proc/%d/notepg", pid); - f = open(file, OWRITE); + f = sys_open(file, OWRITE); } if(f < 0) jehanne_werrstr("postnote: cannot open neither #p/%d/notepg nor /proc/%d/notepg", pid, pid); @@ -73,10 +73,10 @@ jehanne_postnote(int group, int pid, const char *note) return f; r = jehanne_strlen(note); - if(write(f, note, r) != r) { - close(f); + if(jehanne_write(f, note, r) != r) { + sys_close(f); return -1; } - close(f); + sys_close(f); return 0; } diff --git a/sys/src/lib/c/9sys/pushssl.c b/sys/src/lib/c/9sys/pushssl.c index bc7ce04..d0487ed 100644 --- a/sys/src/lib/c/9sys/pushssl.c +++ b/sys/src/lib/c/9sys/pushssl.c @@ -23,31 +23,31 @@ jehanne_pushssl(int fd, const char *alg, const char *secin, const char *secout, char dname[64]; int n, data, ctl; - ctl = open("#D/ssl/clone", ORDWR); + ctl = sys_open("#D/ssl/clone", ORDWR); if(ctl < 0) return -1; - n = read(ctl, buf, sizeof(buf)-1); + n = jehanne_read(ctl, buf, sizeof(buf)-1); if(n < 0) goto error; buf[n] = 0; jehanne_sprint(dname, "#D/ssl/%s/data", buf); - data = open(dname, ORDWR); + data = sys_open(dname, ORDWR); if(data < 0) goto error; if(jehanne_fprint(ctl, "fd %d", fd) < 0 || jehanne_fprint(ctl, "secretin %s", secin) < 0 || jehanne_fprint(ctl, "secretout %s", secout) < 0 || jehanne_fprint(ctl, "alg %s", alg) < 0){ - close(data); + sys_close(data); goto error; } - close(fd); + sys_close(fd); if(cfd != 0) *cfd = ctl; else - close(ctl); + sys_close(ctl); return data; error: - close(ctl); + sys_close(ctl); return -1; } diff --git a/sys/src/lib/c/9sys/putenv.c b/sys/src/lib/c/9sys/putenv.c index aa2f65a..4af6e30 100644 --- a/sys/src/lib/c/9sys/putenv.c +++ b/sys/src/lib/c/9sys/putenv.c @@ -41,7 +41,7 @@ jehanne_putenv(const char *name, const char *value) f = jehanne_ocreate(path, OWRITE, 0664); if(f < 0){ - /* try with #e, in case of a previous rfork(RFCNAMEG) + /* try with #e, in case of a previous sys_rfork(RFCNAMEG) */ jehanne_snprint(path, sizeof path, "#e/%s", name); f = jehanne_ocreate(path, OWRITE, 0664); @@ -49,11 +49,11 @@ jehanne_putenv(const char *name, const char *value) return -1; } l = jehanne_strlen(value); - if(l > 0 && write(f, value, l) != l){ - close(f); + if(l > 0 && jehanne_write(f, value, l) != l){ + sys_close(f); return -1; } - close(f); + sys_close(f); return 0; BadName: diff --git a/sys/src/lib/c/9sys/qlock.c b/sys/src/lib/c/9sys/qlock.c index e8285e8..18d9e00 100644 --- a/sys/src/lib/c/9sys/qlock.c +++ b/sys/src/lib/c/9sys/qlock.c @@ -95,7 +95,7 @@ debugrendezvous(void *tag, void *val) logs[i].addr = __builtin_return_address(0); logs[i].caller = __builtin_return_address(1); logs[i].r = (void*)0xffabcdefffabcdef; - logs[i].r = rendezvous(tag, (void*)logs[i].addr); + logs[i].r = sys_rendezvous(tag, (void*)logs[i].addr); logs[i].end = jehanne_nsec(); return logs[i].r; } @@ -104,7 +104,7 @@ printdebugrendezvouslogs(void) { int i; for(i = 0; i < logidx; ++i) - jehanne_print("[%d] %#p @ %#p rendezvous(%#p, %#p) -> %#p @ %#p\n", logs[i].pid, logs[i].caller, logs[i].start, logs[i].tag, logs[i].addr, logs[i].r, logs[i].end); + jehanne_print("[%d] %#p @ %#p sys_rendezvous(%#p, %#p) -> %#p @ %#p\n", logs[i].pid, logs[i].caller, logs[i].start, logs[i].tag, logs[i].addr, logs[i].r, logs[i].end); } static void* (*_rendezvousp)(void*, void*) = debugrendezvous; @@ -113,14 +113,14 @@ static void* (*_rendezvousp)(void*, void*) = debugrendezvous; static void* __rendezvous(void* tag, void* val) { - return rendezvous(tag, val); + return sys_rendezvous(tag, val); } static void* (*_rendezvousp)(void*, void*) = __rendezvous; #endif # define RENDEZVOUS(...) (*_rendezvousp)(__VA_ARGS__) -//# define RENDEZVOUS(...) rendezvous(__VA_ARGS__) +//# define RENDEZVOUS(...) sys_rendezvous(__VA_ARGS__) //# define RENDEZVOUS(tag, val) __rendezvous(tag, __builtin_return_address(0)) /* this gets called by the thread library ONLY to get us to use its rendezvous */ @@ -252,7 +252,7 @@ jehanne_qlockt(QLock *q, uint32_t ms) jehanne_unlock(&q->lock); /* set up awake to interrupt rendezvous */ - wkup = awake(ms); + wkup = sys_awake(ms); /* wait */ while(RENDEZVOUS(mp, (void*)1) == (void*)~0) @@ -353,7 +353,7 @@ jehanne_rlockt(RWLock *q, uint32_t ms) jehanne_unlock(&q->lock); /* set up awake to interrupt rendezvous */ - wkup = awake(ms); + wkup = sys_awake(ms); /* wait in kernel */ while(RENDEZVOUS(mp, (void*)1) == (void*)~0) @@ -500,7 +500,7 @@ jehanne_wlockt(RWLock *q, uint32_t ms) jehanne_unlock(&q->lock); /* set up awake to interrupt rendezvous */ - wkup = awake(ms); + wkup = sys_awake(ms); /* wait in kernel */ while(RENDEZVOUS(mp, (void*)1) == (void*)~0) @@ -737,7 +737,7 @@ jehanne_rsleept(Rendez *r, uint32_t ms) } /* set up awake to interrupt rendezvous */ - wkup = awake(ms); + wkup = sys_awake(ms); /* wait for a rwakeup (or a timeout) */ while(RENDEZVOUS(me, (void*)1) == (void*)~0) diff --git a/sys/src/lib/c/9sys/rerrstr.c b/sys/src/lib/c/9sys/rerrstr.c index 4bc1e8c..b977cda 100644 --- a/sys/src/lib/c/9sys/rerrstr.c +++ b/sys/src/lib/c/9sys/rerrstr.c @@ -16,7 +16,7 @@ jehanne_rerrstr(char *buf, uint32_t nbuf) char tmp[ERRMAX]; tmp[0] = 0; - errstr(tmp, sizeof tmp); + sys_errstr(tmp, sizeof tmp); jehanne_utfecpy(buf, buf+nbuf, tmp); - errstr(tmp, sizeof tmp); + sys_errstr(tmp, sizeof tmp); } diff --git a/sys/src/lib/c/9sys/segattach.c b/sys/src/lib/c/9sys/segattach.c index 14a5ea3..5283998 100644 --- a/sys/src/lib/c/9sys/segattach.c +++ b/sys/src/lib/c/9sys/segattach.c @@ -25,13 +25,13 @@ jehanne_segattach(int attr, const char *class, void *va, unsigned long len) long tmp; char msg[256]; - fd = open("#0/segments", OWRITE); + fd = sys_open("#0/segments", OWRITE); if(fd < 0) return (void*)-1; tmp = jehanne_snprint(msg, sizeof(msg), "attach 0x%ux %#p %ulld %s", attr, va, len, class); - tmp = write(fd, msg, tmp); - close(fd); + tmp = jehanne_write(fd, msg, tmp); + sys_close(fd); return (void*)tmp; } @@ -41,13 +41,13 @@ jehanne_segdetach(void *addr) int fd, tmp; char msg[256]; - fd = open("#0/segments", OWRITE); + fd = sys_open("#0/segments", OWRITE); if(fd < 0) return -1; tmp = jehanne_snprint(msg, sizeof(msg), "detach %#p", addr); - tmp = write(fd, msg, tmp); - close(fd); + tmp = jehanne_write(fd, msg, tmp); + sys_close(fd); return tmp; } @@ -57,12 +57,12 @@ jehanne_segfree(void *addr, unsigned long len) int fd, tmp; char msg[256]; - fd = open("#0/segments", OWRITE); + fd = sys_open("#0/segments", OWRITE); if(fd < 0) return -1; tmp = jehanne_snprint(msg, sizeof(msg), "free %#p %ulld", addr, len); - tmp = write(fd, msg, tmp); - close(fd); + tmp = jehanne_write(fd, msg, tmp); + sys_close(fd); return tmp; } diff --git a/sys/src/lib/c/9sys/segbrk.c b/sys/src/lib/c/9sys/segbrk.c index cd3c9cf..827d059 100644 --- a/sys/src/lib/c/9sys/segbrk.c +++ b/sys/src/lib/c/9sys/segbrk.c @@ -29,7 +29,7 @@ setbrk(uintptr_t p) { long b; /* assert: devself is still working */ - assert((b = create("#0/brk/set", -1, p)) < 0); + assert((b = sys_create("#0/brk/set", -1, p)) < 0); if(b == -1) return ~0; // an error occurred return (uintptr_t)~b; diff --git a/sys/src/lib/c/9sys/sleep.c b/sys/src/lib/c/9sys/sleep.c index d31d4d2..f8506a0 100644 --- a/sys/src/lib/c/9sys/sleep.c +++ b/sys/src/lib/c/9sys/sleep.c @@ -24,9 +24,9 @@ jehanne_sleep(unsigned int millisecs) { long wakeup; - wakeup = awake(millisecs); // give up the processor, in any case + wakeup = sys_awake(millisecs); // give up the processor, in any case if(millisecs > 0) - while(rendezvous((void*)~0, (void*)1) == (void*)~0) + while(sys_rendezvous((void*)~0, (void*)1) == (void*)~0) if(jehanne_awakened(wakeup)) return; } diff --git a/sys/src/lib/c/9sys/stat.c b/sys/src/lib/c/9sys/stat.c index deea76a..7555375 100644 --- a/sys/src/lib/c/9sys/stat.c +++ b/sys/src/lib/c/9sys/stat.c @@ -24,13 +24,13 @@ jehanne_stat(const char* name, uint8_t* edir, int nedir) { int fd, statsz; - fd = open(name, OSTAT); + fd = sys_open(name, OSTAT); if(fd < 0){ jehanne_werrstr("stat: %r"); return fd; } - statsz = fstat(fd, edir, nedir); - close(fd); + statsz = sys_fstat(fd, edir, nedir); + sys_close(fd); return statsz; } @@ -39,12 +39,12 @@ jehanne_wstat(const char* name, uint8_t* edir, int nedir) { int fd, statsz; - fd = open(name, OSTAT); + fd = sys_open(name, OSTAT); if(fd < 0){ jehanne_werrstr("wstat: %r"); return fd; } - statsz = fwstat(fd, edir, nedir); - close(fd); + statsz = sys_fwstat(fd, edir, nedir); + sys_close(fd); return statsz; } diff --git a/sys/src/lib/c/9sys/syslog.c b/sys/src/lib/c/9sys/syslog.c index 3f6de4a..96160bd 100644 --- a/sys/src/lib/c/9sys/syslog.c +++ b/sys/src/lib/c/9sys/syslog.c @@ -29,9 +29,9 @@ _syslogopen(void) char buf[1024]; if(sl.fd >= 0) - close(sl.fd); + sys_close(sl.fd); jehanne_snprint(buf, sizeof(buf), "/sys/log/%s", sl.name); - sl.fd = open(buf, OWRITE|OCEXEC); + sl.fd = sys_open(buf, OWRITE|OCEXEC); } static int @@ -59,7 +59,7 @@ jehanne_syslog(int cons, const char *logname, const char *fmt, ...) char err[ERRMAX]; err[0] = '\0'; - errstr(err, sizeof err); + sys_errstr(err, sizeof err); jehanne_lock(&sl); /* @@ -89,7 +89,7 @@ jehanne_syslog(int cons, const char *logname, const char *fmt, ...) if(sl.consfd < 0 || !eqdirdev(d, sl.consd)){ jehanne_free(sl.consd); sl.consd = nil; - sl.consfd = open("#c/cons", OWRITE|OCEXEC); + sl.consfd = sys_open("#c/cons", OWRITE|OCEXEC); if(sl.consfd >= 0) sl.consd = jehanne_dirfstat(sl.consfd); } @@ -106,7 +106,7 @@ jehanne_syslog(int cons, const char *logname, const char *fmt, ...) jehanne_strncpy(p, ctim+4, 15); p += 15; *p++ = ' '; - errstr(err, sizeof err); + sys_errstr(err, sizeof err); va_start(arg, fmt); p = jehanne_vseprint(p, buf+sizeof(buf)-1, fmt, arg); va_end(arg); @@ -114,12 +114,12 @@ jehanne_syslog(int cons, const char *logname, const char *fmt, ...) n = p - buf; if(sl.fd >= 0){ - seek(sl.fd, 0, 2); - write(sl.fd, buf, n); + sys_seek(sl.fd, 0, 2); + jehanne_write(sl.fd, buf, n); } if(cons && sl.consfd >=0) - write(sl.consfd, buf, n); + jehanne_write(sl.consfd, buf, n); jehanne_unlock(&sl); } diff --git a/sys/src/lib/c/9sys/sysname.c b/sys/src/lib/c/9sys/sysname.c index 3f2b60e..44e618d 100644 --- a/sys/src/lib/c/9sys/sysname.c +++ b/sys/src/lib/c/9sys/sysname.c @@ -19,12 +19,12 @@ jehanne_sysname(void) if(b[0]) return b; - f = open("#c/sysname", OREAD); + f = sys_open("#c/sysname", OREAD); if(f >= 0) { - n = read(f, b, sizeof(b)-1); + n = jehanne_read(f, b, sizeof(b)-1); if(n > 0) b[n] = 0; - close(f); + sys_close(f); } return b; } diff --git a/sys/src/lib/c/9sys/times.c b/sys/src/lib/c/9sys/times.c index 527f93c..7ccc6d7 100644 --- a/sys/src/lib/c/9sys/times.c +++ b/sys/src/lib/c/9sys/times.c @@ -40,11 +40,11 @@ jehanne_times(int32_t *t) jehanne_memset(b, 0, sizeof(b)); for(retries = 0; retries < 100; retries++){ if(f < 0) - f = open("/dev/cputime", OREAD|OCEXEC); + f = sys_open("/dev/cputime", OREAD|OCEXEC); if(f < 0) break; - if(seek(f, 0, 0) < 0 || (i = read(f, b, sizeof(b))) < 0){ - close(f); + if(sys_seek(f, 0, 0) < 0 || (i = jehanne_read(f, b, sizeof(b))) < 0){ + sys_close(f); f = -1; } else { if(i != 0) diff --git a/sys/src/lib/c/9sys/tm2sec.c b/sys/src/lib/c/9sys/tm2sec.c index 6b8e915..2960347 100644 --- a/sys/src/lib/c/9sys/tm2sec.c +++ b/sys/src/lib/c/9sys/tm2sec.c @@ -117,14 +117,14 @@ readtimezone(void) int i; jehanne_memset(buf, 0, sizeof(buf)); - i = open("/env/timezone", OREAD); + i = sys_open("/env/timezone", OREAD); if(i < 0) goto error; - if(read(i, buf, sizeof(buf)) >= sizeof(buf)){ - close(1); + if(jehanne_read(i, buf, sizeof(buf)) >= sizeof(buf)){ + sys_close(1); goto error; } - close(i); + sys_close(i); p = buf; if(rd_name(&p, timezone.stname)) goto error; diff --git a/sys/src/lib/c/9sys/truerand.c b/sys/src/lib/c/9sys/truerand.c index 1d8b411..3df4b44 100644 --- a/sys/src/lib/c/9sys/truerand.c +++ b/sys/src/lib/c/9sys/truerand.c @@ -17,10 +17,10 @@ jehanne_truerand(void) static int randfd = -1; if(randfd < 0) - randfd = open("/dev/random", OREAD|OCEXEC); + randfd = sys_open("/dev/random", OREAD|OCEXEC); if(randfd < 0) jehanne_sysfatal("can't open /dev/random"); - if(read(randfd, &x, sizeof(x)) != sizeof(x)) + if(jehanne_read(randfd, &x, sizeof(x)) != sizeof(x)) jehanne_sysfatal("can't read /dev/random"); return x; } diff --git a/sys/src/lib/c/9sys/tsemacquire.c b/sys/src/lib/c/9sys/tsemacquire.c index 4563c8a..6839714 100644 --- a/sys/src/lib/c/9sys/tsemacquire.c +++ b/sys/src/lib/c/9sys/tsemacquire.c @@ -23,8 +23,8 @@ int jehanne_tsemacquire(int* addr, long ms) { long wkup; - wkup = awake(ms); - while(semacquire(addr, 1) < 0){ + wkup = sys_awake(ms); + while(sys_semacquire(addr, 1) < 0){ if(jehanne_awakened(wkup)){ /* copy canlock semantic for return values */ return 0; diff --git a/sys/src/lib/c/9sys/wait.c b/sys/src/lib/c/9sys/wait.c index b19f871..aa6640a 100644 --- a/sys/src/lib/c/9sys/wait.c +++ b/sys/src/lib/c/9sys/wait.c @@ -18,7 +18,7 @@ jehanne_wait(void) char buf[512], *fld[5]; Waitmsg *w; - n = await(buf, sizeof buf-1); + n = sys_await(buf, sizeof buf-1); if(n < 0) return nil; buf[n] = '\0'; diff --git a/sys/src/lib/c/9sys/waitpid.c b/sys/src/lib/c/9sys/waitpid.c index 1bc8133..3514937 100644 --- a/sys/src/lib/c/9sys/waitpid.c +++ b/sys/src/lib/c/9sys/waitpid.c @@ -17,7 +17,7 @@ jehanne_waitpid(void) int n; char buf[512], *fld[5]; - n = await(buf, sizeof buf-1); + n = sys_await(buf, sizeof buf-1); if(n <= 0) return -1; buf[n] = '\0'; diff --git a/sys/src/lib/c/9sys/werrstr.c b/sys/src/lib/c/9sys/werrstr.c index e17ba39..01af7b7 100644 --- a/sys/src/lib/c/9sys/werrstr.c +++ b/sys/src/lib/c/9sys/werrstr.c @@ -19,5 +19,5 @@ jehanne_werrstr(const char *fmt, ...) va_start(arg, fmt); jehanne_vseprint(buf, buf+ERRMAX, fmt, arg); va_end(arg); - errstr(buf, ERRMAX); + sys_errstr(buf, ERRMAX); } diff --git a/sys/src/lib/c/amd64/notejmp.c b/sys/src/lib/c/amd64/notejmp.c index 063cfd1..992de0c 100644 --- a/sys/src/lib/c/amd64/notejmp.c +++ b/sys/src/lib/c/amd64/notejmp.c @@ -12,5 +12,5 @@ jehanne_notejmp(void *vr, jmp_buf j, int ret) r->ax = 1; r->ip = j[JMPBUFPC]; r->sp = j[JMPBUFSP] + 8; - noted(NCONT); + sys_noted(NCONT); } diff --git a/sys/src/lib/c/apw/system.c b/sys/src/lib/c/apw/system.c index 6e50da3..ecd30c5 100644 --- a/sys/src/lib/c/apw/system.c +++ b/sys/src/lib/c/apw/system.c @@ -26,7 +26,7 @@ system(const char *command) char *s = nil; if(command == nil) return jehanne_access("/cmd/rc", AEXEC) == 0; - switch(pid = rfork(RFFDG|RFREND|RFPROC|RFENVG|RFNOTEG)){ + switch(pid = sys_rfork(RFFDG|RFREND|RFPROC|RFENVG|RFNOTEG)){ case -1: return -1; case 0: diff --git a/sys/src/lib/c/fmt/vfprint.c b/sys/src/lib/c/fmt/vfprint.c index 308f735..9236e75 100644 --- a/sys/src/lib/c/fmt/vfprint.c +++ b/sys/src/lib/c/fmt/vfprint.c @@ -21,7 +21,7 @@ _fmtFdFlush(Fmt *f) int n; n = (char*)f->to - (char*)f->start; - if(n && write((int)(uintptr_t)f->farg, f->start, n) != n) + if(n && jehanne_write((int)(uintptr_t)f->farg, f->start, n) != n) return 0; f->to = f->start; return 1; diff --git a/sys/src/lib/c/port/atnotify.c b/sys/src/lib/c/port/atnotify.c index 9bfec62..4a734df 100644 --- a/sys/src/lib/c/port/atnotify.c +++ b/sys/src/lib/c/port/atnotify.c @@ -22,10 +22,10 @@ notifier(void *v, char *s) for(i=0; ikey) == 1) return; /* changed from 0 -> 1: we hold lock */ /* otherwise wait in kernel */ - while(semacquire(&l->sem, 1) < 0){ + while(sys_semacquire(&l->sem, 1) < 0){ /* interrupted; try again */ } } @@ -28,7 +28,7 @@ jehanne_unlock(Lock *l) { if(jehanne_adec(&l->key) == 0) return; /* changed from 1 -> 0: no contention */ - semrelease(&l->sem, 1); + sys_semrelease(&l->sem, 1); } int @@ -39,7 +39,7 @@ jehanne_canlock(Lock *l) /* Undo increment (but don't miss wakeup) */ if(jehanne_adec(&l->key) == 0) return 0; /* changed from 1 -> 0: no contention */ - semrelease(&l->sem, 1); + sys_semrelease(&l->sem, 1); return 0; } diff --git a/sys/src/lib/c/port/malloc.c b/sys/src/lib/c/port/malloc.c index 9b04714..89c630e 100644 --- a/sys/src/lib/c/port/malloc.c +++ b/sys/src/lib/c/port/malloc.c @@ -109,14 +109,14 @@ checkenv(void) { int n, fd; char buf[20]; - fd = open("/env/MALLOCFD", OREAD); + fd = sys_open("/env/MALLOCFD", OREAD); if(fd < 0) return -1; - if((n = read(fd, buf, sizeof buf)) < 0) { - close(fd); + if((n = jehanne_read(fd, buf, sizeof buf)) < 0) { + sys_close(fd); return -1; } - close(fd); + sys_close(fd); if(n >= sizeof buf) n = sizeof(buf)-1; buf[n] = 0; @@ -164,13 +164,13 @@ ppanic(Pool *p, char *fmt, ...) msg = panicbuf; va_start(v, fmt); n = jehanne_vseprint(msg, msg+sizeof panicbuf, fmt, v) - msg; - write(2, "panic: ", 7); - write(2, msg, n); - write(2, "\n", 1); + jehanne_write(2, "panic: ", 7); + jehanne_write(2, msg, n); + jehanne_write(2, "\n", 1); if(pv->printfd != 2){ - write(pv->printfd, "panic: ", 7); - write(pv->printfd, msg, n); - write(pv->printfd, "\n", 1); + jehanne_write(pv->printfd, "panic: ", 7); + jehanne_write(pv->printfd, msg, n); + jehanne_write(pv->printfd, "\n", 1); } va_end(v); // jehanne_unlock(&pv->lk); diff --git a/sys/src/lib/c/port/mktemp.c b/sys/src/lib/c/port/mktemp.c index 2ab050b..09d5757 100644 --- a/sys/src/lib/c/port/mktemp.c +++ b/sys/src/lib/c/port/mktemp.c @@ -35,6 +35,6 @@ jehanne_mktemp(char *as) *s = i++; } err[0] = '\0'; - errstr(err, sizeof err); /* clear the error */ + sys_errstr(err, sizeof err); /* clear the error */ return as; } diff --git a/sys/src/lib/c/port/perror.c b/sys/src/lib/c/port/perror.c index d4b2905..7904b45 100644 --- a/sys/src/lib/c/port/perror.c +++ b/sys/src/lib/c/port/perror.c @@ -16,7 +16,7 @@ jehanne_perror(const char *s) char buf[ERRMAX]; buf[0] = '\0'; - errstr(buf, sizeof buf); + sys_errstr(buf, sizeof buf); if(s && *s) jehanne_fprint(2, "%s: %s\n", s, buf); else diff --git a/sys/src/lib/c/port/readn.c b/sys/src/lib/c/port/readn.c index 13acc0a..b459a98 100644 --- a/sys/src/lib/c/port/readn.c +++ b/sys/src/lib/c/port/readn.c @@ -19,7 +19,7 @@ jehanne_readn(int f, void *av, int32_t n) a = av; t = 0; while(t < n){ - m = read(f, a+t, n-t); + m = jehanne_read(f, a+t, n-t); if(m <= 0){ if(t == 0) return m; diff --git a/sys/src/lib/complete/complete.c b/sys/src/lib/complete/complete.c index b2519cc..df41598 100644 --- a/sys/src/lib/complete/complete.c +++ b/sys/src/lib/complete/complete.c @@ -62,13 +62,13 @@ complete(char *dir, char *s) return nil; } - fd = open(dir, OREAD); + fd = sys_open(dir, OREAD); if(fd < 0) return nil; n = dirreadall(fd, &dirp); if(n <= 0){ - close(fd); + sys_close(fd); return nil; } @@ -148,6 +148,6 @@ complete(char *dir, char *s) free(name); free(mode); free(dirp); - close(fd); + sys_close(fd); return c; } diff --git a/sys/src/lib/control/control.c b/sys/src/lib/control/control.c index f893383..58645e9 100644 --- a/sys/src/lib/control/control.c +++ b/sys/src/lib/control/control.c @@ -336,7 +336,7 @@ ctlerror(char *fmt, ...) va_start(arg, fmt); vfprint(2, fmt, arg); va_end(arg); - write(2, "\n", 1); + jehanne_write(2, "\n", 1); threadexitsall(buf); } @@ -511,8 +511,8 @@ _ctlgetsnarf(void) return nil; sn = nil; i = 0; - seek(_ctlsnarffd, 0, 0); - while((n = read(_ctlsnarffd, buf, sizeof buf)) > 0){ + sys_seek(_ctlsnarffd, 0, 0); + while((n = jehanne_read(_ctlsnarffd, buf, sizeof buf)) > 0){ sn = ctlrealloc(sn, i+n+1); memmove(sn+i, buf, n); i += n; @@ -533,7 +533,7 @@ _ctlputsnarf(Rune *snarf) if(_ctlsnarffd<0 || snarf[0]==0) return; - fd = open("/dev/snarf", OWRITE); + fd = sys_open("/dev/snarf", OWRITE); if(fd < 0) return; nsnarf = runestrlen(snarf); @@ -545,7 +545,7 @@ _ctlputsnarf(Rune *snarf) if(fprint(fd, "%.*S", n, snarf+i) < 0) break; } - close(fd); + sys_close(fd); } int @@ -747,7 +747,7 @@ initcontrols(void) namectlimage(im, coltab[i].name); } namectlfont(font, "font"); - _ctlsnarffd = open("/dev/snarf", OREAD); + _ctlsnarffd = sys_open("/dev/snarf", OREAD); } Controlset* diff --git a/sys/src/lib/disk/disk.c b/sys/src/lib/disk/disk.c index 1a709b7..7d4e832 100644 --- a/sys/src/lib/disk/disk.c +++ b/sys/src/lib/disk/disk.c @@ -75,18 +75,18 @@ partitiongeometry(Disk *disk) strcpy(rawname, disk->prefix); strcat(rawname, "data"); - rawfd = open(rawname, OREAD); + rawfd = sys_open(rawname, OREAD); free(rawname); if(rawfd >= 0 - && seek(rawfd, 0, 0) >= 0 + && sys_seek(rawfd, 0, 0) >= 0 && readn(rawfd, buf, 512) == 512 && t->magic[0] == Magic0 && t->magic[1] == Magic1) { - close(rawfd); + sys_close(rawfd); } else { if(rawfd >= 0) - close(rawfd); - if(seek(disk->fd, 0, 0) < 0 + sys_close(rawfd); + if(sys_seek(disk->fd, 0, 0) < 0 || readn(disk->fd, buf, 512) != 512 || t->magic[0] != Magic0 || t->magic[1] != Magic1) { @@ -212,11 +212,11 @@ static Disk* freedisk(Disk *d) { if(d->fd >= 0) - close(d->fd); + sys_close(d->fd); if(d->wfd >= 0) - close(d->wfd); + sys_close(d->wfd); if(d->ctlfd >= 0) - close(d->ctlfd); + sys_close(d->ctlfd); free(d); return nil; } @@ -299,7 +299,7 @@ opendisk(char *disk, int rdonly, int noctl) d->fd = d->wfd = d->ctlfd = -1; d->rdonly = rdonly; - d->fd = open(disk, OREAD); + d->fd = sys_open(disk, OREAD); if(d->fd < 0) { werrstr("cannot open disk file: %r"); return freedisk(d); @@ -314,7 +314,7 @@ opendisk(char *disk, int rdonly, int noctl) free(s); if(rdonly == 0) { - d->wfd = open(disk, OWRITE); + d->wfd = sys_open(disk, OWRITE); if(d->wfd < 0) d->rdonly = 1; } @@ -332,7 +332,7 @@ opendisk(char *disk, int rdonly, int noctl) q = p+strlen(p)-7; if(q[0] == 'f' && q[1] == 'd' && isdigit(q[2]) && strcmp(q+3, "disk") == 0) { strcpy(q+3, "ctl"); - if((d->ctlfd = open(p, ORDWR)) >= 0) { + if((d->ctlfd = sys_open(p, ORDWR)) >= 0) { *q = '\0'; d->prefix = p; d->type = Tfloppy; @@ -348,7 +348,7 @@ opendisk(char *disk, int rdonly, int noctl) q = p; strcpy(q, "ctl"); - if((d->ctlfd = open(p, ORDWR)) >= 0) { + if((d->ctlfd = sys_open(p, ORDWR)) >= 0) { *q = '\0'; d->prefix = p; d->type = Tsd; diff --git a/sys/src/lib/disk/proto.c b/sys/src/lib/disk/proto.c index 509152c..8937397 100644 --- a/sys/src/lib/disk/proto.c +++ b/sys/src/lib/disk/proto.c @@ -183,7 +183,7 @@ mktree(Mkaux *mkaux, File *me, int rec) Dir *d; int i, n, fd; - fd = open(mkaux->oldfile.s, OREAD); + fd = sys_open(mkaux->oldfile.s, OREAD); if(fd < 0){ warn(mkaux, "can't open %s: %r", mkaux->oldfile.s); return; @@ -211,7 +211,7 @@ mktree(Mkaux *mkaux, File *me, int rec) } free(d); } - close(fd); + sys_close(fd); } static int diff --git a/sys/src/lib/disk/scsi.c b/sys/src/lib/disk/scsi.c index bf530e3..087dfea 100644 --- a/sys/src/lib/disk/scsi.c +++ b/sys/src/lib/disk/scsi.c @@ -39,14 +39,14 @@ getcodes(void) return; } - if((d = dirstat(codefile)) == nil || (fd = open(codefile, OREAD)) < 0) { + if((d = dirstat(codefile)) == nil || (fd = sys_open(codefile, OREAD)) < 0) { qunlock(&codeqlock); return; } codes = malloc(1+d->length+1); if(codes == nil) { - close(fd); + sys_close(fd); qunlock(&codeqlock); free(d); return; @@ -54,7 +54,7 @@ getcodes(void) codes[0] = '\n'; /* for searches */ n = readn(fd, codes+1, d->length); - close(fd); + sys_close(fd); free(d); if(n < 0) { @@ -110,7 +110,7 @@ _scsicmd(Scsi *s, uint8_t *cmd, int ccount, void *data, int dcount, int io, int if(dolock) qlock(&s->ql); - if(write(s->rawfd, cmd, ccount) != ccount) { + if(jehanne_write(s->rawfd, cmd, ccount) != ccount) { werrstr("cmd write: %r"); if(dolock) qunlock(&s->ql); @@ -119,27 +119,27 @@ _scsicmd(Scsi *s, uint8_t *cmd, int ccount, void *data, int dcount, int io, int switch(io){ case Sread: - n = read(s->rawfd, data, dcount); + n = jehanne_read(s->rawfd, data, dcount); /* read toc errors are frequent and not very interesting */ if(n < 0 && (scsiverbose == 1 || scsiverbose == 2 && cmd[0] != Readtoc)) fprint(2, "dat read: %r: cmd 0x%2.2uX\n", cmd[0]); break; case Swrite: - n = write(s->rawfd, data, dcount); + n = jehanne_write(s->rawfd, data, dcount); if(n != dcount && scsiverbose) fprint(2, "dat write: %r: cmd 0x%2.2uX\n", cmd[0]); break; default: case Snone: - n = write(s->rawfd, resp, 0); + n = jehanne_write(s->rawfd, resp, 0); if(n != 0 && scsiverbose) fprint(2, "none write: %r: cmd 0x%2.2uX\n", cmd[0]); break; } memset(resp, 0, sizeof(resp)); - if(read(s->rawfd, resp, sizeof(resp)) < 0) { + if(jehanne_read(s->rawfd, resp, sizeof(resp)) < 0) { werrstr("resp read: %r\n"); if(dolock) qunlock(&s->ql); @@ -174,13 +174,13 @@ _scsiready(Scsi *s, int dolock) for(i=0; i<3; i++) { memset(cmd, 0, sizeof(cmd)); cmd[0] = 0x00; /* unit ready */ - if(write(s->rawfd, cmd, sizeof(cmd)) != sizeof(cmd)) { + if(jehanne_write(s->rawfd, cmd, sizeof(cmd)) != sizeof(cmd)) { if(scsiverbose) fprint(2, "ur cmd write: %r\n"); goto bad; } - write(s->rawfd, resp, 0); - if(read(s->rawfd, resp, sizeof(resp)) < 0) { + jehanne_write(s->rawfd, resp, 0); + if(jehanne_read(s->rawfd, resp, sizeof(resp)) < 0) { if(scsiverbose) fprint(2, "ur resp read: %r\n"); goto bad; @@ -290,22 +290,22 @@ openscsi(char *dev) return nil; snprint(name, l, "%s/raw", dev); - if((rawfd = open(name, ORDWR)) < 0) { + if((rawfd = sys_open(name, ORDWR)) < 0) { free(name); return nil; } snprint(name, l, "%s/ctl", dev); - if((ctlfd = open(name, ORDWR)) < 0) { + if((ctlfd = sys_open(name, ORDWR)) < 0) { free(name); Error: - close(rawfd); + sys_close(rawfd); return nil; } free(name); n = readn(ctlfd, buf, sizeof buf); - close(ctlfd); + sys_close(ctlfd); if(n <= 0) goto Error; @@ -336,7 +336,7 @@ openscsi(char *dev) void closescsi(Scsi *s) { - close(s->rawfd); + sys_close(s->rawfd); free(s->inquire); free(s); } diff --git a/sys/src/lib/draw/event.c b/sys/src/lib/draw/event.c index c4b8d83..e83d045 100644 --- a/sys/src/lib/draw/event.c +++ b/sys/src/lib/draw/event.c @@ -167,12 +167,12 @@ estartfn(uint32_t key, int fd, int n, int (*fn)(int, Event*, uint8_t*, int)) return 1<0) - if(write(epipe[1], buf, r+1)!=r+1) + while((r = jehanne_read(fd, buf+1, n))>0) + if(jehanne_write(epipe[1], buf, r+1)!=r+1) break; buf[0] = MAXSLAVE; - write(epipe[1], buf, 1); - _exits(0); + jehanne_write(epipe[1], buf, 1); + sys__exits(0); return 0; } @@ -197,10 +197,10 @@ etimer(uint32_t key, int n) t[0] = t[1] = Stimer - MAXSLAVE; do sleep(n); - while(write(epipe[1], t, 2) == 2); + while(jehanne_write(epipe[1], t, 2) == 2); t[0] = MAXSLAVE; - write(epipe[1], t, 1); - _exits(0); + jehanne_write(epipe[1], t, 1); + sys__exits(0); return 0; } @@ -217,7 +217,7 @@ ekeyslave(int fd) t[0] = Skeyboard; for(;;){ while(!fullrune(k, kn)){ - kr = read(fd, k+kn, sizeof k - kn); + kr = jehanne_read(fd, k+kn, sizeof k - kn); if(kr <= 0) goto breakout; kn += kr; @@ -227,13 +227,13 @@ ekeyslave(int fd) memmove(k, &k[w], kn); t[1] = r; t[2] = r>>8; - if(write(epipe[1], t, 3) != 3) + if(jehanne_write(epipe[1], t, 3) != 3) break; } breakout:; t[0] = MAXSLAVE; - write(epipe[1], t, 1); - _exits(0); + jehanne_write(epipe[1], t, 1); + sys__exits(0); } void @@ -248,28 +248,28 @@ einit(uint32_t keys) atexit(ekill); atnotify(enote, 1); snprint(buf, sizeof buf, "%s/mouse", display->devdir); - mousefd = open(buf, ORDWR|OCEXEC); + mousefd = sys_open(buf, ORDWR|OCEXEC); if(mousefd < 0) drawerror(display, "einit: can't open mouse\n"); snprint(buf, sizeof buf, "%s/cursor", display->devdir); - cursorfd = open(buf, ORDWR|OCEXEC); + cursorfd = sys_open(buf, ORDWR|OCEXEC); if(cursorfd < 0) drawerror(display, "einit: can't open cursor\n"); if(keys&Ekeyboard){ snprint(buf, sizeof buf, "%s/cons", display->devdir); - fd = open(buf, OREAD); + fd = sys_open(buf, OREAD); if(fd < 0) drawerror(display, "events: can't open console"); snprint(buf, sizeof buf, "%s/consctl", display->devdir); - ctl = open("/dev/consctl", OWRITE|OCEXEC); + ctl = sys_open("/dev/consctl", OWRITE|OCEXEC); if(ctl < 0) drawerror(display, "events: can't open consctl"); - write(ctl, "rawon", 5); + jehanne_write(ctl, "rawon", 5); for(Skeyboard=0; Ekeyboard & ~(1< 0) { - close(ctl); + sys_close(ctl); } } if(keys&Emouse){ @@ -301,14 +301,14 @@ extract(void) if(display->bufp > display->buf) flushimage(display, 1); loop: - if((n=read(epipe[0], ebuf, EMAXMSG+1)) < 0 + if((n=jehanne_read(epipe[0], ebuf, EMAXMSG+1)) < 0 || ebuf[0] >= MAXSLAVE) drawerror(display, "eof on event pipe"); if(n == 0) goto loop; i = ebuf[0]; if(i >= nslave || n <= 1) - drawerror(display, "events: protocol error: short read"); + drawerror(display, "events: protocol error: short jehanne_read"); s = &eslave[i]; if(i == Stimer){ s->head = (Ebuf *)1; @@ -353,7 +353,7 @@ eforkslave(uint32_t key) * share the file descriptors so the last child * out closes all connections to the window server. */ - switch(pid = rfork(RFPROC)){ + switch(pid = sys_rfork(RFPROC)){ case 0: return MAXSLAVE+i; case -1: @@ -380,15 +380,15 @@ enote(void *v, char *s) for(i=0; ioffset.x); BPLONG(curs+1*4, c->offset.y); memmove(curs+2*4, c->clr, 2*2*16); - write(cursorfd, curs, sizeof curs); + jehanne_write(cursorfd, curs, sizeof curs); } } @@ -472,7 +472,7 @@ ereadmouse(Mouse *m) char buf[128]; do{ - n = read(mousefd, buf, sizeof(buf)); + n = jehanne_read(mousefd, buf, sizeof(buf)); if(n < 0) /* probably interrupted */ return -1; n = eatomouse(m, buf, n); diff --git a/sys/src/lib/draw/getsubfont.c b/sys/src/lib/draw/getsubfont.c index ca20413..a9fa6a6 100644 --- a/sys/src/lib/draw/getsubfont.c +++ b/sys/src/lib/draw/getsubfont.c @@ -21,7 +21,7 @@ _getsubfont(Display *d, char *name) int fd; Subfont *f; - fd = open(name, OREAD); + fd = sys_open(name, OREAD); if(fd < 0){ fprint(2, "getsubfont: can't open %s: %r\n", name); @@ -40,7 +40,7 @@ _getsubfont(Display *d, char *name) lockdisplay(d); if(f == 0) fprint(2, "getsubfont: can't read %s: %r\n", name); - close(fd); + sys_close(fd); setmalloctag(f, getcallerpc()); return f; } diff --git a/sys/src/lib/draw/init.c b/sys/src/lib/draw/init.c index 5de4e81..b1dbe5d 100644 --- a/sys/src/lib/draw/init.c +++ b/sys/src/lib/draw/init.c @@ -61,14 +61,14 @@ geninitdraw(char *devdir, void(*error)(Display*, char*), return -1; } if(fontname == nil){ - fd = open("/env/font", OREAD); + fd = sys_open("/env/font", OREAD); if(fd >= 0){ - n = read(fd, buf, sizeof(buf)); + n = jehanne_read(fd, buf, sizeof(buf)); if(n>0 && nwindir); - fd = open(buf, OREAD); + fd = sys_open(buf, OREAD); if(fd >= 0){ - read(fd, display->oldlabel, (sizeof display->oldlabel)-1); - close(fd); + jehanne_read(fd, display->oldlabel, (sizeof display->oldlabel)-1); + sys_close(fd); fd = ocreate(buf, OWRITE, 0666); if(fd >= 0){ - write(fd, label, strlen(label)); - close(fd); + jehanne_write(fd, label, strlen(label)); + sys_close(fd); } } } @@ -124,7 +124,7 @@ initdraw(void(*error)(Display*, char*), char *fontname , char *label) { char *dev = "/dev"; - if(access("/dev/draw/new", AEXIST)<0 && bind("#i", "/dev", MAFTER)<0){ + if(access("/dev/draw/new", AEXIST)<0 && sys_bind("#i", "/dev", MAFTER)<0){ fprint(2, "imageinit: can't bind /dev/draw: %r\n"); return -1; } @@ -144,8 +144,8 @@ gengetwindow(Display *d, char *winname, Image **winp, Screen **scrp, Image *image; Rectangle r; - fd = open(winname, OREAD); - if(fd<0 || (n=read(fd, buf, sizeof buf-1))<=0){ + fd = sys_open(winname, OREAD); + if(fd<0 || (n=jehanne_read(fd, buf, sizeof buf-1))<=0){ if((image=d->image) == nil){ fprint(2, "gengetwindow: %r\n"); *winp = nil; @@ -154,7 +154,7 @@ gengetwindow(Display *d, char *winname, Image **winp, Screen **scrp, } strcpy(buf, "noborder"); }else{ - close(fd); + sys_close(fd); buf[n] = '\0'; if(*winp != nil){ _freeimage1(*winp); @@ -232,21 +232,21 @@ initdisplay(char *dev, char *win, void(*error)(Display*, char*)) return nil; sprint(buf, "%s/draw/new", dev); - ctlfd = open(buf, ORDWR|OCEXEC); + ctlfd = sys_open(buf, ORDWR|OCEXEC); if(ctlfd < 0){ - if(bind("#i", dev, MAFTER) < 0){ + if(sys_bind("#i", dev, MAFTER) < 0){ Error1: free(t); werrstr("initdisplay: %s: %r", buf); return 0; } - ctlfd = open(buf, ORDWR|OCEXEC); + ctlfd = sys_open(buf, ORDWR|OCEXEC); } if(ctlfd < 0) goto Error1; - if((n=read(ctlfd, info, sizeof info)) < 12){ + if((n=jehanne_read(ctlfd, info, sizeof info)) < 12){ Error2: - close(ctlfd); + sys_close(ctlfd); goto Error1; } if(n==NINFO+1) @@ -256,20 +256,20 @@ initdisplay(char *dev, char *win, void(*error)(Display*, char*)) if(n < NINFO) /* this will do for now, we need something better here */ isnew = 1; sprint(buf, "%s/draw/%d/data", dev, atoi(info+0*12)); - datafd = open(buf, ORDWR|OCEXEC); + datafd = sys_open(buf, ORDWR|OCEXEC); if(datafd < 0) goto Error2; sprint(buf, "%s/draw/%d/refresh", dev, atoi(info+0*12)); - reffd = open(buf, OREAD|OCEXEC); + reffd = sys_open(buf, OREAD|OCEXEC); if(reffd < 0){ Error3: - close(datafd); + sys_close(datafd); goto Error2; } disp = mallocz(sizeof(Display), 1); if(disp == 0){ Error4: - close(reffd); + sys_close(reffd); goto Error3; } image = nil; @@ -364,10 +364,10 @@ _closedisplay(Display *disp, int isshutdown) display = nil; if(disp->oldlabel[0]){ snprint(buf, sizeof buf, "%s/label", disp->windir); - fd = open(buf, OWRITE); + fd = sys_open(buf, OWRITE); if(fd >= 0){ - write(fd, disp->oldlabel, strlen(disp->oldlabel)); - close(fd); + jehanne_write(fd, disp->oldlabel, strlen(disp->oldlabel)); + sys_close(fd); } } @@ -384,10 +384,10 @@ _closedisplay(Display *disp, int isshutdown) free(disp->windir); freeimage(disp->white); freeimage(disp->black); - close(disp->fd); - close(disp->ctlfd); + sys_close(disp->fd); + sys_close(disp->ctlfd); /* should cause refresh slave to shut down */ - close(disp->reffd); + sys_close(disp->reffd); qunlock(&disp->qlock); free(disp); } @@ -419,7 +419,7 @@ drawerror(Display *d, char *s) if(d && d->error) d->error(d, s); else{ - errstr(err, sizeof err); + sys_errstr(err, sizeof err); fprint(2, "draw: %s: %s\n", s, err); exits(s); } @@ -435,7 +435,7 @@ doflush(Display *d) if(n <= 0) return 1; - if((nn=write(d->fd, d->buf, n)) != n){ + if((nn=jehanne_write(d->fd, d->buf, n)) != n){ if(_drawdebug) fprint(2, "flushimage fail: d=%p: n=%d nn=%d %r\n", d, n, nn); /**/ d->bufp = d->buf; /* might as well; chance of continuing */ diff --git a/sys/src/lib/draw/keyboard.c b/sys/src/lib/draw/keyboard.c index 1729d47..595cfa6 100644 --- a/sys/src/lib/draw/keyboard.c +++ b/sys/src/lib/draw/keyboard.c @@ -28,8 +28,8 @@ closekeyboard(Keyboardctl *kc) <-kc->c; #endif - close(kc->ctlfd); - close(kc->consfd); + sys_close(kc->ctlfd); + sys_close(kc->consfd); free(kc->file); free(kc->c); free(kc); @@ -55,7 +55,7 @@ _ioproc(void *arg) memmove(buf, buf+m, n); send(kc->c, &r); } - m = read(kc->consfd, buf+n, sizeof buf-n); + m = jehanne_read(kc->consfd, buf+n, sizeof buf-n); if(m <= 0){ yield(); /* if error is due to exiting, we'll exit here */ fprint(2, "keyboard read error: %r\n"); @@ -77,7 +77,7 @@ initkeyboard(char *file) if(file == nil) file = "/dev/cons"; kc->file = strdup(file); - kc->consfd = open(file, ORDWR|OCEXEC); + kc->consfd = sys_open(file, ORDWR|OCEXEC); t = malloc(strlen(file)+16); if(kc->consfd<0 || t==nil){ Error1: @@ -85,17 +85,17 @@ Error1: return nil; } sprint(t, "%sctl", file); - kc->ctlfd = open(t, OWRITE|OCEXEC); + kc->ctlfd = sys_open(t, OWRITE|OCEXEC); if(kc->ctlfd < 0){ fprint(2, "initkeyboard: can't open %s: %r\n", t); Error2: - close(kc->consfd); + sys_close(kc->consfd); free(t); goto Error1; } if(ctlkeyboard(kc, "rawon") < 0){ fprint(2, "initkeyboard: can't turn on raw mode on %s: %r\n", t); - close(kc->ctlfd); + sys_close(kc->ctlfd); goto Error2; } free(t); @@ -107,5 +107,5 @@ Error2: int ctlkeyboard(Keyboardctl *kc, char *m) { - return write(kc->ctlfd, m, strlen(m)); + return jehanne_write(kc->ctlfd, m, strlen(m)); } diff --git a/sys/src/lib/draw/mouse.c b/sys/src/lib/draw/mouse.c index 5c3826b..814eed1 100644 --- a/sys/src/lib/draw/mouse.c +++ b/sys/src/lib/draw/mouse.c @@ -31,8 +31,8 @@ closemouse(Mousectl *mc) do; while(nbrecv(mc->c, &mc->Mouse) > 0); - close(mc->mfd); - close(mc->cfd); + sys_close(mc->mfd); + sys_close(mc->cfd); free(mc->file); free(mc->c); free(mc->resizec); @@ -67,7 +67,7 @@ _ioproc(void *arg) mc->pid = getpid(); nerr = 0; for(;;){ - n = read(mc->mfd, buf, sizeof buf); + n = jehanne_read(mc->mfd, buf, sizeof buf); if(n != 1+4*12){ yield(); /* if error is due to exiting, we'll exit here */ fprint(2, "mouse: bad count %d not 49: %r\n", n); @@ -107,10 +107,10 @@ initmouse(char *file, Image *i) if(file == nil) file = "/dev/mouse"; mc->file = strdup(file); - mc->mfd = open(file, ORDWR|OCEXEC); + mc->mfd = sys_open(file, ORDWR|OCEXEC); if(mc->mfd<0 && strcmp(file, "/dev/mouse")==0){ - bind("#m", "/dev", MAFTER); - mc->mfd = open(file, ORDWR|OCEXEC); + sys_bind("#m", "/dev", MAFTER); + mc->mfd = sys_open(file, ORDWR|OCEXEC); } if(mc->mfd < 0){ free(mc); @@ -118,7 +118,7 @@ initmouse(char *file, Image *i) } t = malloc(strlen(file)+16); if (t == nil) { - close(mc->mfd); + sys_close(mc->mfd); free(mc); return nil; } @@ -128,7 +128,7 @@ initmouse(char *file, Image *i) strcpy(sl, "/cursor"); else strcpy(t, "/dev/cursor"); - mc->cfd = open(t, ORDWR|OCEXEC); + mc->cfd = sys_open(t, ORDWR|OCEXEC); free(t); mc->image = i; mc->c = chancreate(sizeof(Mouse), 0); @@ -143,11 +143,11 @@ setcursor(Mousectl *mc, Cursor *c) char curs[2*4+2*2*16]; if(c == nil) - write(mc->cfd, curs, 0); + jehanne_write(mc->cfd, curs, 0); else{ BPLONG(curs+0*4, c->offset.x); BPLONG(curs+1*4, c->offset.y); memmove(curs+2*4, c->clr, 2*2*16); - write(mc->cfd, curs, sizeof curs); + jehanne_write(mc->cfd, curs, sizeof curs); } } diff --git a/sys/src/lib/draw/namedimage.c b/sys/src/lib/draw/namedimage.c index 02c426e..25a921e 100644 --- a/sys/src/lib/draw/namedimage.c +++ b/sys/src/lib/draw/namedimage.c @@ -58,7 +58,7 @@ namedimage(Display *d, char *name) if(flushimage(d, 0) < 0) goto Error; - if(pread(d->ctlfd, buf, sizeof buf, 0) < 12*12) + if(sys_pread(d->ctlfd, buf, sizeof buf, 0) < 12*12) goto Error; buf[12*12] = '\0'; diff --git a/sys/src/lib/draw/newwindow.c b/sys/src/lib/draw/newwindow.c index d6fbf36..f07d3a2 100644 --- a/sys/src/lib/draw/newwindow.c +++ b/sys/src/lib/draw/newwindow.c @@ -26,15 +26,15 @@ newwindow(char *str) wsys = getenv(ENV_WSYS); if(wsys == nil) return -1; - fd = open(wsys, ORDWR); + fd = sys_open(wsys, ORDWR); free(wsys); if(fd < 0) return -1; - rfork(RFNAMEG); + sys_rfork(RFNAMEG); if(str) snprint(buf, sizeof buf, "new %s", str); else strcpy(buf, "new"); - return mount(fd, -1, "/dev", MBEFORE, buf, '9'); + return sys_mount(fd, -1, "/dev", MBEFORE, buf, '9'); } diff --git a/sys/src/lib/draw/openfont.c b/sys/src/lib/draw/openfont.c index ac59a2f..f9fb42e 100644 --- a/sys/src/lib/draw/openfont.c +++ b/sys/src/lib/draw/openfont.c @@ -19,14 +19,14 @@ openfont(Display *d, char *name) char *buf; Dir *dir; - fd = open(name, OREAD); + fd = sys_open(name, OREAD); if(fd < 0) return 0; dir = dirfstat(fd); if(dir == nil){ Err0: - close(fd); + sys_close(fd); return 0; } n = dir->length; @@ -35,8 +35,8 @@ openfont(Display *d, char *name) if(buf == 0) goto Err0; buf[n] = 0; - i = read(fd, buf, n); - close(fd); + i = jehanne_read(fd, buf, n); + sys_close(fd); if(i != n){ free(buf); return 0; diff --git a/sys/src/lib/draw/readsubfont.c b/sys/src/lib/draw/readsubfont.c index 9aae121..eb8bc14 100644 --- a/sys/src/lib/draw/readsubfont.c +++ b/sys/src/lib/draw/readsubfont.c @@ -27,7 +27,7 @@ readsubfonti(Display*d, char *name, int fd, Image *ai, int dolock) if(i == nil) return nil; } - if(read(fd, hdr, 3*12) != 3*12){ + if(jehanne_read(fd, hdr, 3*12) != 3*12){ if(ai == nil) freeimage(i); werrstr("rdsubfonfile: header read error: %r"); @@ -37,7 +37,7 @@ readsubfonti(Display*d, char *name, int fd, Image *ai, int dolock) p = malloc(6*(n+1)); if(p == nil) goto Err; - if(read(fd, p, 6*(n+1)) != 6*(n+1)){ + if(jehanne_read(fd, p, 6*(n+1)) != 6*(n+1)){ werrstr("rdsubfonfile: fontchar read error: %r"); Err: if(ai == nil) diff --git a/sys/src/lib/draw/unloadimage.c b/sys/src/lib/draw/unloadimage.c index de5cdac..55b7e5f 100644 --- a/sys/src/lib/draw/unloadimage.c +++ b/sys/src/lib/draw/unloadimage.c @@ -52,7 +52,7 @@ unloadimage(Image *i, Rectangle r, uint8_t *data, int ndata) BPLONG(a+17, r.min.y+dy); if(flushimage(d, 0) < 0) return -1; - n = read(d->fd, data+ntot, ndata-ntot); + n = jehanne_read(d->fd, data+ntot, ndata-ntot); if(n < 0) return n; ntot += n; diff --git a/sys/src/lib/draw/writecolmap.c b/sys/src/lib/draw/writecolmap.c index 7a272b8..549f526 100644 --- a/sys/src/lib/draw/writecolmap.c +++ b/sys/src/lib/draw/writecolmap.c @@ -25,7 +25,7 @@ writecolmap(Display *d, RGB *m) uint32_t r, g, b; sprint(buf, "/dev/draw/%d/colormap", d->dirno); - fd = open(buf, OWRITE); + fd = sys_open(buf, OWRITE); if(fd < 0) drawerror(d, "writecolmap: open colormap failed"); t = malloc(8192); @@ -38,9 +38,9 @@ writecolmap(Display *d, RGB *m) b = m[i].blue>>24; n += sprint(t+n, "%d %lud %lud %lud\n", 255-i, r, g, b); } - i = write(fd, t, n); + i = jehanne_write(fd, t, n); free(t); - close(fd); + sys_close(fd); if(i != n) drawerror(d, "writecolmap: bad write"); } diff --git a/sys/src/lib/draw/writeimage.c b/sys/src/lib/draw/writeimage.c index 2f206c6..bf8a1ce 100644 --- a/sys/src/lib/draw/writeimage.c +++ b/sys/src/lib/draw/writeimage.c @@ -77,7 +77,7 @@ writeimage(int fd, Image *i, int dolock) } sprint(hdr, "compressed\n%11s %11d %11d %11d %11d ", chantostr(cbuf, i->chan), r.min.x, r.min.y, r.max.x, r.max.y); - if(write(fd, hdr, 11+5*12) != 11+5*12) + if(jehanne_write(fd, hdr, 11+5*12) != 11+5*12) goto ErrOut; edata = data+n; eout = outbuf+ncblock; @@ -182,8 +182,8 @@ writeimage(int fd, Image *i, int dolock) goto ErrOut; n = loutp-outbuf; sprint(hdr, "%11d %11ld ", r.max.y, n); - write(fd, hdr, 2*12); - write(fd, outbuf, n); + jehanne_write(fd, hdr, 2*12); + jehanne_write(fd, outbuf, n); r.min.y = r.max.y; } free(data); diff --git a/sys/src/lib/draw/writesubfont.c b/sys/src/lib/draw/writesubfont.c index 6913f55..74273f8 100644 --- a/sys/src/lib/draw/writesubfont.c +++ b/sys/src/lib/draw/writesubfont.c @@ -37,7 +37,7 @@ writesubfont(int fd, Subfont *f) int nb; sprint(hdr, "%11d %11d %11d ", f->n, f->height, f->ascent); - if(write(fd, hdr, 3*12) != 3*12){ + if(jehanne_write(fd, hdr, 3*12) != 3*12){ Err: werrstr("writesubfont: bad write: %r"); return -1; @@ -47,7 +47,7 @@ writesubfont(int fd, Subfont *f) if(data == nil) return -1; packinfo(f->info, data, f->n); - if(write(fd, data, nb) != nb) + if(jehanne_write(fd, data, nb) != nb) goto Err; free(data); return 0; diff --git a/sys/src/lib/ip/myetheraddr.c b/sys/src/lib/ip/myetheraddr.c index 4e5ccbe..90c5c8e 100644 --- a/sys/src/lib/ip/myetheraddr.c +++ b/sys/src/lib/ip/myetheraddr.c @@ -22,12 +22,12 @@ myetheraddr(uint8_t *to, char *dev) else sprint(buf, "/net/%s/addr", dev); - fd = open(buf, OREAD); + fd = sys_open(buf, OREAD); if(fd < 0) return -1; - n = read(fd, buf, sizeof buf -1 ); - close(fd); + n = jehanne_read(fd, buf, sizeof buf -1 ); + sys_close(fd); if(n <= 0) return -1; buf[n] = 0; diff --git a/sys/src/lib/ip/readipifc.c b/sys/src/lib/ip/readipifc.c index 59df146..1208125 100644 --- a/sys/src/lib/ip/readipifc.c +++ b/sys/src/lib/ip/readipifc.c @@ -74,14 +74,14 @@ _readipifc(char *file, Ipifc **l, int index) Iplifc *lifc, **ll; /* read the file */ - fd = open(file, OREAD); + fd = sys_open(file, OREAD); if(fd < 0) return l; n = 0; - while((i = read(fd, buf+n, sizeof(buf)-1-n)) > 0 && n < sizeof(buf) - 1) + while((i = jehanne_read(fd, buf+n, sizeof(buf)-1-n)) > 0 && n < sizeof(buf) - 1) n += i; buf[n] = 0; - close(fd); + sys_close(fd); if(strncmp(buf, "device", 6) != 0) return _readoldipifc(buf, l, index); @@ -189,11 +189,11 @@ readipifc(char *net, Ipifc *ifc, int index) snprint(buf, sizeof(buf), "%s/%d/status", directory, index); _readipifc(buf, l, index); } else { - fd = open(directory, OREAD); + fd = sys_open(directory, OREAD); if(fd < 0) return nil; n = dirreadall(fd, &dir); - close(fd); + sys_close(fd); for(i = 0; i < n; i++){ if(strcmp(dir[i].name, "clone") == 0) diff --git a/sys/src/lib/memdraw/arctest.c b/sys/src/lib/memdraw/arctest.c index 58572e7..8310a7e 100644 --- a/sys/src/lib/memdraw/arctest.c +++ b/sys/src/lib/memdraw/arctest.c @@ -68,7 +68,7 @@ iprint(char *fmt, ...) n = jehanne_vseprint(buf, buf+sizeof buf, fmt, va) - buf; va_end(va); - write(1,buf,n); + jehanne_write(1,buf,n); return 1; } diff --git a/sys/src/lib/memdraw/drawtest.c b/sys/src/lib/memdraw/drawtest.c index ade089c..e0a5a88 100644 --- a/sys/src/lib/memdraw/drawtest.c +++ b/sys/src/lib/memdraw/drawtest.c @@ -74,7 +74,7 @@ iprint(char *fmt, ...) n = jehanne_vseprint(buf, buf+sizeof buf, fmt, va) - buf; va_end(va); - write(1,buf,n); + jehanne_write(1,buf,n); return 1; } diff --git a/sys/src/lib/memdraw/openmemsubfont.c b/sys/src/lib/memdraw/openmemsubfont.c index 4670afc..d37e8b1 100644 --- a/sys/src/lib/memdraw/openmemsubfont.c +++ b/sys/src/lib/memdraw/openmemsubfont.c @@ -22,14 +22,14 @@ openmemsubfont(char *name) char hdr[3*12+4+1]; uint8_t *p; - fd = open(name, OREAD); + fd = sys_open(name, OREAD); if(fd < 0) return nil; p = nil; i = readmemimage(fd); if(i == nil) goto Err; - if(read(fd, hdr, 3*12) != 3*12){ + if(jehanne_read(fd, hdr, 3*12) != 3*12){ jehanne_werrstr("openmemsubfont: header read error: %r"); goto Err; } @@ -37,7 +37,7 @@ openmemsubfont(char *name) p = jehanne_malloc(6*(n+1)); if(p == nil) goto Err; - if(read(fd, p, 6*(n+1)) != 6*(n+1)){ + if(jehanne_read(fd, p, 6*(n+1)) != 6*(n+1)){ jehanne_werrstr("openmemsubfont: fontchar read error: %r"); goto Err; } @@ -53,7 +53,7 @@ openmemsubfont(char *name) jehanne_free(p); return sf; Err: - close(fd); + sys_close(fd); if (i != nil) freememimage(i); if (p != nil) diff --git a/sys/src/lib/memdraw/write.c b/sys/src/lib/memdraw/write.c index b58c443..0617c0e 100644 --- a/sys/src/lib/memdraw/write.c +++ b/sys/src/lib/memdraw/write.c @@ -75,7 +75,7 @@ writememimage(int fd, Memimage *i) } jehanne_sprint(hdr, "compressed\n%11s %11d %11d %11d %11d ", chantostr(cbuf, i->chan), r.min.x, r.min.y, r.max.x, r.max.y); - if(write(fd, hdr, 11+5*12) != 11+5*12) + if(jehanne_write(fd, hdr, 11+5*12) != 11+5*12) goto ErrOut; edata = data+n; eout = outbuf+ncblock; @@ -180,8 +180,8 @@ writememimage(int fd, Memimage *i) goto ErrOut; n = loutp-outbuf; jehanne_sprint(hdr, "%11d %11ld ", r.max.y, n); - write(fd, hdr, 2*12); - write(fd, outbuf, n); + jehanne_write(fd, hdr, 2*12); + jehanne_write(fd, outbuf, n); r.min.y = r.max.y; } jehanne_free(data); diff --git a/sys/src/lib/mp/bigtest.c b/sys/src/lib/mp/bigtest.c index b1fe056..daf2d3d 100644 --- a/sys/src/lib/mp/bigtest.c +++ b/sys/src/lib/mp/bigtest.c @@ -24,7 +24,7 @@ printmp(mpint *b, char *tag) jehanne_print("%s (%d) ", tag, b->top); p = mptoa(b, 10, nil, 0); - write(1, p, jehanne_strlen(p)); + jehanne_write(1, p, jehanne_strlen(p)); jehanne_free(p); jehanne_print("\n"); } diff --git a/sys/src/lib/ndb/csgetval.c b/sys/src/lib/ndb/csgetval.c index 97363e5..9c018c7 100644 --- a/sys/src/lib/ndb/csgetval.c +++ b/sys/src/lib/ndb/csgetval.c @@ -38,21 +38,21 @@ csgetvalue(char *netroot, char *attr, char *val, char *rattr, snprint(line, sizeof(line), "%s/cs", netroot); else strcpy(line, "/net/cs"); - fd = open(line, ORDWR); + fd = sys_open(line, ORDWR); if(fd < 0) return 0; - seek(fd, 0, 0); + sys_seek(fd, 0, 0); snprint(line, sizeof(line), "!%s=%s %s=*", attr, val, rattr); - if(write(fd, line, strlen(line)) < 0){ - close(fd); + if(jehanne_write(fd, line, strlen(line)) < 0){ + sys_close(fd); return 0; } - seek(fd, 0, 0); + sys_seek(fd, 0, 0); first = last = 0; linefound = 0; for(;;){ - n = read(fd, line, sizeof(line)-2); + n = jehanne_read(fd, line, sizeof(line)-2); if(n <= 0) break; line[n] = '\n'; @@ -79,7 +79,7 @@ csgetvalue(char *netroot, char *attr, char *val, char *rattr, } } } - close(fd); + sys_close(fd); if(oops){ werrstr("buffer too short"); diff --git a/sys/src/lib/ndb/csipinfo.c b/sys/src/lib/ndb/csipinfo.c index aa2d66e..f674dcb 100644 --- a/sys/src/lib/ndb/csipinfo.c +++ b/sys/src/lib/ndb/csipinfo.c @@ -32,10 +32,10 @@ csipinfo(char *netroot, char *attr, char *val, char **list, int n) snprint(line, sizeof(line), "%s/cs", netroot); else strcpy(line, "/net/cs"); - fd = open(line, ORDWR); + fd = sys_open(line, ORDWR); if(fd < 0) return 0; - seek(fd, 0, 0); + sys_seek(fd, 0, 0); e = line + sizeof(line); p = seprint(line, e, "!ipinfo %s=%s", attr, val); for(i = 0; i < n; i++){ @@ -44,15 +44,15 @@ csipinfo(char *netroot, char *attr, char *val, char **list, int n) p = seprint(p, e, " %s", *list++); } - if(write(fd, line, strlen(line)) < 0){ - close(fd); + if(jehanne_write(fd, line, strlen(line)) < 0){ + sys_close(fd); return 0; } - seek(fd, 0, 0); + sys_seek(fd, 0, 0); first = last = 0; for(;;){ - n = read(fd, line, sizeof(line)-2); + n = jehanne_read(fd, line, sizeof(line)-2); if(n <= 0) break; line[n] = '\n'; @@ -70,7 +70,7 @@ csipinfo(char *netroot, char *attr, char *val, char **list, int n) while(last->entry) last = last->entry; } - close(fd); + sys_close(fd); ndbsetmalloctag(first, getcallerpc()); return first; diff --git a/sys/src/lib/ndb/dnsquery.c b/sys/src/lib/ndb/dnsquery.c index b6a12e6..718783a 100644 --- a/sys/src/lib/ndb/dnsquery.c +++ b/sys/src/lib/ndb/dnsquery.c @@ -41,7 +41,7 @@ dnsquery(char *net, char *val, char *type) if(net == nil) net = "/net"; snprint(rip, sizeof(rip), "%s/dns", net); - fd = open(rip, ORDWR); + fd = sys_open(rip, ORDWR); if(fd < 0){ if(strcmp(net, "/net") == 0) snprint(rip, sizeof(rip), "/srv/dns"); @@ -50,16 +50,16 @@ dnsquery(char *net, char *val, char *type) p = strrchr(rip, '/'); *p = '_'; } - fd = open(rip, ORDWR); + fd = sys_open(rip, ORDWR); if(fd < 0) return nil; - if(mount(fd, -1, net, MBEFORE, "", '9') < 0){ - close(fd); + if(sys_mount(fd, -1, net, MBEFORE, "", '9') < 0){ + sys_close(fd); return nil; } /* fd is now closed */ snprint(rip, sizeof(rip), "%s/dns", net); - fd = open(rip, ORDWR); + fd = sys_open(rip, ORDWR); if(fd < 0) return nil; } @@ -78,7 +78,7 @@ dnsquery(char *net, char *val, char *type) * TODO: make fd static and keep it open to reduce 9P traffic * walking to /net*^/dns. Must be prepared to re-open it on error. */ - close(fd); + sys_close(fd); ndbsetmalloctag(t, getcallerpc()); return t; } @@ -132,17 +132,17 @@ doquery(int fd, char *dn, char *type) int n; Ndbtuple *t, *first, *last; - seek(fd, 0, 0); + sys_seek(fd, 0, 0); snprint(buf, sizeof(buf), "!%s %s", dn, type); - if(write(fd, buf, strlen(buf)) < 0) + if(jehanne_write(fd, buf, strlen(buf)) < 0) return nil; - seek(fd, 0, 0); + sys_seek(fd, 0, 0); first = last = nil; for(;;){ - n = read(fd, buf, sizeof(buf)-2); + n = jehanne_read(fd, buf, sizeof(buf)-2); if(n <= 0) break; if(buf[n-1] != '\n') diff --git a/sys/src/lib/ndb/ndbhash.c b/sys/src/lib/ndb/ndbhash.c index 12a6ab8..88f875b 100644 --- a/sys/src/lib/ndb/ndbhash.c +++ b/sys/src/lib/ndb/ndbhash.c @@ -41,8 +41,8 @@ static uint8_t* hfread(Ndbhf *hf, int32_t off, int len) { if(off < hf->off || off + len > hf->off + hf->len){ - if(seek(hf->fd, off, 0) < 0 - || (hf->len = read(hf->fd, hf->buf, sizeof(hf->buf))) < len){ + if(sys_seek(hf->fd, off, 0) < 0 + || (hf->len = jehanne_read(hf->fd, hf->buf, sizeof(hf->buf))) < len){ hf->off = -1; return 0; } @@ -96,7 +96,7 @@ hfopen(Ndb *db, char *attr) /* compare it to the database file */ strncpy(hf->attr, attr, sizeof(hf->attr)-1); sprint(buf, "%s.%s", db->file, hf->attr); - hf->fd = open(buf, OREAD); + hf->fd = sys_open(buf, OREAD); if(hf->fd >= 0){ hf->len = 0; hf->off = 0; @@ -110,7 +110,7 @@ hfopen(Ndb *db, char *attr) return hf; } } - close(hf->fd); + sys_close(hf->fd); } free(hf); diff --git a/sys/src/lib/ndb/ndbopen.c b/sys/src/lib/ndb/ndbopen.c index a099290..8fc6b15 100644 --- a/sys/src/lib/ndb/ndbopen.c +++ b/sys/src/lib/ndb/ndbopen.c @@ -103,18 +103,18 @@ ndbreopen(Ndb *db) if(db->mtime){ _ndbcacheflush(db); hffree(db); - close(Bfildes(&db->b)); + sys_close(Bfildes(&db->b)); Bterm(&db->b); db->mtime = 0; } /* try the open again */ - fd = open(db->file, OREAD); + fd = sys_open(db->file, OREAD); if(fd < 0) return -1; d = dirfstat(fd); if(d == nil){ - close(fd); + sys_close(fd); return -1; } @@ -138,7 +138,7 @@ ndbclose(Ndb *db) nextdb = db->next; _ndbcacheflush(db); hffree(db); - close(Bfildes(&db->b)); + sys_close(Bfildes(&db->b)); Bterm(&db->b); free(db); } @@ -154,7 +154,7 @@ hffree(Ndb *db) for(hf = db->hf; hf; hf = next){ next = hf->next; - close(hf->fd); + sys_close(hf->fd); free(hf); } db->hf = 0; diff --git a/sys/src/lib/plumb/mesg.c b/sys/src/lib/plumb/mesg.c index 6be963d..438e22b 100644 --- a/sys/src/lib/plumb/mesg.c +++ b/sys/src/lib/plumb/mesg.c @@ -20,7 +20,7 @@ plumbopen(char *name, int omode) char buf[128], err[ERRMAX]; if(name[0] == '/') - return open(name, omode); + return sys_open(name, omode); /* find elusive plumber */ if(access("/mnt/plumb/send", AWRITE) >= 0) @@ -33,12 +33,12 @@ plumbopen(char *name, int omode) s = getenv("plumbsrv"); if(s == nil) return -1; - f = open(s, ORDWR); + f = sys_open(s, ORDWR); free(s); if(f < 0) return -1; - if(mount(f, -1, "/mnt/plumb", MREPL, "", '9') < 0){ - close(f); + if(sys_mount(f, -1, "/mnt/plumb", MREPL, "", '9') < 0){ + sys_close(f); return -1; } if(access("/mnt/plumb/send", AWRITE) < 0) @@ -46,7 +46,7 @@ plumbopen(char *name, int omode) } snprint(buf, sizeof buf, "%s/%s", plumber, name); - fd = open(buf, omode); + fd = sys_open(buf, omode); if(fd >= 0) return fd; @@ -55,7 +55,7 @@ plumbopen(char *name, int omode) fd = ocreate(buf, omode, 0600); if(fd >= 0) return fd; - errstr(err, sizeof err); + sys_errstr(err, sizeof err); return -1; } @@ -197,7 +197,7 @@ plumbsend(int fd, Plumbmsg *m) buf = plumbpack(m, &n); if(buf == nil) return -1; - n = write(fd, buf, n); + n = jehanne_write(fd, buf, n); free(buf); return n; } @@ -429,7 +429,7 @@ plumbrecv(int fd) buf = malloc(8192); if(buf == nil) return nil; - n = read(fd, buf, 8192); + n = jehanne_read(fd, buf, 8192); m = nil; if(n > 0){ m = plumbunpackpartial(buf, n, &more); diff --git a/sys/src/lib/posix/environment.c b/sys/src/lib/posix/environment.c index 3d1e30c..b9d46ec 100644 --- a/sys/src/lib/posix/environment.c +++ b/sys/src/lib/posix/environment.c @@ -99,11 +99,11 @@ write_env_file(const char *name, const char *value, int size) f = ocreate(buf, OWRITE, 664); if(f < 0) return 0; - if(write(f, value, size) < 0){ - close(f); + if(jehanne_write(f, value, size) < 0){ + sys_close(f); return 0; } - close(f); + sys_close(f); return 1; } @@ -165,7 +165,7 @@ POSIX_unsetenv(int *errnop, const char *name) wunlock(&list_lock); snprint(buf, sizeof(buf), "/env/%s", name); - remove(buf); + sys_remove(buf); return 0; } @@ -240,7 +240,7 @@ __libposix_setup_exec_environment(char * const *env) continue; end++; /* after '=' */ len = strlen(end); - pwrite(fd, end, len, -1); - close(fd); + sys_pwrite(fd, end, len, -1); + sys_close(fd); } } diff --git a/sys/src/lib/posix/errors.c b/sys/src/lib/posix/errors.c index 9c21e81..0037bed 100644 --- a/sys/src/lib/posix/errors.c +++ b/sys/src/lib/posix/errors.c @@ -173,7 +173,7 @@ __libposix_translate_errstr(uintptr_t caller) char err[ERRMAX]; int ret; - if(errstr(err, ERRMAX) < 0) + if(sys_errstr(err, ERRMAX) < 0) return __libposix_get_errno(PosixEINVAL); handler = custom_handlers; @@ -189,6 +189,6 @@ __libposix_translate_errstr(uintptr_t caller) if(perr == 0) perr = libposix_translate_kernel_errors(err); ret = __libposix_get_errno(perr); - errstr(err, ERRMAX); + sys_errstr(err, ERRMAX); return ret; } diff --git a/sys/src/lib/posix/fcntl.c b/sys/src/lib/posix/fcntl.c index 7477d5b..e35a622 100644 --- a/sys/src/lib/posix/fcntl.c +++ b/sys/src/lib/posix/fcntl.c @@ -61,11 +61,11 @@ fcntl_dup(int *errnop, int fd, int minfd) if(newfd >= minfd) --i; while(i >= 0) - close(opened[i--]); + sys_close(opened[i--]); if(newfd >= minfd) return newfd; - close(newfd); + sys_close(newfd); if(e == 0) e = PosixEMFILE; *errnop = __libposix_get_errno(e); @@ -79,11 +79,11 @@ file_flags(int *errnop, int fd) char buf[128], *cols[3]; snprint(buf, sizeof(buf), "/fd/%dctl", fd); - newfd = open(buf, OREAD); + newfd = sys_open(buf, OREAD); if(newfd < 0) goto FailWithEBADF; - r = read(newfd, buf, sizeof(buf)); - close(newfd); + r = jehanne_read(newfd, buf, sizeof(buf)); + sys_close(newfd); if(r < 0) goto FailWithEBADF; diff --git a/sys/src/lib/posix/files.c b/sys/src/lib/posix/files.c index 5b3791f..65eeece 100644 --- a/sys/src/lib/posix/files.c +++ b/sys/src/lib/posix/files.c @@ -98,7 +98,7 @@ __libposix_close_on_exec(void) int i = 0; while(i < __libposix_coe_fds_size){ if(__libposix_coe_fds[i] != -1){ - close(__libposix_coe_fds[i]); + sys_close(__libposix_coe_fds[i]); __libposix_coe_fds[i] = -1; --__libposix_coe_fds_used; } @@ -343,7 +343,7 @@ POSIX_open(int *errnop, const char *name, int flags, int mode) omode &= ~DMDIR; } if(cperm == 0){ - f = open(name, omode); + f = sys_open(name, omode); } else { f = ocreate(name, (unsigned int)omode, (unsigned int)cperm); } @@ -371,8 +371,8 @@ POSIX_read(int *errnop, int fd, char *buf, size_t len) } OnIgnoredSignalInterrupt: if(__libposix_should_not_block(fd)) - wkp = awake(2); - r = pread(fd, buf, len, -1); + wkp = sys_awake(2); + r = sys_pread(fd, buf, len, -1); if(r < 0){ if(wkp){ if(!awakened(wkp)) @@ -401,8 +401,8 @@ POSIX_write(int *errnop, int fd, const void *buf, size_t len) } OnIgnoredSignalInterrupt: if(__libposix_should_not_block(fd)) - wkp = awake(2); - w = pwrite(fd, buf, len, -1); + wkp = sys_awake(2); + w = sys_pwrite(fd, buf, len, -1); if(w < 0){ if(wkp){ if(!awakened(wkp)) @@ -435,7 +435,7 @@ POSIX_lseek(int *errnop, int fd, off_t pos, int whence) *errnop = __libposix_get_errno(PosixEBADF); return -1; } - r = seek(fd, pos, stype); + r = sys_seek(fd, pos, stype); if(r >= 0) return r; *errnop = __libposix_translate_errstr((uintptr_t)POSIX_lseek); @@ -453,8 +453,8 @@ POSIX_pread(int *errnop, int fd, char *buf, size_t len, long offset) } OnIgnoredSignalInterrupt: if(__libposix_should_not_block(fd)) - wkp = awake(2); - r = pread(fd, buf, len, offset); + wkp = sys_awake(2); + r = sys_pread(fd, buf, len, offset); if(r < 0){ if(wkp){ if(!awakened(wkp)) @@ -483,8 +483,8 @@ POSIX_pwrite(int *errnop, int fd, const char *buf, size_t len, long offset) } OnIgnoredSignalInterrupt: if(__libposix_should_not_block(fd)) - wkp = awake(2); - w = pwrite(fd, buf, len, offset); + wkp = sys_awake(2); + w = sys_pwrite(fd, buf, len, offset); if(w < 0){ if(wkp){ if(!awakened(wkp)) @@ -507,7 +507,7 @@ POSIX_close(int *errno, int file) { long ret; - ret = close(file); + ret = sys_close(file); switch(ret){ case 0: return 0; @@ -529,7 +529,7 @@ POSIX_unlink(int *errnop, const char *name) *errnop = __libposix_get_errno(PosixENOENT); return -1; } - ret = remove(name); + ret = sys_remove(name); switch(ret){ case 0: return 0; @@ -552,7 +552,7 @@ POSIX_rmdir(int *errnop, const char *name) *errnop = __libposix_get_errno(PosixENOENT); return -1; } - ret = remove(name); + ret = sys_remove(name); switch(ret){ case 0: return 0; @@ -692,7 +692,7 @@ POSIX_fchmodat(int *errnop, int fd, const char *path, long mode, int flag) } else { e = __libposix_open_translation(0, mode, nil, &cperm); } - if(e == 0 && fd2path(fd, fullpath, sizeof(fullpath)-2) != 0) + if(e == 0 && sys_fd2path(fd, fullpath, sizeof(fullpath)-2) != 0) e = PosixEBADF; if(e != 0) goto FailWithError; @@ -792,7 +792,7 @@ POSIX_fchdir(int *errnop, int fd) if((d->mode & DMDIR) == 0) e = PosixENOTDIR; free(d); - if(fd2path(fd, buf, sizeof(buf)) != 0) + if(sys_fd2path(fd, buf, sizeof(buf)) != 0) e = PosixENOENT; /* just removed? */ } } @@ -835,7 +835,7 @@ POSIX_rename(int *errnop, const char *from, const char *to) goto FailWithError; } if(access(to, AEXIST) == 0){ - if(remove(to) < 0){ + if(sys_remove(to) < 0){ e = PosixEACCES; goto FailWithError; } @@ -850,21 +850,21 @@ POSIX_rename(int *errnop, const char *from, const char *to) e = PosixEPERM; } else { /* different directories: with 9P2000 we have to copy */ - if((ffd = open(from, OREAD)) < 0 - || (tfd = create(to, OWRITE, d->mode)) < 0){ + if((ffd = sys_open(from, OREAD)) < 0 + || (tfd = sys_create(to, OWRITE, d->mode)) < 0){ e = PosixEPERM; } - while(e == 0 && (n = read(ffd, buf, sizeof(buf))) > 0) - if(write(tfd, buf, n) != n) + while(e == 0 && (n = jehanne_read(ffd, buf, sizeof(buf))) > 0) + if(jehanne_write(tfd, buf, n) != n) e = PosixEIO; if(ffd >= 0) - close(ffd); + sys_close(ffd); if(tfd >= 0) - close(tfd); - if(e == 0 && remove(from) < 0) + sys_close(tfd); + if(e == 0 && sys_remove(from) < 0) e = PosixEIO; if(e == PosixEIO && tfd >= 0) - remove(to); + sys_remove(to); } if(e != 0) goto FailWithError; @@ -894,9 +894,9 @@ POSIX_mkdir(int *errnop, const char *path, int mode) if(e != 0) goto FailWithError; - fd = create(path, OREAD, DMDIR | cperm); + fd = sys_create(path, OREAD, DMDIR | cperm); if(fd >= 0){ - close(fd); + sys_close(fd); return 0; } @@ -938,7 +938,7 @@ libposix_getdents(int *errnop, int fd, char *buf, int buf_bytes) if(r == 0) goto FailWithENOTDIR; /* not a directory */ - r = read(fd, buf, buf_bytes); + r = jehanne_read(fd, buf, buf_bytes); if(r == 0) return 0; if(r < 0) diff --git a/sys/src/lib/posix/ids.c b/sys/src/lib/posix/ids.c index 2fc63dc..0b0b723 100644 --- a/sys/src/lib/posix/ids.c +++ b/sys/src/lib/posix/ids.c @@ -35,7 +35,7 @@ get_ppid(int pid) long n; char buf[32]; sprint(buf, "/proc/%d/ppid", pid); - n = remove(buf); + n = sys_remove(buf); if(n == -1) return -1; return (int)n; @@ -55,7 +55,7 @@ __libposix_sighelper_set_pgid(int target, int group) offset.request.target = target; buf.group = group; - ret = pwrite(*__libposix_devsignal, buf.raw, sizeof(buf.raw), offset.raw); + ret = sys_pwrite(*__libposix_devsignal, buf.raw, sizeof(buf.raw), offset.raw); return ret; } @@ -76,7 +76,7 @@ set_group_id(int *errnop, int pid, int group) if(pid == 0 && group == 0){ /* the caller wants a new process group */ CreateNewProcessGroup: - rfork(RFNOTEG); + sys_rfork(RFNOTEG); return __libposix_sighelper_cmd(PHSetProcessGroup, mypid); } if(pid == 0) @@ -230,16 +230,16 @@ POSIX_setsid(int *errnop) if(fname == nil || __libposix_sighelper_cmd(PHDetachSession, 0) < 0) goto FailWithEPERM; if(*__libposix_devsignal >= 0) - close(*__libposix_devsignal); + sys_close(*__libposix_devsignal); *__libposix_devsignal = -1; - rfork(RFNAMEG|RFNOTEG|RFENVG|RFFDG); - unmount(fname, "/dev"); + sys_rfork(RFNAMEG|RFNOTEG|RFENVG|RFFDG); + sys_unmount(fname, "/dev"); free(fname); fname = nil; assert(access("/dev/posix", AEXIST) != 0); /* start the new session */ - switch(controlpid = rfork(RFPROC|RFNOTEG|RFENVG|RFFDG)){ + switch(controlpid = sys_rfork(RFPROC|RFNOTEG|RFENVG|RFFDG)){ case -1: goto FailWithEPERM; case 0: @@ -248,7 +248,7 @@ POSIX_setsid(int *errnop) posixly_args[2] = smprint("%d", mypid); posixly_args[3] = nil; jehanne_pexec("sys/posixly", posixly_args); - rfork(RFNOWAIT); + sys_rfork(RFNOWAIT); sysfatal("pexec sys/posixly"); default: break; diff --git a/sys/src/lib/posix/initlib.c b/sys/src/lib/posix/initlib.c index 1a0c3b9..5f0e844 100644 --- a/sys/src/lib/posix/initlib.c +++ b/sys/src/lib/posix/initlib.c @@ -44,9 +44,9 @@ __libposix_sighelper_open(void) { int mypid; if(*__libposix_devsignal >= 0) - close(*__libposix_devsignal); + sys_close(*__libposix_devsignal); mypid = *__libposix_pid; - *__libposix_devsignal = create("/dev/posix/signals", ORDWR|OCEXEC, mypid); + *__libposix_devsignal = sys_create("/dev/posix/signals", ORDWR|OCEXEC, mypid); if(*__libposix_devsignal < 0) sysfatal("cannot create /dev/posix/signals: %r"); } @@ -147,5 +147,5 @@ __libposix_sighelper_cmd(PosixHelperCommand command, int posix_process_pid) offset.request.command = command; offset.request.target = posix_process_pid; - return pwrite(*__libposix_devsignal, "", 0, offset.raw); + return sys_pwrite(*__libposix_devsignal, "", 0, offset.raw); } diff --git a/sys/src/lib/posix/others.c b/sys/src/lib/posix/others.c index 5af9615..a28d9cb 100644 --- a/sys/src/lib/posix/others.c +++ b/sys/src/lib/posix/others.c @@ -29,7 +29,7 @@ POSIX_isatty(int *errnop, int fd) *errnop = __libposix_get_errno(PosixEBADF); return 0; } - if(fd2path(fd, buf, sizeof(buf)) < 0){ + if(sys_fd2path(fd, buf, sizeof(buf)) < 0){ *errnop = __libposix_get_errno(PosixENOTTY); return 0; } @@ -64,7 +64,7 @@ POSIX_usleep(int *errnop, unsigned int usec) int POSIX_pause(int *errnop) { - rendezvous((void*)~0, (void*)1); + sys_rendezvous((void*)~0, (void*)1); *errnop = __libposix_get_errno(PosixEINTR); return -1; } @@ -89,11 +89,11 @@ POSIX_getlogin_r(int *errnop, char *name, int namesize) int fd; int n; - fd = open("/dev/user", OREAD); + fd = sys_open("/dev/user", OREAD); if(fd < 0) goto None; - n = read(fd, user, (sizeof user)-1); - close(fd); + n = jehanne_read(fd, user, (sizeof user)-1); + sys_close(fd); if(n <= 0) goto None; if(namesize < n){ @@ -139,26 +139,26 @@ POSIX_getpass(int *errnop, const char *prompt) char *p; static char buf[256]; - if(fd2path(0, buf, sizeof(buf)) == 0 + if(sys_fd2path(0, buf, sizeof(buf)) == 0 && (strcmp("/dev/cons", buf) == 0 || strcmp("/dev/tty", buf) == 0)) r = 0; - else if((r = open("/dev/cons", OREAD)) < 0) + else if((r = sys_open("/dev/cons", OREAD)) < 0) goto ReturnENXIO; - if(fd2path(1, buf, sizeof(buf)) == 0 + if(sys_fd2path(1, buf, sizeof(buf)) == 0 && (strcmp("/dev/cons", buf) == 0 || strcmp("/dev/tty", buf) == 0)) w = 1; - else if((w = open("/dev/cons", OWRITE)) < 0) + else if((w = sys_open("/dev/cons", OWRITE)) < 0) goto CloseRAndReturnENXIO; - if((ctl = open("/dev/consctl", OWRITE)) < 0) + if((ctl = sys_open("/dev/consctl", OWRITE)) < 0) goto CloseRWAndReturnENXIO; fprint(w, "%s", prompt); - write(ctl, "rawon", 5); + jehanne_write(ctl, "rawon", 5); p = buf; - while(p < buf+sizeof(buf)-1 && read(r, p, 1) == 1){ + while(p < buf+sizeof(buf)-1 && jehanne_read(r, p, 1) == 1){ if(*p == '\n') break; if(*p == ('u' & 037)) @@ -170,14 +170,14 @@ POSIX_getpass(int *errnop, const char *prompt) ++p; } *p = '\0'; - write(ctl, "rawoff", 6); + jehanne_write(ctl, "rawoff", 6); return buf; CloseRWAndReturnENXIO: - close(w); + sys_close(w); CloseRAndReturnENXIO: - close(r); + sys_close(r); ReturnENXIO: *errnop = __libposix_get_errno(PosixENXIO); return nil; diff --git a/sys/src/lib/posix/posixly.c b/sys/src/lib/posix/posixly.c index af2b5e8..e6180db 100644 --- a/sys/src/lib/posix/posixly.c +++ b/sys/src/lib/posix/posixly.c @@ -140,7 +140,7 @@ debug(const char *fmt, ...) debug_prefix = smprint("posix.%s.%d[%d]: ", user, sid, fspid); debug_prefix_len = strlen(debug_prefix); } - write(debugging, debug_prefix, debug_prefix_len); + jehanne_write(debugging, debug_prefix, debug_prefix_len); va_start(arg, fmt); vfprint(debugging, fmt, arg); va_end(arg); @@ -196,7 +196,7 @@ proc_noteid(int pid) long n; char buf[32]; sprint(buf, "/proc/%d/noteid", pid); - n = remove(buf); + n = sys_remove(buf); DEBUG("proc_noteid(%d) = %lld\n", pid, n); if(n == -1) return -1; @@ -212,12 +212,12 @@ proc_set_noteid(int pid, int noteid) assert(noteid != 0); sprint(buf, "/proc/%d/noteid", pid); - f = open(buf, OWRITE); + f = sys_open(buf, OWRITE); if(f < 0) return 0; n = sprint(buf, "%d", noteid); - n = write(f, buf, n); - close(f); + n = jehanne_write(f, buf, n); + sys_close(f); if(n < 0) return 0; return 1; @@ -228,7 +228,7 @@ proc_ppid(int pid) long n; char buf[32]; sprint(buf, "/proc/%d/ppid", pid); - n = remove(buf); + n = sys_remove(buf); DEBUG("proc_ppid(%d) = %lld\n", pid, n); if(n == -1) return -1; @@ -523,13 +523,13 @@ process_free_nannies(Process *parent, Process **list) *list = p->next; DEBUG("process_free_nannies(%d): killing pid %d\n", parent->pid, p->pid); snprint(buf, sizeof(buf), "/proc/%d/ctl", p->pid); - fd = open(buf, OWRITE); + fd = sys_open(buf, OWRITE); if(fd < 0){ DEBUG("process_free_nannies(%d): cannot open '%s': %r\n", parent, buf); } else { - write(fd, "kill", 5); + jehanne_write(fd, "kill", 5); } - close(fd); + sys_close(fd); if(p->child) p->child->parent = nil; free(p); @@ -819,16 +819,16 @@ static struct Qtab { 0, "control", - 0222, /* write to send signals */ + 0222, /* jehanne_write to send signals */ 0, 0, - "signals", /* read/write to control signal management */ + "signals", /* read/jehanne_write to control signal management */ 0666, 0, 0, - "nanny", /* write to send SIGCHLD */ + "nanny", /* jehanne_write to send SIGCHLD */ 0222, 0, 0, @@ -847,7 +847,7 @@ static struct Qtab { static Fid *fids; static Fid **ftail; -static Fid *external; /* attach fid of the mount() */ +static Fid *external; /* attach fid of the sys_mount() */ static Fid *control_fid; @@ -1204,7 +1204,7 @@ fs_read(Fcall *req, Fcall *rep) Waiter *waiter; if(req->count < 0) - return fs_error(rep, "bad read/write count"); + return fs_error(rep, "bad read/jehanne_write count"); f = fid_find(req->fid); if(f == nil){ @@ -1261,7 +1261,7 @@ fs_read(Fcall *req, Fcall *rep) static int fs_write(Fcall *req, Fcall *rep) { - /* write are always sincronous */ + /* jehanne_write are always sincronous */ LongConverter offset; union { @@ -1276,7 +1276,7 @@ fs_write(Fcall *req, Fcall *rep) Signal *s; if(req->count < 0) - return fs_error(rep, "bad read/write count"); + return fs_error(rep, "bad read/jehanne_write count"); f = fid_find(req->fid); if(f == nil) @@ -1655,8 +1655,8 @@ sendmessage(int fd, Fcall *rep) DEBUG("sendmessage: convS2M error\n"); return 0; } - if(write(fd, repdata, n) != n) { - DEBUG("sendmessage: write\n"); + if(jehanne_write(fd, repdata, n) != n) { + DEBUG("sendmessage: jehanne_write\n"); return 0; } DEBUG("fs_serve: ->%F\n", rep); @@ -1752,8 +1752,8 @@ FSLoopExit: sysfatal("fs_serve: sendmessage"); } - close(connection); - DEBUG("close(%d)\n", connection); + sys_close(connection); + DEBUG("sys_close(%d)\n", connection); DEBUG("shut down\n"); } @@ -1765,27 +1765,27 @@ tty_from_cons(int fd, int mode) int tmp; char buf[256]; - if(fd2path(fd, buf, sizeof(buf)) < 0) + if(sys_fd2path(fd, buf, sizeof(buf)) < 0) sysfatal("fd2path: %d", fd); tmp = strlen(buf); if(tmp < 9 || strcmp(buf+tmp-9, "/dev/cons") != 0) return; - tmp = open("/dev/tty", mode); + tmp = sys_open("/dev/tty", mode); dup(tmp, fd); - close(tmp); + sys_close(tmp); } static void unmount_dev(void) { char name[256]; snprint(name, sizeof(name), "#s/posixly.%s.%d", user, sid); - unmount(name, "/dev"); - remove(name); + sys_unmount(name, "/dev"); + sys_remove(name); } static void post_mount(int fd) { - /* we want the mount point to be unmount() on session detach, + /* we want the mount point to be sys_unmount() on session detach, * so it must have a deterministic name: "#s/posixly.glenda.123" * is way better than "#|/data". */ @@ -1793,25 +1793,25 @@ post_mount(int fd) char name[256], buf[32]; snprint(name, sizeof(name), "#s/posixly.%s.%d", user, sid); - f = create(name, OWRITE, 0600); + f = sys_create(name, OWRITE, 0600); if(f < 0) - sysfatal("create(%s)", name); + sysfatal("sys_create(%s)", name); sprint(buf, "%d", fd); - if(write(f, buf, strlen(buf)) != strlen(buf)) - sysfatal("write(%s)", name); - close(f); - close(fd); + if(jehanne_write(f, buf, strlen(buf)) != strlen(buf)) + sysfatal("jehanne_write(%s)", name); + sys_close(f); + sys_close(fd); - f = open(name, ORDWR); + f = sys_open(name, ORDWR); if(f < 0) - sysfatal("open(%s)", name); - if(mount(f, -1, "/dev", MBEFORE, "", '9') == -1) + sysfatal("sys_open(%s)", name); + if(sys_mount(f, -1, "/dev", MBEFORE, "", '9') == -1) sysfatal("mount: %r"); } static void open_control_fd(void) { - while((*__libposix_devsignal = open("/dev/posix/control", OWRITE)) < 0) + while((*__libposix_devsignal = sys_open("/dev/posix/control", OWRITE)) < 0) sleep(250); } void @@ -1839,34 +1839,34 @@ main(int argc, char *argv[]) if(sid == 0 && argc < 1) usage(); - rfork(RFFDG); + sys_rfork(RFFDG); controlpid = getpid(); __libposix_pid = &controlpid; user = strdup(getuser()); if(sid == 0){ - rfork(RFREND|RFNAMEG); + sys_rfork(RFREND|RFNAMEG); if(access("/dev/tty", AWRITE|AREAD) == 0){ /* replace /dev/cons with /dev/tty */ tty_from_cons(0, OREAD); tty_from_cons(1, OWRITE); tty_from_cons(2, ORDWR); - if((i = open("/dev/consctl", OWRITE)) > 0){ - write(i, "winchon", 7); - close(i); + if((i = sys_open("/dev/consctl", OWRITE)) > 0){ + jehanne_write(i, "winchon", 7); + sys_close(i); } } /* fork session leader */ - switch(sid = rfork(RFPROC|RFNOTEG|RFFDG)){ + switch(sid = sys_rfork(RFPROC|RFNOTEG|RFFDG)){ case -1: sysfatal("rfork"); case 0: - while(rendezvous(main, (void*)0x1) == ((void*)~0)) + while(sys_rendezvous(main, (void*)0x1) == ((void*)~0)) sleep(250); - close(debugging); + sys_close(debugging); jehanne_pexec(strdup(argv[0]), argv); exits("exec"); default: @@ -1876,14 +1876,14 @@ main(int argc, char *argv[]) pipe(p); - switch(fspid = rfork(RFPROC|RFMEM|RFCENVG|RFNOTEG|RFNAMEG|RFNOMNT|RFFDG|RFREND)){ + switch(fspid = sys_rfork(RFPROC|RFMEM|RFCENVG|RFNOTEG|RFNAMEG|RFNOMNT|RFFDG|RFREND)){ case -1: sysfatal("rfork"); case 0: - close(0); - close(1); - close(2); - close(p[0]); + sys_close(0); + sys_close(1); + sys_close(2); + sys_close(p[0]); fspid = getpid(); fs_serve(p[1]); exits(nil); @@ -1891,16 +1891,16 @@ main(int argc, char *argv[]) break; } - close(0); - close(1); - close(2); - close(p[1]); + sys_close(0); + sys_close(1); + sys_close(2); + sys_close(p[1]); post_mount(p[0]); __libposix_devsignal = &devsignal; open_control_fd(); - rfork(RFCNAMEG); + sys_rfork(RFCNAMEG); if(!atnotify(note_forward, 1)){ fprint(2, "atnotify: %r\n"); @@ -1909,7 +1909,7 @@ main(int argc, char *argv[]) if(!sidprovided){ /* let the session leader start */ - while(rendezvous(main, (void*)0x2) == ((void*)~0)) + while(sys_rendezvous(main, (void*)0x2) == ((void*)~0)) sleep(250); /* if we created the session leader, we will wait for it */ leaderrun = 1; @@ -1934,7 +1934,7 @@ main(int argc, char *argv[]) DEBUG("session leader exited\n"); sighup.si_signo = PosixSIGHUP; __libposix_sighelper_signal(PHSignalForeground, 0, &sighup); - close(devsignal); + sys_close(devsignal); unmount_dev(); leaderrun = 0; } diff --git a/sys/src/lib/posix/processes.c b/sys/src/lib/posix/processes.c index f49084e..2ae2879 100644 --- a/sys/src/lib/posix/processes.c +++ b/sys/src/lib/posix/processes.c @@ -179,9 +179,9 @@ POSIX_execve(int *errnop, const char *name, char * const*argv, char * const*env) // see http://pubs.opengroup.org/onlinepubs/9699919799/functions/exec.html if(env == environ){ /* just get a copy of the current environment */ - rfork(RFENVG); + sys_rfork(RFENVG); } else { - rfork(RFCENVG); + sys_rfork(RFCENVG); __libposix_setup_exec_environment(env); } @@ -189,7 +189,7 @@ POSIX_execve(int *errnop, const char *name, char * const*argv, char * const*env) __libposix_close_on_exec(); __libposix_sighelper_cmd(PHCallingExec, 0); - exec(name, argv); + sys_exec(name, argv); *errnop = __libposix_translate_errstr((uintptr_t)POSIX_execve); return -1; } @@ -233,7 +233,7 @@ __libposix_wait(int *errnop, int *status, long ms) OnIgnoredSignalInterrupt: if(ms) - wakeup = awake(ms); + wakeup = sys_awake(ms); w = wait(); if(w == nil){ rerrstr(err, ERRMAX); @@ -349,7 +349,7 @@ POSIX_waitpid(int *errnop, int reqpid, int *status, int options) WaitAgain: OnIgnoredSignalInterrupt: if(nohang) - nohang = awake(100); + nohang = sys_awake(100); w = wait(); if(w == nil){ rerrstr(err, ERRMAX); diff --git a/sys/src/lib/posix/sigchlds.c b/sys/src/lib/posix/sigchlds.c index 37cb7d3..5469341 100644 --- a/sys/src/lib/posix/sigchlds.c +++ b/sys/src/lib/posix/sigchlds.c @@ -33,9 +33,9 @@ open_sighelper_nanny(void) { int mypid; if(*__libposix_devsignal >= 0) - close(*__libposix_devsignal); + sys_close(*__libposix_devsignal); mypid = *__libposix_pid; - *__libposix_devsignal = create("/dev/posix/nanny", OWRITE|OCEXEC, mypid); + *__libposix_devsignal = sys_create("/dev/posix/nanny", OWRITE|OCEXEC, mypid); if(*__libposix_devsignal < 0) sysfatal("cannot create /dev/posix/nanny: %r"); } @@ -45,7 +45,7 @@ exit_on_SA_NOCLDWAIT(char *msg){ /* we share the father's memory, we can inspect its configuration */ if(__libposix_signals[PosixSIGCHLD-1].sa_nochildwait){ /* the parent does not care about us*/ - rfork(RFNOWAIT); + sys_rfork(RFNOWAIT); exits(msg); } } @@ -60,15 +60,15 @@ forward_wait_msg(int father, int child) mypid = *__libposix_pid; name = smprint("signal proxy %d <> %d", father, child); snprint(buf, sizeof(buf), "/proc/%d/args", mypid); - n = open(buf, OWRITE); - write(n, name, strlen(name)+1); - close(n); + n = sys_open(buf, OWRITE); + jehanne_write(n, name, strlen(name)+1); + sys_close(n); - rfork(RFCNAMEG|RFCENVG|RFNOMNT); + sys_rfork(RFCNAMEG|RFCENVG|RFNOMNT); n = 0; WaitInterrupted: - n = await(buf, sizeof buf-1); + n = sys_await(buf, sizeof buf-1); if(n < 0){ rerrstr(err, ERRMAX); if(strstr(err, "no living children") == nil) @@ -133,7 +133,7 @@ fork_with_sigchld(int *errnop) */ father = getpid(); - switch(proxy = rfork(RFPROC|RFMEM|RFFDG)){ + switch(proxy = sys_rfork(RFPROC|RFMEM|RFFDG)){ case -1: return -1; case 0: @@ -143,28 +143,28 @@ fork_with_sigchld(int *errnop) */ *__libposix_pid = getpid(); open_sighelper_nanny(); - switch(child = rfork(RFPROC|RFFDG)){ + switch(child = sys_rfork(RFPROC|RFFDG)){ case -1: rend = *__libposix_pid; - while(rendezvous((void*)rend, "e") == (void*)-1) + while(sys_rendezvous((void*)rend, "e") == (void*)-1) sleep(100); - rfork(RFNOWAIT); + sys_rfork(RFNOWAIT); exits("rfork (child)"); case 0: /* Beloved child here */ __libposix_setup_new_process(); rend = *__libposix_pid; - while(rendezvous((void*)rend, "d") == (void*)-1) + while(sys_rendezvous((void*)rend, "d") == (void*)-1) sleep(100); - rfork(RFREND); + sys_rfork(RFREND); return 0; default: rend = child; - while((buf = rendezvous((void*)rend, "")) == (void*)-1) + while((buf = sys_rendezvous((void*)rend, "")) == (void*)-1) sleep(100); rend = *__libposix_pid; - while(rendezvous((void*)rend, "d") == (void*)-1) + while(sys_rendezvous((void*)rend, "d") == (void*)-1) sleep(100); /* we share the memory of the parent but we do @@ -176,7 +176,7 @@ fork_with_sigchld(int *errnop) } default: rend = proxy; - while((buf = rendezvous((void*)rend, "")) == (void*)-1) + while((buf = sys_rendezvous((void*)rend, "")) == (void*)-1) sleep(100); if(buf[0] == 'e') return -1; diff --git a/sys/src/lib/posix/signals.c b/sys/src/lib/posix/signals.c index ee20c02..fef4468 100644 --- a/sys/src/lib/posix/signals.c +++ b/sys/src/lib/posix/signals.c @@ -99,7 +99,7 @@ * * TIMERS * ------ - * The functions alarm() and setitimer() generate SIGALRM, SIGPROF + * The functions sys_alarm() and setitimer() generate SIGALRM, SIGPROF * or SIGVTALRM for the current process. We want timers to be able to * expire in a signal handler (interrupting a blocking syscall) but * without giving up the simplicity of notes. @@ -190,19 +190,19 @@ __libposix_send_control_msg(int pid, char *msg) n = snprint(buf, sizeof(buf), "/proc/%d/ctl", pid); if(n < 0) goto ErrorBeforeOpen; - fd = open(buf, OWRITE); + fd = sys_open(buf, OWRITE); if(fd < 0) goto ErrorBeforeOpen; n = snprint(buf, sizeof(buf), "%s", msg); if(n < 0) goto ErrorAfterOpen; - if(write(fd, buf, n) < n) + if(jehanne_write(fd, buf, n) < n) goto ErrorAfterOpen; - close(fd); + sys_close(fd); return 1; ErrorAfterOpen: - close(fd); + sys_close(fd); ErrorBeforeOpen: return 0; } @@ -362,7 +362,7 @@ __libposix_sighelper_signal(PosixHelperCommand command, int posix_process_pid, P memcpy(buf, siginfo, sizeof(buf)); - return pwrite(*__libposix_devsignal, buf, sizeof(buf), offset.raw); + return sys_pwrite(*__libposix_devsignal, buf, sizeof(buf), offset.raw); } long @@ -382,7 +382,7 @@ __libposix_sighelper_set(PosixHelperCommand command, PosixSignalMask signal_set) buffer.mask = signal_set; - return pwrite(*__libposix_devsignal, buffer.raw, sizeof(buffer.raw), offset.raw); + return sys_pwrite(*__libposix_devsignal, buffer.raw, sizeof(buffer.raw), offset.raw); } PosixError diff --git a/sys/src/lib/posix/sigsets.c b/sys/src/lib/posix/sigsets.c index 5bb0dc9..4d4ce14 100644 --- a/sys/src/lib/posix/sigsets.c +++ b/sys/src/lib/posix/sigsets.c @@ -148,7 +148,7 @@ POSIX_sigpending(int *errnop, PosixSignalMask *set) long __libposix_sighelper_wait(PosixSignalMask set, PosixSignalInfo *siginfo) { - return pread(*__libposix_devsignal, siginfo, sizeof(PosixSignalInfo), set); + return sys_pread(*__libposix_devsignal, siginfo, sizeof(PosixSignalInfo), set); } int @@ -204,7 +204,7 @@ LookupPendingSignals: } if(ms > 0) - wkp = awake(ms); + wkp = sys_awake(ms); r = __libposix_sighelper_wait(*set, info); if(r < 0){ if(ms > 0 && awakened(wkp)){ diff --git a/sys/src/lib/posix/sigsuspend.c b/sys/src/lib/posix/sigsuspend.c index f4d74e8..c053970 100644 --- a/sys/src/lib/posix/sigsuspend.c +++ b/sys/src/lib/posix/sigsuspend.c @@ -35,7 +35,7 @@ POSIX_sigsuspend(int *errnop, const PosixSignalMask *mask) return -1; do - rendezvous((void*)~0, (void*)1); + sys_rendezvous((void*)~0, (void*)1); while(__libposix_restart_syscall()); if(POSIX_sigprocmask(errnop, PosixSPMSetMask, &old, nil) != 0) diff --git a/sys/src/lib/posix/timers.c b/sys/src/lib/posix/timers.c index 79d2cc1..ece3542 100644 --- a/sys/src/lib/posix/timers.c +++ b/sys/src/lib/posix/timers.c @@ -26,7 +26,7 @@ static PosixTimezoneReader __libposix_timezone_reader; unsigned int POSIX_alarm(int *errnop, unsigned int seconds) { - long r = alarm(seconds * 1000); + long r = sys_alarm(seconds * 1000); return r/1000; } diff --git a/sys/src/lib/regexp/regerror.c b/sys/src/lib/regexp/regerror.c index 08dbffe..42cbaa2 100644 --- a/sys/src/lib/regexp/regerror.c +++ b/sys/src/lib/regexp/regerror.c @@ -19,6 +19,6 @@ regerror(char *s) strcpy(buf, "regerror: "); strcat(buf, s); strcat(buf, "\n"); - write(2, buf, strlen(buf)); + jehanne_write(2, buf, strlen(buf)); exits("regerr"); } diff --git a/sys/src/lib/sec/port/readcert.c b/sys/src/lib/sec/port/readcert.c index 0324478..00d6b3e 100644 --- a/sys/src/lib/sec/port/readcert.c +++ b/sys/src/lib/sec/port/readcert.c @@ -8,21 +8,21 @@ readfile(char *name) char *s; Dir *d; - fd = open(name, OREAD); + fd = sys_open(name, OREAD); if(fd < 0) return nil; if((d = jehanne_dirfstat(fd)) == nil) { - close(fd); + sys_close(fd); return nil; } s = jehanne_malloc(d->length + 1); if(s == nil || jehanne_readn(fd, s, d->length) != d->length){ jehanne_free(s); jehanne_free(d); - close(fd); + sys_close(fd); return nil; } - close(fd); + sys_close(fd); s[d->length] = '\0'; jehanne_free(d); return s; diff --git a/sys/src/lib/sec/port/rsatest.c b/sys/src/lib/sec/port/rsatest.c index eecaf4a..e48bbf0 100644 --- a/sys/src/lib/sec/port/rsatest.c +++ b/sys/src/lib/sec/port/rsatest.c @@ -50,7 +50,7 @@ main(void) rsadecrypt(rsa, enc, clr); jehanne_print("clr %B\n", clr); n = mptole(clr, buf, sizeof(buf), nil); - write(1, buf, n); + jehanne_write(1, buf, n); jehanne_print("> "); } } diff --git a/sys/src/lib/sec/port/tlshand.c b/sys/src/lib/sec/port/tlshand.c index 6d74131..3c9e68c 100644 --- a/sys/src/lib/sec/port/tlshand.c +++ b/sys/src/lib/sec/port/tlshand.c @@ -473,20 +473,20 @@ tlsServer(int fd, TLSconn *conn) if(conn == nil) return -1; - ctl = open("#a/tls/clone", ORDWR); + ctl = sys_open("#a/tls/clone", ORDWR); if(ctl < 0) return -1; - n = read(ctl, buf, sizeof(buf)-1); + n = jehanne_read(ctl, buf, sizeof(buf)-1); if(n < 0){ - close(ctl); + sys_close(ctl); return -1; } buf[n] = 0; jehanne_snprint(conn->dir, sizeof(conn->dir), "#a/tls/%s", buf); jehanne_snprint(dname, sizeof(dname), "#a/tls/%s/hand", buf); - hand = open(dname, ORDWR); + hand = sys_open(dname, ORDWR); if(hand < 0){ - close(ctl); + sys_close(ctl); return -1; } data = -1; @@ -497,10 +497,10 @@ tlsServer(int fd, TLSconn *conn) conn->trace, conn->chain); if(tls != nil){ jehanne_snprint(dname, sizeof(dname), "#a/tls/%s/data", buf); - data = open(dname, ORDWR); + data = sys_open(dname, ORDWR); } - close(hand); - close(ctl); + sys_close(hand); + sys_close(ctl); if(data < 0){ tlsConnectionFree(tls); return -1; @@ -520,7 +520,7 @@ tlsServer(int fd, TLSconn *conn) tls->sec->crandom, RandomSize, tls->sec->srandom, RandomSize); tlsConnectionFree(tls); - close(fd); + sys_close(fd); return data; } @@ -606,27 +606,27 @@ tlsClient(int fd, TLSconn *conn) if(conn == nil) return -1; - ctl = open("#a/tls/clone", ORDWR); + ctl = sys_open("#a/tls/clone", ORDWR); if(ctl < 0) return -1; - n = read(ctl, buf, sizeof(buf)-1); + n = jehanne_read(ctl, buf, sizeof(buf)-1); if(n < 0){ - close(ctl); + sys_close(ctl); return -1; } buf[n] = 0; jehanne_snprint(conn->dir, sizeof(conn->dir), "#a/tls/%s", buf); jehanne_snprint(dname, sizeof(dname), "#a/tls/%s/hand", buf); - hand = open(dname, ORDWR); + hand = sys_open(dname, ORDWR); if(hand < 0){ - close(ctl); + sys_close(ctl); return -1; } jehanne_snprint(dname, sizeof(dname), "#a/tls/%s/data", buf); - data = open(dname, ORDWR); + data = sys_open(dname, ORDWR); if(data < 0){ - close(hand); - close(ctl); + sys_close(hand); + sys_close(ctl); return -1; } jehanne_fprint(ctl, "fd %d 0x%x", fd, ProtocolVersion); @@ -636,10 +636,10 @@ tlsClient(int fd, TLSconn *conn) conn->pskID, conn->psk, conn->psklen, ext, n, conn->trace); jehanne_free(ext); - close(hand); - close(ctl); + sys_close(hand); + sys_close(ctl); if(tls == nil){ - close(data); + sys_close(data); return -1; } jehanne_free(conn->cert); @@ -663,7 +663,7 @@ tlsClient(int fd, TLSconn *conn) tls->sec->crandom, RandomSize, tls->sec->srandom, RandomSize); tlsConnectionFree(tls); - close(fd); + sys_close(fd); return data; } @@ -1432,7 +1432,7 @@ msgSend(TlsConnection *c, Msg *m, int act) c->sendp = p; if(act == AFlush){ c->sendp = c->sendbuf; - if(write(c->hand, c->sendbuf, p - c->sendbuf) < 0){ + if(jehanne_write(c->hand, c->sendbuf, p - c->sendbuf) < 0){ jehanne_fprint(2, "write error: %r\n"); goto Err; } @@ -1458,7 +1458,7 @@ tlsReadN(TlsConnection *c, int n) c->ep = &c->recvbuf[nn]; } for(; nn < n; nn += nr) { - nr = read(c->hand, &c->rp[nn], n - nn); + nr = jehanne_read(c->hand, &c->rp[nn], n - nn); if(nr <= 0) return nil; c->ep += nr; @@ -2043,7 +2043,7 @@ tlsError(TlsConnection *c, int err, char *fmt, ...) if(c->erred) jehanne_fprint(2, "double error: %r, %s", msg); else - errstr(msg, sizeof(msg)); + sys_errstr(msg, sizeof(msg)); c->erred = 1; jehanne_fprint(c->ctl, "alert %d", err); } @@ -2224,13 +2224,13 @@ initCiphers(void) jehanne_unlock(&ciphLock); return nciphers; } - j = open("#a/tls/encalgs", OREAD); + j = sys_open("#a/tls/encalgs", OREAD); if(j < 0){ jehanne_werrstr("can't open #a/tls/encalgs: %r"); goto out; } - n = read(j, s, MaxAlgF-1); - close(j); + n = jehanne_read(j, s, MaxAlgF-1); + sys_close(j); if(n <= 0){ jehanne_werrstr("nothing in #a/tls/encalgs: %r"); goto out; @@ -2248,13 +2248,13 @@ initCiphers(void) cipherAlgs[i].ok = ok; } - j = open("#a/tls/hashalgs", OREAD); + j = sys_open("#a/tls/hashalgs", OREAD); if(j < 0){ jehanne_werrstr("can't open #a/tls/hashalgs: %r"); goto out; } - n = read(j, s, MaxAlgF-1); - close(j); + n = jehanne_read(j, s, MaxAlgF-1); + sys_close(j); if(n <= 0){ jehanne_werrstr("nothing in #a/tls/hashalgs: %r"); goto out; @@ -2307,10 +2307,10 @@ factotum_rsa_open(RSApub *rsapub) AuthRpc *rpc; // start talking to factotum - if((afd = open("/mnt/factotum/rpc", ORDWR)) < 0) + if((afd = sys_open("/mnt/factotum/rpc", ORDWR)) < 0) return nil; if((rpc = auth_allocrpc(afd)) == nil){ - close(afd); + sys_close(afd); return nil; } s = "proto=rsa service=tls role=client"; @@ -2352,7 +2352,7 @@ factotum_rsa_close(AuthRpc *rpc) { if(rpc == nil) return; - close(rpc->afd); + sys_close(rpc->afd); auth_freerpc(rpc); } diff --git a/sys/src/lib/stdio/_IO_getc.c b/sys/src/lib/stdio/_IO_getc.c index 79e0e75..1646d54 100644 --- a/sys/src/lib/stdio/_IO_getc.c +++ b/sys/src/lib/stdio/_IO_getc.c @@ -21,7 +21,7 @@ int _IO_getc(FILE *f){ case RDWR: case RD: if(f->flags&STRING) return EOF; - cnt=read(f->fd, f->buf, f->buf==f->unbuf?1:f->bufl); + cnt=jehanne_read(f->fd, f->buf, f->buf==f->unbuf?1:f->bufl); switch(cnt){ case -1: f->state=ERR; return EOF; case 0: f->state=END; return EOF; diff --git a/sys/src/lib/stdio/_IO_putc.c b/sys/src/lib/stdio/_IO_putc.c index f2d7333..73418ba 100644 --- a/sys/src/lib/stdio/_IO_putc.c +++ b/sys/src/lib/stdio/_IO_putc.c @@ -65,8 +65,8 @@ int _IO_putc(int c, FILE *f){ else if(f->flags&LINEBUF){ if(f->lp==f->rp){ cnt=f->lp-f->buf; - if(f->flags&APPEND) seek(f->fd, 0L, 2); - if(cnt!=0 && write(f->fd, f->buf, cnt)!=cnt){ + if(f->flags&APPEND) sys_seek(f->fd, 0L, 2); + if(cnt!=0 && jehanne_write(f->fd, f->buf, cnt)!=cnt){ f->state=ERR; return EOF; } @@ -75,8 +75,8 @@ int _IO_putc(int c, FILE *f){ *f->lp++=c; if(c=='\n'){ cnt=f->lp-f->buf; - if(f->flags&APPEND) seek(f->fd, 0L, 2); - if(cnt!=0 && write(f->fd, f->buf, cnt)!=cnt){ + if(f->flags&APPEND) sys_seek(f->fd, 0L, 2); + if(cnt!=0 && jehanne_write(f->fd, f->buf, cnt)!=cnt){ f->state=ERR; return EOF; } @@ -85,8 +85,8 @@ int _IO_putc(int c, FILE *f){ } else if(f->buf==f->unbuf){ f->unbuf[0]=c; - if(f->flags&APPEND) seek(f->fd, 0L, 2); - if(write(f->fd, f->buf, 1)!=1){ + if(f->flags&APPEND) sys_seek(f->fd, 0L, 2); + if(jehanne_write(f->fd, f->buf, 1)!=1){ f->state=ERR; return EOF; } @@ -94,8 +94,8 @@ int _IO_putc(int c, FILE *f){ else{ if(f->wp==f->rp){ cnt=f->wp-f->buf; - if(f->flags&APPEND) seek(f->fd, 0L, 2); - if(cnt!=0 && write(f->fd, f->buf, cnt)!=cnt){ + if(f->flags&APPEND) sys_seek(f->fd, 0L, 2); + if(cnt!=0 && jehanne_write(f->fd, f->buf, cnt)!=cnt){ f->state=ERR; return EOF; } diff --git a/sys/src/lib/stdio/dtoa.c b/sys/src/lib/stdio/dtoa.c index d379a8c..f593d0d 100644 --- a/sys/src/lib/stdio/dtoa.c +++ b/sys/src/lib/stdio/dtoa.c @@ -534,12 +534,12 @@ tens[] = { static const double bigtens[] = { 1e16, 1e32, 1e64, 1e128, 1e256 }; - +/* static const double tinytens[] = { 1e-16, 1e-32, 1e-64, 1e-128, 9007199254740992.e-256 }; - +*/ /* The factor of 2^53 in tinytens[4] helps us avoid setting the underflow */ /* flag unnecessarily. It leads to a song and dance at the end of strtod. */ #define Scale_Bit 0x10 diff --git a/sys/src/lib/stdio/fclose.c b/sys/src/lib/stdio/fclose.c index 7bda236..ec1fe81 100644 --- a/sys/src/lib/stdio/fclose.c +++ b/sys/src/lib/stdio/fclose.c @@ -16,7 +16,7 @@ int fclose(FILE *f){ if(f->state==CLOSED) return EOF; if(fflush(f)==EOF) error=EOF; if(f->flags&BALLOC) free(f->buf); - if(!(f->flags&STRING) && close(f->fd)<0) error=EOF; + if(!(f->flags&STRING) && sys_close(f->fd)<0) error=EOF; f->state=CLOSED; f->flags=0; return error; diff --git a/sys/src/lib/stdio/fdopen.c b/sys/src/lib/stdio/fdopen.c index 0460459..0147ed5 100644 --- a/sys/src/lib/stdio/fdopen.c +++ b/sys/src/lib/stdio/fdopen.c @@ -33,7 +33,7 @@ FILE *fdopen(const int fd, const char *mode){ } f->fd=fd; if(mode[0]=='a') - seek(f->fd, 0L, 2); + sys_seek(f->fd, 0L, 2); if(f->fd==-1) return NULL; f->flags=0; f->state=OPEN; diff --git a/sys/src/lib/stdio/fflush.c b/sys/src/lib/stdio/fflush.c index e5a0c2b..e221e79 100644 --- a/sys/src/lib/stdio/fflush.c +++ b/sys/src/lib/stdio/fflush.c @@ -40,7 +40,7 @@ int _fflush(FILE *f){ return EOF; case WR: cnt=(f->flags&LINEBUF?f->lp:f->wp)-f->buf; - if(cnt && write(f->fd, f->buf, cnt)!=cnt){ + if(cnt && jehanne_write(f->fd, f->buf, cnt)!=cnt){ f->state=ERR; return EOF; } diff --git a/sys/src/lib/stdio/fread.c b/sys/src/lib/stdio/fread.c index f5ba28d..a82c7fd 100644 --- a/sys/src/lib/stdio/fread.c +++ b/sys/src/lib/stdio/fread.c @@ -29,7 +29,7 @@ int32_t fread(void *p, int32_t recl, int32_t nrec, FILE *f){ f->rp+=d; }else{ if(n >= BIGN && f->state==RD && !(f->flags&STRING) && f->buf!=f->unbuf){ - d=read(f->fd, s, n); + d=jehanne_read(f->fd, s, n); if(d<=0){ f->state=(d==0)?END:ERR; goto ret; diff --git a/sys/src/lib/stdio/freopen.c b/sys/src/lib/stdio/freopen.c index ae938f4..0da2e63 100644 --- a/sys/src/lib/stdio/freopen.c +++ b/sys/src/lib/stdio/freopen.c @@ -39,17 +39,17 @@ FILE *freopen(const char *name, const char *mode, FILE *f){ default: return NULL; case 'r': - f->fd=open(name, (*mode == '+'? ORDWR: OREAD)); + f->fd=sys_open(name, (*mode == '+'? ORDWR: OREAD)); break; case 'w': f->fd=ocreate(name, (*mode == '+'? ORDWR: OWRITE), 0666); break; case 'a': m = (*mode == '+'? ORDWR: OWRITE); - f->fd=open(name, m); + f->fd=sys_open(name, m); if(f->fd<0) f->fd=ocreate(name, m, 0666); - seek(f->fd, 0LL, 2); + sys_seek(f->fd, 0LL, 2); break; } diff --git a/sys/src/lib/stdio/fseek.c b/sys/src/lib/stdio/fseek.c index 5f5fbaf..d46e085 100644 --- a/sys/src/lib/stdio/fseek.c +++ b/sys/src/lib/stdio/fseek.c @@ -24,7 +24,7 @@ int fseek(FILE *f, int32_t offs, int type){ offs-=f->wp-f->rp; break; } - if(f->flags&STRING || seek(f->fd, offs, type)==-1) return -1; + if(f->flags&STRING || sys_seek(f->fd, offs, type)==-1) return -1; if(f->state==RD) f->rp=f->wp=f->buf; if(f->state!=OPEN) f->state=RDWR; diff --git a/sys/src/lib/stdio/fseeko.c b/sys/src/lib/stdio/fseeko.c index a407547..74df347 100644 --- a/sys/src/lib/stdio/fseeko.c +++ b/sys/src/lib/stdio/fseeko.c @@ -24,7 +24,7 @@ int fseeko(FILE *f, long long offs, int type){ offs-=f->wp-f->rp; break; } - if(f->flags&STRING || seek(f->fd, offs, type)==-1) return -1; + if(f->flags&STRING || sys_seek(f->fd, offs, type)==-1) return -1; if(f->state==RD) f->rp=f->wp=f->buf; if(f->state!=OPEN) f->state=RDWR; diff --git a/sys/src/lib/stdio/ftell.c b/sys/src/lib/stdio/ftell.c index e7edf3a..adaf6ca 100644 --- a/sys/src/lib/stdio/ftell.c +++ b/sys/src/lib/stdio/ftell.c @@ -12,7 +12,7 @@ */ #include "iolib.h" int32_t ftell(FILE *f){ - int32_t seekp=seek(f->fd, 0L, 1); + int32_t seekp=sys_seek(f->fd, 0L, 1); if(seekp<0) return -1; /* enter error state? */ switch(f->state){ default: diff --git a/sys/src/lib/stdio/ftello.c b/sys/src/lib/stdio/ftello.c index 8e1f1ce..3962f0e 100644 --- a/sys/src/lib/stdio/ftello.c +++ b/sys/src/lib/stdio/ftello.c @@ -12,7 +12,7 @@ */ #include "iolib.h" long long ftello(FILE *f){ - long long seekp=seek(f->fd, 0L, 1); + long long seekp=sys_seek(f->fd, 0L, 1); if(seekp<0) return -1; /* enter error state? */ switch(f->state){ default: diff --git a/sys/src/lib/stdio/fwrite.c b/sys/src/lib/stdio/fwrite.c index 2ffd28c..fcdf6bd 100644 --- a/sys/src/lib/stdio/fwrite.c +++ b/sys/src/lib/stdio/fwrite.c @@ -32,16 +32,16 @@ int32_t fwrite(const void *p, int32_t recl, int32_t nrec, FILE *f){ d=f->wp-f->buf; if(d>0){ if(f->flags&APPEND) - seek(f->fd, 0L, 2); - if(write(f->fd, f->buf, d)!=d){ + sys_seek(f->fd, 0L, 2); + if(jehanne_write(f->fd, f->buf, d)!=d){ f->state=ERR; goto ret; } f->wp=f->rp=f->buf; } if(f->flags&APPEND) - seek(f->fd, 0L, 2); - d=write(f->fd, s, n); + sys_seek(f->fd, 0L, 2); + d=jehanne_write(f->fd, s, n); if(d<=0){ f->state=ERR; goto ret; diff --git a/sys/src/lib/stdio/setvbuf.c b/sys/src/lib/stdio/setvbuf.c index 6285285..a6cc694 100644 --- a/sys/src/lib/stdio/setvbuf.c +++ b/sys/src/lib/stdio/setvbuf.c @@ -45,7 +45,7 @@ isatty(int fd) { char buf[64]; - if(fd2path(fd, buf, sizeof buf) != 0) + if(sys_fd2path(fd, buf, sizeof buf) != 0) return 0; /* might be /mnt/term/dev/cons */ diff --git a/sys/src/lib/stdio/tmpfile.c b/sys/src/lib/stdio/tmpfile.c index bc462ba..5c584cf 100644 --- a/sys/src/lib/stdio/tmpfile.c +++ b/sys/src/lib/stdio/tmpfile.c @@ -53,5 +53,5 @@ rmtmps(void) int i; for(i=0; i= 0) return rv; err[0] = '\0'; - errstr(err, sizeof err); + sys_errstr(err, sizeof err); if(jehanne_strstr(err, "refused") != 0){ jehanne_werrstr("%s", err); return rv; @@ -76,7 +76,7 @@ _threaddial(const char *dest, const char *local, char *dir, int *cfdp) return rv; alterr[0] = 0; - errstr(alterr, sizeof alterr); + sys_errstr(alterr, sizeof alterr); if(jehanne_strstr(alterr, "translate") || jehanne_strstr(alterr, "does not exist")) jehanne_werrstr("%s", err); else @@ -94,7 +94,7 @@ csdial(DS *ds) * open connection server */ jehanne_snprint(buf, sizeof(buf), "%s/cs", ds->netdir); - fd = open(buf, ORDWR); + fd = sys_open(buf, ORDWR); if(fd < 0){ /* no connection server, don't translate */ jehanne_snprint(clone, sizeof(clone), "%s/%s/clone", ds->netdir, ds->proto); @@ -105,8 +105,8 @@ csdial(DS *ds) * ask connection server to translate */ jehanne_snprint(buf, sizeof(buf), "%s!%s", ds->proto, ds->rem); - if(write(fd, buf, jehanne_strlen(buf)) < 0){ - close(fd); + if(jehanne_write(fd, buf, jehanne_strlen(buf)) < 0){ + sys_close(fd); return -1; } @@ -116,8 +116,8 @@ csdial(DS *ds) */ *besterr = 0; rv = -1; - seek(fd, 0, 0); - while((n = read(fd, buf, sizeof(buf) - 1)) > 0){ + sys_seek(fd, 0, 0); + while((n = jehanne_read(fd, buf, sizeof(buf) - 1)) > 0){ buf[n] = 0; p = jehanne_strchr(buf, ' '); if(p == 0) @@ -127,11 +127,11 @@ csdial(DS *ds) if(rv >= 0) break; err[0] = '\0'; - errstr(err, sizeof err); + sys_errstr(err, sizeof err); if(jehanne_strstr(err, "does not exist") == 0) jehanne_strcpy(besterr, err); } - close(fd); + sys_close(fd); if(rv < 0 && *besterr) jehanne_werrstr("%s", besterr); @@ -157,14 +157,14 @@ call(char *clone, char *dest, DS *ds) p = clone; jehanne_snprint(cname, sizeof cname, "%s/%s", ds->netdir, p); - cfd = open(cname, ORDWR); + cfd = sys_open(cname, ORDWR); if(cfd < 0) return -1; /* get directory name */ - n = read(cfd, name, sizeof(name)-1); + n = jehanne_read(cfd, name, sizeof(name)-1); if(n < 0){ - close(cfd); + sys_close(cfd); return -1; } name[n] = 0; @@ -182,21 +182,21 @@ call(char *clone, char *dest, DS *ds) jehanne_snprint(name, sizeof(name), "connect %s %s", dest, ds->local); else jehanne_snprint(name, sizeof(name), "connect %s", dest); - if(write(cfd, name, jehanne_strlen(name)) < 0){ - close(cfd); + if(jehanne_write(cfd, name, jehanne_strlen(name)) < 0){ + sys_close(cfd); return -1; } /* open data connection */ - fd = open(data, ORDWR); + fd = sys_open(data, ORDWR); if(fd < 0){ - close(cfd); + sys_close(cfd); return -1; } if(ds->cfdp) *ds->cfdp = cfd; else - close(cfd); + sys_close(cfd); return fd; } diff --git a/sys/src/lib/thread/example.c b/sys/src/lib/thread/example.c index 2a02fd9..c46240c 100644 --- a/sys/src/lib/thread/example.c +++ b/sys/src/lib/thread/example.c @@ -34,10 +34,10 @@ mouseproc(void *arg) Channel *mc; mc = arg; - if((mfd = open("/dev/mouse", OREAD)) < 0) + if((mfd = sys_open("/dev/mouse", OREAD)) < 0) jehanne_sysfatal("open /dev/mouse: %r"); for(;;){ - if(read(mfd, m, sizeof m) != sizeof m) + if(jehanne_read(mfd, m, sizeof m) != sizeof m) jehanne_sysfatal("eof"); if(jehanne_atoi(m+1+2*12)&4) jehanne_sysfatal("button 3"); diff --git a/sys/src/lib/thread/exec.c b/sys/src/lib/thread/exec.c index 9267ea5..3176a56 100644 --- a/sys/src/lib/thread/exec.c +++ b/sys/src/lib/thread/exec.c @@ -45,18 +45,18 @@ procexec(Channel *pidc, char *prog, char *args[]) * then the proc doing the exec sends the errstr down the * pipe to us. */ - if(bind("#|", PIPEMNT, MREPL) < 0) + if(sys_bind("#|", PIPEMNT, MREPL) < 0) goto Bad; - if((p->exec.fd[0] = open(PIPEMNT "/data", OREAD)) < 0){ - unmount(nil, PIPEMNT); + if((p->exec.fd[0] = sys_open(PIPEMNT "/data", OREAD)) < 0){ + sys_unmount(nil, PIPEMNT); goto Bad; } - if((p->exec.fd[1] = open(PIPEMNT "/data1", OWRITE|OCEXEC)) < 0){ - close(p->exec.fd[0]); - unmount(nil, PIPEMNT); + if((p->exec.fd[1] = sys_open(PIPEMNT "/data1", OWRITE|OCEXEC)) < 0){ + sys_close(p->exec.fd[0]); + sys_unmount(nil, PIPEMNT); goto Bad; } - unmount(nil, PIPEMNT); + sys_unmount(nil, PIPEMNT); /* exec in parallel via the scheduler */ assert(p->needexec==0); @@ -65,14 +65,14 @@ procexec(Channel *pidc, char *prog, char *args[]) p->needexec = 1; _sched(); - close(p->exec.fd[1]); - if((n = read(p->exec.fd[0], p->exitstr, ERRMAX-1)) > 0){ /* exec failed */ + sys_close(p->exec.fd[1]); + if((n = jehanne_read(p->exec.fd[0], p->exitstr, ERRMAX-1)) > 0){ /* exec failed */ p->exitstr[n] = '\0'; - errstr(p->exitstr, ERRMAX); - close(p->exec.fd[0]); + sys_errstr(p->exitstr, ERRMAX); + sys_close(p->exec.fd[0]); goto Bad; } - close(p->exec.fd[0]); + sys_close(p->exec.fd[0]); if(pidc) sendul(pidc, t->ret); diff --git a/sys/src/lib/thread/id.c b/sys/src/lib/thread/id.c index 8066fb1..17325dc 100644 --- a/sys/src/lib/thread/id.c +++ b/sys/src/lib/thread/id.c @@ -81,9 +81,9 @@ threadsetname(char *fmt, ...) va_end(arg); if(t->cmdname && p->nthreads == 1){ jehanne_snprint(buf, sizeof buf, "#p/%lud/args", jehanne_getpid()); - if((fd = open(buf, OWRITE)) >= 0){ - write(fd, t->cmdname, jehanne_strlen(t->cmdname)+1); - close(fd); + if((fd = sys_open(buf, OWRITE)) >= 0){ + jehanne_write(fd, t->cmdname, jehanne_strlen(t->cmdname)+1); + sys_close(fd); } } } diff --git a/sys/src/lib/thread/iocall.c b/sys/src/lib/thread/iocall.c index 9ea47b4..0d60bf4 100644 --- a/sys/src/lib/thread/iocall.c +++ b/sys/src/lib/thread/iocall.c @@ -51,7 +51,7 @@ iocall(Ioproc *io, int32_t (*op)(va_list*), ...) va_end(io->arg); ret = io->ret; if(ret < 0) - errstr(io->err, sizeof io->err); + sys_errstr(io->err, sizeof io->err); io->inuse = 0; /* release resources */ diff --git a/sys/src/lib/thread/ioclose.c b/sys/src/lib/thread/ioclose.c index 042c5c4..88cc3f6 100644 --- a/sys/src/lib/thread/ioclose.c +++ b/sys/src/lib/thread/ioclose.c @@ -18,7 +18,7 @@ _ioclose(va_list *arg) int fd; fd = va_arg(*arg, int); - return close(fd); + return sys_close(fd); } int diff --git a/sys/src/lib/thread/ioopen.c b/sys/src/lib/thread/ioopen.c index 51868d5..2925a6b 100644 --- a/sys/src/lib/thread/ioopen.c +++ b/sys/src/lib/thread/ioopen.c @@ -20,7 +20,7 @@ _ioopen(va_list *arg) path = va_arg(*arg, char*); mode = va_arg(*arg, int); - return open(path, mode); + return sys_open(path, mode); } int diff --git a/sys/src/lib/thread/ioread.c b/sys/src/lib/thread/ioread.c index 251cd49..61ba3c8 100644 --- a/sys/src/lib/thread/ioread.c +++ b/sys/src/lib/thread/ioread.c @@ -22,7 +22,7 @@ _ioread(va_list *arg) fd = va_arg(*arg, int); a = va_arg(*arg, void*); n = va_arg(*arg, int32_t); - return read(fd, a, n); + return jehanne_read(fd, a, n); } int32_t diff --git a/sys/src/lib/thread/iowrite.c b/sys/src/lib/thread/iowrite.c index a863de5..488d46b 100644 --- a/sys/src/lib/thread/iowrite.c +++ b/sys/src/lib/thread/iowrite.c @@ -22,7 +22,7 @@ _iowrite(va_list *arg) fd = va_arg(*arg, int); a = va_arg(*arg, void*); n = va_arg(*arg, int32_t); - return write(fd, a, n); + return jehanne_write(fd, a, n); } int32_t diff --git a/sys/src/lib/thread/main.c b/sys/src/lib/thread/main.c index c6a86be..20f92e2 100644 --- a/sys/src/lib/thread/main.c +++ b/sys/src/lib/thread/main.c @@ -38,7 +38,7 @@ main(int argc, char **argv) Mainarg *a; Proc *p; - rfork(RFREND); + sys_rfork(RFREND); mainp = &p; if(jehanne_setjmp(_mainjmp)) _schedinit(p); @@ -49,7 +49,7 @@ main(int argc, char **argv) _sysfatal = _threadsysfatal; _dial = _threaddial; __assert = _threadassert; - notify(_threadnote); + sys_notify(_threadnote); if(mainstacksize == 0) mainstacksize = 8*1024; @@ -78,15 +78,15 @@ efork(Execargs *e) char buf[ERRMAX]; _threaddebug(DBGEXEC, "_schedexec %s", e->prog); - close(e->fd[0]); - exec(e->prog, e->args); + sys_close(e->fd[0]); + sys_exec(e->prog, e->args); _threaddebug(DBGEXEC, "_schedexec failed: %r"); jehanne_rerrstr(buf, sizeof buf); if(buf[0]=='\0') jehanne_strcpy(buf, "exec failed"); - write(e->fd[1], buf, jehanne_strlen(buf)); - close(e->fd[1]); - _exits(buf); + jehanne_write(e->fd[1], buf, jehanne_strlen(buf)); + sys_close(e->fd[1]); + sys__exits(buf); } int @@ -94,7 +94,7 @@ _schedexec(Execargs *e) { int pid; - switch(pid = rfork(RFREND|RFNOTEG|RFFDG|RFMEM|RFPROC)){ + switch(pid = sys_rfork(RFREND|RFNOTEG|RFFDG|RFMEM|RFPROC)){ case 0: efork(e); default: @@ -107,7 +107,7 @@ _schedfork(Proc *p) { int pid; - switch(pid = rfork(RFPROC|RFMEM|RFNOWAIT|p->rforkflag)){ + switch(pid = sys_rfork(RFPROC|RFMEM|RFNOWAIT|p->rforkflag)){ case 0: *mainp = p; /* write to stack, so local to proc */ jehanne_longjmp(_mainjmp, 1); @@ -135,7 +135,7 @@ _schedexit(Proc *p) jehanne_utfecpy(ex, ex+sizeof ex, p->exitstr); jehanne_free(p); - _exits(ex); + sys__exits(ex); } void @@ -152,7 +152,7 @@ _schedexecwait(void) pid = t->ret; _threaddebug(DBGEXEC, "_schedexecwait %d", t->ret); - rfork(RFCFDG); + sys_rfork(RFCFDG); for(;;){ w = jehanne_wait(); if(w == nil) diff --git a/sys/src/lib/thread/note.c b/sys/src/lib/thread/note.c index 8d6a547..a149f6f 100644 --- a/sys/src/lib/thread/note.c +++ b/sys/src/lib/thread/note.c @@ -78,7 +78,7 @@ delayednotes(Proc *p, void *v) if(i==NFN){ _threaddebug(DBGNOTE, "Unhandled note %s, proc %p\n", n->s, p); if(v != nil) - noted(NDFLT); + sys_noted(NDFLT); else if(jehanne_strncmp(n->s, "sys:", 4)==0) abort(); threadexitsall(n->s); @@ -97,19 +97,19 @@ _threadnote(void *v, char *s) _threaddebug(DBGNOTE, "Got note %s", s); if(jehanne_strncmp(s, "sys:", 4) == 0) - noted(NDFLT); + sys_noted(NDFLT); if(_threadexitsallstatus){ _threaddebug(DBGNOTE, "Threadexitsallstatus = '%s'\n", _threadexitsallstatus); - _exits(_threadexitsallstatus); + sys__exits(_threadexitsallstatus); } if(jehanne_strcmp(s, "threadint")==0) - noted(NCONT); + sys_noted(NCONT); p = _threadgetproc(); if(p == nil) - noted(NDFLT); + sys_noted(NDFLT); for(n=notes; ninuse)) @@ -121,7 +121,7 @@ _threadnote(void *v, char *s) p->pending = 1; if(!p->splhi) delayednotes(p, v); - noted(NCONT); + sys_noted(NCONT); } int diff --git a/sys/src/lib/thread/sched.c b/sys/src/lib/thread/sched.c index af2cf1c..2cf7c3d 100644 --- a/sys/src/lib/thread/sched.c +++ b/sys/src/lib/thread/sched.c @@ -150,7 +150,7 @@ runthread(Proc *p) q->asleep = 1; _threaddebug(DBGSCHED, "sleeping for more work"); jehanne_unlock(&p->readylock); - while(rendezvous(q, 0) == (void*)~0){ + while(sys_rendezvous(q, 0) == (void*)~0){ if(_threadexitsallstatus) jehanne_exits(_threadexitsallstatus); } @@ -181,7 +181,7 @@ _threadready(Thread *t) q->asleep = 0; /* lock passes to runthread */ _threaddebug(DBGSCHED, "waking process %d", t->proc->pid); - while(rendezvous(q, 0) == (void*)~0){ + while(sys_rendezvous(q, 0) == (void*)~0){ if(_threadexitsallstatus) jehanne_exits(_threadexitsallstatus); }