From 23fc47623d09bc183686667f7a4df8c850f92807 Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Sat, 11 Jan 1992 00:00:00 +0000 Subject: [PATCH] Plan 9 from Bell Labs 1992-01-11 --- gnot/devduart.c | 2 +- gnot/devincon.c | 2 +- gnot/devport.c | 2 +- gnot/disk.c | 2 +- gnot/errno.h | 64 ----------------------------------------- gnot/fault68020.c | 2 +- gnot/lock.c | 2 +- gnot/screen.c | 2 +- gnot/trap.c | 2 +- pc/devfloppy.c | 4 +-- pc/devhard.c | 2 +- pc/devlpt.c | 2 +- pc/devrtc.c | 2 +- pc/devuart.c | 2 +- pc/trap.c | 2 +- port/chan.c | 8 +++--- port/dev.c | 4 +-- port/devXXX.c | 2 +- port/devarp.c | 2 +- port/devbit.c | 2 +- port/devboot.c | 2 +- port/devcons.c | 4 +-- port/devdk.c | 14 ++++----- port/devdup.c | 2 +- port/devenv.c | 2 +- port/devip.c | 8 +++--- port/deviproute.c | 2 +- port/devkprof.c | 2 +- port/devlance.c | 2 +- port/devmnt.c | 6 ++-- port/devmux.c | 2 +- port/devnonet.c | 2 +- port/devpipe.c | 2 +- port/devproc.c | 2 +- port/devroot.c | 2 +- port/devscc.c | 2 +- port/devscsi.c | 2 +- port/devsrv.c | 2 +- port/devwren.c | 2 +- port/error.h | 73 +++++++++++++++++++++++++++++++++++++++++++++++ port/fault.c | 4 +-- port/ipdat.h | 5 ++-- port/net.c | 2 +- port/netXXX.c | 2 +- port/page.c | 2 +- port/pgrp.c | 2 +- port/portdat.h | 1 - port/portfns.h | 2 +- port/proc.c | 6 ++-- port/segment.c | 2 +- port/stasync.c | 2 +- port/stfcall.c | 2 +- port/stil.c | 2 +- port/stip.c | 2 +- port/stnoether.c | 2 +- port/stream.c | 2 +- port/sturp.c | 2 +- port/swap.c | 2 +- port/sysfile.c | 2 +- port/sysproc.c | 4 +-- port/tcpif.c | 8 +++--- port/tcpinput.c | 6 ++-- port/tcpoutput.c | 2 +- port/tcptimer.c | 2 +- power/boot.c | 4 ++- power/devbit3.c | 2 +- power/devduart.c | 2 +- power/devhotrod.c | 2 +- power/devhs.c | 2 +- power/devrtc.c | 2 +- power/errno.h | 67 ------------------------------------------- power/faultmips.c | 2 +- power/lock.c | 2 +- power/trap.c | 2 +- ss/faultsparc.c | 2 +- ss/screen.c | 2 +- ss/trap.c | 2 +- 77 files changed, 173 insertions(+), 235 deletions(-) delete mode 100644 gnot/errno.h create mode 100644 port/error.h delete mode 100644 power/errno.h diff --git a/gnot/devduart.c b/gnot/devduart.c index 03898168be46de2f141775ce910290ab548d68e6..c365bf1c202fad54b9d6a2edcb234ee775b7bdcc 100644 --- a/gnot/devduart.c +++ b/gnot/devduart.c @@ -5,7 +5,7 @@ #include "fns.h" #include "io.h" #include "ureg.h" -#include "errno.h" +#include "../port/error.h" #include "devtab.h" diff --git a/gnot/devincon.c b/gnot/devincon.c index 2abfb821954e970aa81e02b2594493e7fcd4f7c5..8f1e781f86458b4cec8e6b2cf1095f6724fd514d 100644 --- a/gnot/devincon.c +++ b/gnot/devincon.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" #include "devtab.h" #include "io.h" diff --git a/gnot/devport.c b/gnot/devport.c index 2ccc14cf8145615e0188d7551e0369b36be577d0..7c195cdd34d32a6c01e54fa4e32da67b20f5f419 100644 --- a/gnot/devport.c +++ b/gnot/devport.c @@ -4,7 +4,7 @@ #include "dat.h" #include "fns.h" #include "io.h" -#include "errno.h" +#include "../port/error.h" #include "devtab.h" diff --git a/gnot/disk.c b/gnot/disk.c index 9e252dc93d890d9738b3a9749194986a036e2bfa..e3669d21c87cf5ab33ccac368e2c2176d940aff5 100644 --- a/gnot/disk.c +++ b/gnot/disk.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" #include "devtab.h" diff --git a/gnot/errno.h b/gnot/errno.h deleted file mode 100644 index 94593202b5cc1e67e38307ab054bea9620c647bb..0000000000000000000000000000000000000000 --- a/gnot/errno.h +++ /dev/null @@ -1,64 +0,0 @@ -enum{ - Enoerror, /* no error */ - Enofd, /* no free file descriptors */ - Ebadfd, /* fd out of range or not open */ - Ebadusefd, /* inappropriate use of fd */ - Ebadarg, /* bad arg in system call */ - Enonexist, /* file does not exist */ - Efilename, /* file name syntax */ - Ebadchar, /* bad character in file name */ - Ebadsharp, /* unknown device in # filename */ - Ebadexec, /* a.out header invalid */ - Eioload, /* i/o error in demand load */ - Eperm, /* permission denied */ - Enotdir, /* not a directory */ - Enochild, /* no living children */ - Enoseg, /* no free segments */ - Ebadmount, /* inconsistent mount */ - Enomount, /* mount table full */ - Enomntdev, /* no free mount devices */ - Eshutdown, /* mounted device shut down */ - Einuse, /* device or object already in use */ - Eio, /* i/o error */ - Eisdir, /* file is a directory */ - Ebaddirread, /* directory read not quantized */ - Esegaddr, /* illegal segment addresses or size */ - Enoenv, /* no free environment resources */ - Eprocdied, /* process exited */ - Enocreate, /* mounted directory forbids creation */ - Enotunion, /* attempt to union with non-mounted directory */ - Emount, /* inconsistent mount */ - Enosrv, /* no free server slots */ - Enoqueue, /* no free stream queues */ - Ebadld, /* illegal line discipline */ - Enostream, /* no free stream heads */ - Etoobig, /* read or write too large */ - Etoosmall, /* read or write too small */ - Ehungup, /* write to hungup stream */ - Ebadnet, /* illegal network address */ - Enoifc, /* bad interface or no free interface slots */ - Enodev, /* no free devices */ - Ebadctl, /* bad process or stream control request */ - Enonote, /* note overflow */ - Eintr, /* interrupted */ - Edestbusy, /* datakit destination busy */ - Enetbusy, /* datakit controller busy */ - Edestotl, /* datakit destination out to lunch */ - Enetotl, /* datakit controller out to lunch */ - Erejected, /* datakit destination rejected call */ - Ebadblt, /* bad bitblt or bitmap request */ - Enobitmap, /* out of bitmap descriptors */ - Enobitstore, /* out of bitmap storage */ - Ebadbitmap, /* unallocated bitmap */ - Ebadfont, /* unallocated font */ - Eshortmsg, /* short message */ - Ebadmsg, /* format error or mismatch in message */ - Ebadcnt, /* read count greater than requested */ - Enofont, /* out of font descriptors */ - Enovmem, /* virtual memory allocation failed */ - Enoasync, /* out of async stream modules */ - Enopipe, /* out of pipes */ - Enofilsys, /* out of filsys resources */ - Eisstream, /* seek on a stream */ - Egreg, /* ken has implemented datakit */ -}; diff --git a/gnot/fault68020.c b/gnot/fault68020.c index 77de84551dcb8549e9bcf7ca69bc83870a206dfa..f717eedbd7aa310165514c1553ebb79b63a3bb06 100644 --- a/gnot/fault68020.c +++ b/gnot/fault68020.c @@ -4,7 +4,7 @@ #include "dat.h" #include "fns.h" #include "ureg.h" -#include "errno.h" +#include "../port/error.h" #define FORMAT(ur) ((((ur)->vo)>>12)&0xF) #define OFFSET(ur) (((ur)->vo)&0xFFF) diff --git a/gnot/lock.c b/gnot/lock.c index 1865e7be5c978f7bb499bc3f5bb9f270a0b7311e..d4b2281c89dc9c4b3d7eac9570a4998fa9a7c01d 100644 --- a/gnot/lock.c +++ b/gnot/lock.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" #define PCOFF -1 diff --git a/gnot/screen.c b/gnot/screen.c index 528e7a0057ecba4c093536f3ffbd176f8f5516c8..52f6a00d805523edf94a55539c4befb5d144558a 100644 --- a/gnot/screen.c +++ b/gnot/screen.c @@ -5,7 +5,7 @@ #include "fns.h" #include "io.h" #include "ureg.h" -#include "errno.h" +#include "../port/error.h" #include #include diff --git a/gnot/trap.c b/gnot/trap.c index 046faa2c1b7854009b397ce3747c8b5ef34947c1..9e8b8645dd2a2ee35ef0097a0fc5672406cef85b 100644 --- a/gnot/trap.c +++ b/gnot/trap.c @@ -5,7 +5,7 @@ #include "fns.h" #include "ureg.h" #include "io.h" -#include "errno.h" +#include "../port/error.h" void noted(Ureg*, ulong); void rfnote(Ureg*); diff --git a/pc/devfloppy.c b/pc/devfloppy.c index 2be2495af170b64b345fe944e8e79e5c7453873c..3117d6167cda1e77ed1f4eabd174999a77fe3695 100644 --- a/pc/devfloppy.c +++ b/pc/devfloppy.c @@ -4,7 +4,7 @@ #include "dat.h" #include "fns.h" #include "io.h" -#include "errno.h" +#include "../port/error.h" /* Intel 82077A (8272A compatible) floppy controller */ @@ -770,7 +770,7 @@ floppythrice(Drive *dp, int cmd, void *a, long off, long n) for(tries = 0; ; tries++){ if(waserror()){ - if(strcmp(u->error, errstrtab[Eintr])==0 || tries > 3) + if(strcmp(u->error, Eintr)==0 || tries > 3) nexterror(); } else { rv = floppyxfer(dp, cmd, a, off, n); diff --git a/pc/devhard.c b/pc/devhard.c index 8871fa09fb0f90003bbd8f614de8c8de2e1d34d4..66d1666caf10fe2194c067e6aea077365def77ff 100644 --- a/pc/devhard.c +++ b/pc/devhard.c @@ -4,7 +4,7 @@ #include "dat.h" #include "fns.h" #include "io.h" -#include "errno.h" +#include "../port/error.h" typedef struct Drive Drive; typedef struct Ident Ident; diff --git a/pc/devlpt.c b/pc/devlpt.c index 9148f3f7f748af592954de787f4cf10ca17cb51b..6decbcee2253169a3ba3b7cdda08f60fed3243a0 100644 --- a/pc/devlpt.c +++ b/pc/devlpt.c @@ -4,7 +4,7 @@ #include "dat.h" #include "fns.h" #include "io.h" -#include "errno.h" +#include "../port/error.h" /* Centronix parallel (printer) port */ diff --git a/pc/devrtc.c b/pc/devrtc.c index d046445d0c741ba30edc2b7ddfc31fd0e1b445c5..ee0e78d904f0b89dc4357294cb51457459084256 100644 --- a/pc/devrtc.c +++ b/pc/devrtc.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" #include "devtab.h" /* diff --git a/pc/devuart.c b/pc/devuart.c index 9c8836bd828d64a0379c1f616d8ee42818a4de7c..503aeb924b4ff217df5c70a574efc4715f227547 100644 --- a/pc/devuart.c +++ b/pc/devuart.c @@ -4,7 +4,7 @@ #include "dat.h" #include "fns.h" #include "io.h" -#include "errno.h" +#include "../port/error.h" #include "devtab.h" diff --git a/pc/trap.c b/pc/trap.c index 1fb754a54829244ae8b262f9750938672c3b1ff8..8b61f46910dd9b0693b4be3d3439a2e6a55352b3 100644 --- a/pc/trap.c +++ b/pc/trap.c @@ -5,7 +5,7 @@ #include "fns.h" #include "io.h" #include "ureg.h" -#include "errno.h" +#include "../port/error.h" void noted(Ureg*, ulong); diff --git a/port/chan.c b/port/chan.c index e441d6a270acd7fe212e9fe1209ebca675e685a4..5afe383d816f2a551966795bcaeb8a23b2a8a9cf 100644 --- a/port/chan.c +++ b/port/chan.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" struct{ Lock; @@ -223,7 +223,7 @@ unmount(Chan *mnt, Chan *mounted) if(m == 0) { wunlock(&pg->ns); - errors("not mounted"); + error(Eunmount); } if(mounted == 0) { @@ -254,7 +254,7 @@ unmount(Chan *mnt, Chan *mounted) p = &f->next; } wunlock(&pg->ns); - errors("not in union"); + error(Eunion); } Chan* @@ -600,7 +600,7 @@ namec(char *name, int amode, int omode, ulong perm) strcpy(createerr, u->error); nc = walk(c, elem, 1); if(nc == 0) - errors(createerr); + error(createerr); c = nc; omode |= OTRUNC; goto Open; diff --git a/port/dev.c b/port/dev.c index bc2ef4b089b4d686f5cd68483d3cdb8244d8ec55..1adcb66560c0ad34b8c2ccc4c01115467210dcfd 100644 --- a/port/dev.c +++ b/port/dev.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" #define DEVTAB #include "devtab.h" @@ -98,7 +98,7 @@ devwalk(Chan *c, char *name, Dirtab *tab, int ntab, Devgen *gen) for(i=0;; i++) switch((*gen)(c, tab, ntab, i, &dir)){ case -1: - strncpy(u->error, errstrtab[Enonexist], NAMELEN); + strncpy(u->error, Enonexist, NAMELEN); return 0; case 0: continue; diff --git a/port/devXXX.c b/port/devXXX.c index b54bb8786578e4e34e1e0d0a5913f7f9aa3b8bb7..420e1df187f58484bc915d668af5fcec9b5564ab 100644 --- a/port/devXXX.c +++ b/port/devXXX.c @@ -7,7 +7,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" #include "devtab.h" diff --git a/port/devarp.c b/port/devarp.c index d2060f936662aeb68354423dd35e7106a7440a24..8aff786363bd08590ba96528fadd37ff6b2a4bd6 100644 --- a/port/devarp.c +++ b/port/devarp.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" #include "arp.h" #include "ipdat.h" diff --git a/port/devbit.c b/port/devbit.c index 545dc866a2c42e8d6e7cf8389b5548ad89ebf72f..667c925624d5fcb6183e46a45c42406f36d82fd7 100644 --- a/port/devbit.c +++ b/port/devbit.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" #include "devtab.h" diff --git a/port/devboot.c b/port/devboot.c index 60f2b402258209da9f9dfc1bce18fb202e934b59..9db9a3f80226d925105c21abadfba905e0fbd954 100644 --- a/port/devboot.c +++ b/port/devboot.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" #include "devtab.h" enum{ diff --git a/port/devcons.c b/port/devcons.c index ea1a5f11ee6616ab0cd2cc5cdd8039ff586ad0bd..416bf1737ca6e002bef85cc770b2912a04006938 100644 --- a/port/devcons.c +++ b/port/devcons.c @@ -4,7 +4,7 @@ #include "dat.h" #include "fns.h" #include "io.h" -#include "errno.h" +#include "../port/error.h" #include "devtab.h" @@ -818,7 +818,7 @@ conswrite(Chan *c, void *va, long n, ulong offset) error(Ebadarg); decrypt(evekey, a, n); if(memcmp(u->p->pgrp->crypt->chal, a, 8) != 0) - errors("authentication failure"); + error(Eauth); strncpy(u->p->user, a+8, NAMELEN); u->p->user[NAMELEN-1] = '\0'; memmove(u->p->pgrp->crypt->key, a+NAMELEN+DESKEYLEN, DESKEYLEN); diff --git a/port/devdk.c b/port/devdk.c index 1a26bac108e7fb115fd29173ebbf73fdcef6c32b..1b7a92eb0d2709bda584f5de930892d343924e92 100644 --- a/port/devdk.c +++ b/port/devdk.c @@ -4,7 +4,7 @@ #include "dat.h" #include "fns.h" #include "io.h" -#include "errno.h" +#include "../port/error.h" #define DPRINT if(0) print @@ -241,14 +241,10 @@ dkalloc(char *name, int ncsc, int lines) if(dp->name[0] == 0 && dp->ref == 0) freep = dp; } - if(freep == 0){ + if(freep == 0 || lines == 0){ unlock(&dklock); error(Enoifc); } - if(lines == 0){ - unlock(&dklock); - errors("unknown dk interface"); - } /* * init the structures @@ -267,7 +263,7 @@ dkalloc(char *name, int ncsc, int lines) bp = allocb(n); if(bp->lim - bp->base < n){ unlock(&dklock); - errors("too many lines"); + error(Ebadarg); } memset(bp->base, 0, bp->lim-bp->base); dp->linep = (Line **)bp->base; @@ -1118,9 +1114,9 @@ dkcall(int type, Chan *c, char *addr, char *nuser, char *machine) DPRINT("got reply %d\n", lp->state); if(lp->state != Lconnected) { if(lp->err >= DKERRS) - errors(dkerr[0]); + error(dkerr[0]); else - errors(dkerr[lp->err]); + error(dkerr[lp->err]); } /* diff --git a/port/devdup.c b/port/devdup.c index ca7387fffde5e3fd3218d73b70d70c8bda265ca2..22e8d0b89bc578e17d2de12ddaf21ac7c97df4f8 100644 --- a/port/devdup.c +++ b/port/devdup.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" #include "devtab.h" diff --git a/port/devenv.c b/port/devenv.c index 4def028b5f32f648932956193aedc3517d4a111e..06a3a0921b50d56d6f3b779548f311dd512b9c1d 100644 --- a/port/devenv.c +++ b/port/devenv.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" #include "devtab.h" diff --git a/port/devip.c b/port/devip.c index 3f0ff5b68585cae393c03685a9eae9fbe1e20d82..b4fa571a2bb7481eba60d54fbdc0eb5d9c6ece8d 100644 --- a/port/devip.c +++ b/port/devip.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" #include "arp.h" #include "ipdat.h" @@ -234,12 +234,12 @@ ipwrite(Chan *c, char *a, long n, ulong offset) m = getfields(buf, field, 5, ' '); if(m < 1) - errors("bad ip control"); + error(Ebadarg); if(strcmp(field[0], "connect") == 0) { if((cp->stproto == &tcpinfo && cp->tcpctl.state != Closed) || (cp->stproto == &ilinfo && cp->ilctl.state != Ilclosed)) - error(Edevbusy); + error(Enetbusy); if(m != 2) error(Ebadarg); @@ -281,7 +281,7 @@ ipwrite(Chan *c, char *a, long n, ulong offset) else if(strcmp(field[0], "announce") == 0) { if((cp->stproto == &tcpinfo && cp->tcpctl.state != Closed) || (cp->stproto == &ilinfo && cp->ilctl.state != Ilclosed)) - error(Edevbusy); + error(Enetbusy); if(m != 2) error(Ebadarg); diff --git a/port/deviproute.c b/port/deviproute.c index 9eab44e61bc8be746d6ebaf47a8c036a8be195fb..b9bc97b790fd272991c67f32a617bda698a67954 100644 --- a/port/deviproute.c +++ b/port/deviproute.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" #include "arp.h" #include "ipdat.h" diff --git a/port/devkprof.c b/port/devkprof.c index 54310b19df6d7b1251d479d2b952d54576ecc253..9a929af064a2d615445c53ce6d77266819987dda 100644 --- a/port/devkprof.c +++ b/port/devkprof.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" #include "devtab.h" diff --git a/port/devlance.c b/port/devlance.c index ed7a634155c67b1e09d0fdf5941b674bbbc12b35..4743cc47b4d36c3dd3a8c6d25939ed8f710316e0 100644 --- a/port/devlance.c +++ b/port/devlance.c @@ -4,7 +4,7 @@ #include "dat.h" #include "fns.h" #include "io.h" -#include "errno.h" +#include "../port/error.h" #include "devtab.h" enum { diff --git a/port/devmnt.c b/port/devmnt.c index 0d5fa6db661e31cb9d4098e9ba0c260552efc552..95d656bfca060e873572dab8954c1eeb2e6a98da 100644 --- a/port/devmnt.c +++ b/port/devmnt.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" #include "devtab.h" #include "fcall.h" @@ -482,7 +482,7 @@ mountrpc(Mnt *m, Mntrpc *r) if(r->reply.type == Rerror) errors(r->reply.ename); if(r->reply.type == Rflush) - errors(errstrtab[Eintr]); + error(Eintr); if(r->reply.type != r->request.type+1) { print("devmnt: mismatched reply 0x%lux T%d R%d tags req %d fls %d rep %d\n", @@ -670,7 +670,7 @@ mntflush(Mnt *m, Mntrpc *r) if(waserror()) { if(!m->mux) qunlock(&m->c->wrl); - if(strcmp(u->error, errstrtab[Eintr]) == 0) + if(strcmp(u->error, Eintr) == 0) return 1; mntqrm(m, r); return 0; diff --git a/port/devmux.c b/port/devmux.c index 367e7c28d2e46b30de31dfeb87ffa648c6992271..4f7810758ddadd54b56ae4fb0be95161667fcd27 100644 --- a/port/devmux.c +++ b/port/devmux.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" #include "fcall.h" #include "devtab.h" diff --git a/port/devnonet.c b/port/devnonet.c index 70ba3222137dd0168cb1f0b53fae5e54d12ab37d..b2ff4251033e525eee7a0cf4ff73099844ff02f6 100644 --- a/port/devnonet.c +++ b/port/devnonet.c @@ -4,7 +4,7 @@ #include "dat.h" #include "fns.h" #include "io.h" -#include "errno.h" +#include "../port/error.h" #include "../port/nonet.h" #define DPRINT if(pnonet)print diff --git a/port/devpipe.c b/port/devpipe.c index 39cde7a41fa7d8f2f15519407925b5b89f98a7fb..44797d88ab8414b29a44a69728521da989fcdcd7 100644 --- a/port/devpipe.c +++ b/port/devpipe.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" #include "devtab.h" #include "fcall.h" diff --git a/port/devproc.c b/port/devproc.c index 632cbaeeae4aec88ff0f68e3fb5259291194222c..0d183e39f8679f59b4632bf97591f40239d8fa15 100644 --- a/port/devproc.c +++ b/port/devproc.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" #include "fcall.h" #include "ureg.h" diff --git a/port/devroot.c b/port/devroot.c index 79dc0350f55550306f1c7b150f4a518671e41680..0cbe173a2b6b061afcf3c37f323fc1085af679f9 100644 --- a/port/devroot.c +++ b/port/devroot.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" #include "devtab.h" enum{ diff --git a/port/devscc.c b/port/devscc.c index d5efead2c39878f6d7e9555cb7af8ee94df9077a..1dc3c83a746f7fd312613ee14d5824b0cef50040 100644 --- a/port/devscc.c +++ b/port/devscc.c @@ -4,7 +4,7 @@ #include "dat.h" #include "fns.h" #include "io.h" -#include "errno.h" +#include "../port/error.h" #include "devtab.h" diff --git a/port/devscsi.c b/port/devscsi.c index 1e5e31daed59954febd63c7ead357ff3cf6b070b..bd67aeb8e092de5c767951423c6e149f525ffba4 100644 --- a/port/devscsi.c +++ b/port/devscsi.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" #include "devtab.h" #include "io.h" diff --git a/port/devsrv.c b/port/devsrv.c index 6673dee756a8abf3f910b953d814a4bb4409e764..9265351e850a0667c58c83d76666ab3352c392f6 100644 --- a/port/devsrv.c +++ b/port/devsrv.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" #include "devtab.h" diff --git a/port/devwren.c b/port/devwren.c index 1c684776b5f73c0817e1c9c7484974aa159a4074..15cd590074272b5061ced1db0ca15871f5f01f85 100644 --- a/port/devwren.c +++ b/port/devwren.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" #include "devtab.h" #include "io.h" diff --git a/port/error.h b/port/error.h new file mode 100644 index 0000000000000000000000000000000000000000..47ed50b146892757e07bb52905eed3f0565c3569 --- /dev/null +++ b/port/error.h @@ -0,0 +1,73 @@ +extern char Enoerror[]; /* no error */ +extern char Emount[]; /* inconsistent mount */ +extern char Eunmount[]; /* not mounted */ +extern char Eunion[]; /* not in union */ +extern char Enocreate[]; /* mounted directory forbids creation */ +extern char Enonexist[]; /* file does not exist */ +extern char Ebadsharp[]; /* unknown device in # filename */ +extern char Enotdir[]; /* not a directory */ +extern char Eisdir[]; /* file is a directory */ +extern char Ebadchar[]; /* bad character in file name */ +extern char Efilename[]; /* file name syntax */ +extern char Eperm[]; /* permission denied */ +extern char Ebadusefd[]; /* inappropriate use of fd */ +extern char Ebadarg[]; /* bad arg in system call */ +extern char Einuse[]; /* device or object already in use */ +extern char Eio[]; /* i/o error */ +extern char Etoobig[]; /* read or write too large */ +extern char Etoosmall[]; /* read or write too small */ +extern char Ebadblt[]; /* bad bitblt or bitmap request */ +extern char Ebadbitmap[]; /* unallocated bitmap */ +extern char Enobitmap[]; /* out of bitmap descriptors */ +extern char Enobitstore[]; /* out of bitmap storage */ +extern char Ebadfont[]; /* unallocated font */ +extern char Enofont[]; /* out of font descriptors */ +extern char Eauth[]; /* authentication failure */ +extern char Eaddrnotfound[]; /* network address not found */ +extern char Emsgsize[]; /* message is too big for protocol */ +extern char Enetbusy[]; /* network device is busy or allocated */ +extern char Enoifc[]; /* bad interface or no free interface slots */ +extern char Ehungup[]; /* write to hungup stream */ +extern char Enodev[]; /* no free devices */ +extern char Enoenv[]; /* no free environment resources */ + +extern char Enofd[]; /* no free file descriptors */ +extern char Ebadfd[]; /* fd out of range or not open */ +extern char Ebadexec[]; /* a.out header invalid */ +extern char Eioload[]; /* i/o error in demand load */ +extern char Enochild[]; /* no living children */ +extern char Enoseg[]; /* no free segments */ +extern char Ebadmount[]; /* inconsistent mount */ +extern char Enomount[]; /* mount table full */ +extern char Enomntdev[]; /* no free mount devices */ +extern char Eshutdown[]; /* mounted device shut down */ +extern char Ebaddirread[]; /* directory read not quantized */ +extern char Esegaddr[]; /* illegal segment addresses or size */ +extern char Eprocdied[]; /* process exited */ +extern char Enosrv[]; /* no free server slots */ +extern char Enoqueue[]; /* no free stream queues */ +extern char Ebadld[]; /* illegal line discipline */ +extern char Enostream[]; /* no free stream heads */ +extern char Ebadnet[]; /* illegal network address */ +extern char Ebadctl[]; /* bad process or stream control request */ +extern char Enonote[]; /* note overflow */ +extern char Eintr[]; /* interrupted */ +extern char Edestbusy[]; /* datakit destination busy */ +extern char Edestotl[]; /* datakit destination out to lunch */ +extern char Enetotl[]; /* datakit controller out to lunch */ +extern char Erejected[]; /* datakit destination rejected call */ +extern char Eshortmsg[]; /* short message */ +extern char Ebadmsg[]; /* format error or mismatch in message */ +extern char Ebadcnt[]; /* read count greater than requested */ +extern char Enovmem[]; /* virtual memory allocation failed */ +extern char Enoasync[]; /* out of async stream modules */ +extern char Enopipe[]; /* out of pipes */ +extern char Enoport[]; /* network port not available */ +extern char Enetunreach[]; /* network unreachable */ +extern char Etimedout[]; /* connection timed out */ +extern char Econrefused[]; /* connection refused */ +extern char Enoproto[]; /* network protocol not supported */ +extern char Eprotonosup[]; /* operation not supported by network protocol */ +extern char Eisstream[]; /* seek on a stream */ +extern char Enofilsys[]; /* out of filsys resources */ +extern char Egreg[]; /* it's a thermal problem */ diff --git a/port/fault.c b/port/fault.c index c008e2263fcf39d1bfd328835a81876e67e4c29b..bf68eef4e51b73af7ecd9cad0252e39f4ad416f2 100644 --- a/port/fault.c +++ b/port/fault.c @@ -4,7 +4,7 @@ #include "dat.h" #include "fns.h" #include "ureg.h" -#include "errno.h" +#include "../port/error.h" #define DPRINT @@ -185,7 +185,7 @@ pio(Segment *s, ulong addr, ulong soff, Page **p) c = s->image->c; qlock(&c->rdl); while(waserror()) { - if(strcmp(u->error, errstrtab[Eintr]) == 0) + if(strcmp(u->error, Eintr) == 0) continue; qunlock(&c->rdl); kunmap(k); diff --git a/port/ipdat.h b/port/ipdat.h index 93f281c79fe4e385f9528c30e55526804dfc5eb3..d7101c6a5e1cac587725ca43e7bf1db88578821d 100644 --- a/port/ipdat.h +++ b/port/ipdat.h @@ -281,7 +281,7 @@ struct Ipconv QLock listenq; /* List of people waiting incoming cons */ Rendez listenr; /* Some where to sleep while waiting */ - char err; /* Async protocol error */ + char *err; /* Async protocol error */ int backlog; /* Maximum number of waiting connections */ int curlog; /* Number of waiting connections */ int newcon; /* Flags that this is the start of a connection */ @@ -449,7 +449,7 @@ int seq_within(int, int, int); void update(Ipconv *, Tcp *); int trim(Tcpctl *, Tcp *, Block **, ushort *); void add_reseq(Tcpctl *, char, Tcp *, Block *, ushort); -void close_self(Ipconv *, int); +void close_self(Ipconv *, char []); int seq_gt(int, int); Ipconv *ip_conn(Ipconv *, Port, Port, Ipaddr dest, char proto); void ipmkdir(Qinfo *, Dirtab *, Ipconv *); @@ -460,7 +460,6 @@ void start_timer(Timer *); void stop_timer(Timer *); int copyupb(Block **, uchar *, int); void init_tcpctl(Ipconv *); -void close_self(Ipconv *, int); int iss(void); int seq_within(int, int, int); int seq_lt(int, int); diff --git a/port/net.c b/port/net.c index ce6fc1cc42b4562fcae3b10555f0161298e11644..b1752e8d0dbddbec63605ed20208c81d6176c45a 100644 --- a/port/net.c +++ b/port/net.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" #include "fcall.h" diff --git a/port/netXXX.c b/port/netXXX.c index 90249c3b2fe66ec4d31540ac9062904af63c0ace..c2ee63e5609fe4f20108548c6cf419598c6fe5dd 100644 --- a/port/netXXX.c +++ b/port/netXXX.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" static void nulloput(Queue*, Block*); static void protooput(Queue*, Block*); diff --git a/port/page.c b/port/page.c index 4fccbe178506dd83b193769652ca1569e628085d..cd9d781591364d0e285e823d8e604906e9c2a347 100644 --- a/port/page.c +++ b/port/page.c @@ -4,7 +4,7 @@ #include "dat.h" #include "fns.h" #include "ureg.h" -#include "errno.h" +#include "../port/error.h" #define PGHFUN(x, y) (((ulong)x^(ulong)y)%PGHSIZE) #define pghash(s) palloc.hash[PGHFUN(s->image, p->daddr)] diff --git a/port/pgrp.c b/port/pgrp.c index 45c652a2afe9bb279db257ebe8b3ac65d9d7139f..9848a5f3ea7aaaab69215a31c94ee8dc41500cbc 100644 --- a/port/pgrp.c +++ b/port/pgrp.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" struct { diff --git a/port/portdat.h b/port/portdat.h index 19a62855f5b6a88c7495791f7c11df020bd96aa6..f3fd35cb28ba5c3d9c310b7e390efc8207b3a045 100644 --- a/port/portdat.h +++ b/port/portdat.h @@ -670,7 +670,6 @@ extern ulong initcode[]; extern Dev devtab[]; extern char devchar[]; extern char *conffile; -extern char *errstrtab[]; extern char *statename[]; extern Palloc palloc; extern Image swapimage; diff --git a/port/portfns.h b/port/portfns.h index ee006bae21e8ca9b857cba2241f56d3dc9b3f057..e7d6cb8f8f252ca00fbb76d56c389880ce014d5e 100644 --- a/port/portfns.h +++ b/port/portfns.h @@ -59,7 +59,7 @@ void envpgclose(Env*); void envpgcopy(Env*, Env*); int eqchan(Chan*, Chan*, long); int eqqid(Qid, Qid); -void error(int); +void error(char []); void errors(char*); long execregs(ulong, ulong, ulong); void exit(void); diff --git a/port/proc.c b/port/proc.c index 919ecd4d049ed0f368d8b592ea287b54eb65b9d8..59bbe5e1e8cf5d7424c69149be0d772b57de17f0 100644 --- a/port/proc.c +++ b/port/proc.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" struct { @@ -764,9 +764,9 @@ procctl(Proc *p) #include "errstr.h" void -error(int code) +error(char err[]) { - strncpy(u->error, errstrtab[code], ERRLEN); + strncpy(u->error, err, ERRLEN); nexterror(); } diff --git a/port/segment.c b/port/segment.c index 2e0400e33e0438c8a46741b6beb3e6d36e72ffc6..d35351d4100c187ea096a3f36e2f9d161b03f7e9 100644 --- a/port/segment.c +++ b/port/segment.c @@ -4,7 +4,7 @@ #include "dat.h" #include "fns.h" #include "ureg.h" -#include "errno.h" +#include "../port/error.h" Page *lkpage(ulong addr); Page *snewpage(ulong addr); diff --git a/port/stasync.c b/port/stasync.c index 4e3d6d8053206cbd7ade57dede5a36b2e4b6b4b0..c72533568277c6362d985e5d85da9c7a345b1973 100644 --- a/port/stasync.c +++ b/port/stasync.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" #define DPRINT if(asyncdebug)kprint diff --git a/port/stfcall.c b/port/stfcall.c index 22c56767f8bf8f982c18ef711daae43be23c6ada..36ef5c1c70892b616b33cdac14950bffecdfbcd1 100644 --- a/port/stfcall.c +++ b/port/stfcall.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" #include "fcall.h" diff --git a/port/stil.c b/port/stil.c index 58ebb2ea35c8100c15a2437b37f2337a0a4a2041..a3af582ceb5268a111e2d2804b1df72cc11c1c92 100644 --- a/port/stil.c +++ b/port/stil.c @@ -7,7 +7,7 @@ #include "dat.h" #include "fns.h" #include "io.h" -#include "errno.h" +#include "../port/error.h" #include "arp.h" #include "ipdat.h" diff --git a/port/stip.c b/port/stip.c index 9dca0956a451ae5f2ce898d425ec95be48b96c6b..8f38150069787291dedcf6f16d9b273544dde7c7 100644 --- a/port/stip.c +++ b/port/stip.c @@ -10,7 +10,7 @@ #include "dat.h" #include "fns.h" #include "io.h" -#include "errno.h" +#include "../port/error.h" #include "arp.h" #include "ipdat.h" diff --git a/port/stnoether.c b/port/stnoether.c index 3b204c7f199c5a6272f903b34865ce70cc9c895e..239b8b2b6e67cbbf56b1e3cdedd66794bde94489 100644 --- a/port/stnoether.c +++ b/port/stnoether.c @@ -10,7 +10,7 @@ #include "dat.h" #include "fns.h" #include "io.h" -#include "errno.h" +#include "../port/error.h" #include "../port/nonet.h" #define DPRINT if(pnonet)print diff --git a/port/stream.c b/port/stream.c index 77acf7489a27d4fe35623fef8d8e6f7607e5c110..2c7be3c378616610235f015aefd4c547d0c5b4b9 100644 --- a/port/stream.c +++ b/port/stream.c @@ -4,7 +4,7 @@ #include "dat.h" #include "fns.h" #include "io.h" -#include "errno.h" +#include "../port/error.h" #include "devtab.h" #include "fcall.h" diff --git a/port/sturp.c b/port/sturp.c index 5dc060cea1a3b52b6d708df508c74ac6af0e7877..db90733d32bdb7721b9255c59c9d73b6ab3f7961 100644 --- a/port/sturp.c +++ b/port/sturp.c @@ -4,7 +4,7 @@ #include "dat.h" #include "fns.h" #include "io.h" -#include "errno.h" +#include "../port/error.h" enum { MSrexmit= 1000, diff --git a/port/swap.c b/port/swap.c index d7af461c322d58b003a8644566fe901f63de6042..d174d1b63a13ae231ddcd9b56817922d04d29a0f 100644 --- a/port/swap.c +++ b/port/swap.c @@ -4,7 +4,7 @@ #include "dat.h" #include "fns.h" #include "ureg.h" -#include "errno.h" +#include "../port/error.h" /* Predeclaration */ void pageout(Proc *p, Segment*); diff --git a/port/sysfile.c b/port/sysfile.c index e49cfba670d946cc4234d8ae65fe8cfbd57faf7d..7b9d58ed73f5cf7ed14cd9ef31936a3badfd28d5 100644 --- a/port/sysfile.c +++ b/port/sysfile.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" #include "fcall.h" /* diff --git a/port/sysproc.c b/port/sysproc.c index 41de36d450b4eea7732fd0244fafb723dc2359fc..e08391abe709761731f14153c5f2ecedc2f0c5d1 100644 --- a/port/sysproc.c +++ b/port/sysproc.c @@ -4,7 +4,7 @@ #include "dat.h" #include "fns.h" #include "ureg.h" -#include "errno.h" +#include "../port/error.h" #include @@ -454,7 +454,7 @@ syserrstr(ulong *arg) validaddr(arg[0], ERRLEN, 1); memmove((char*)arg[0], u->error, ERRLEN); - strncpy(u->error, errstrtab[0], ERRLEN); + strncpy(u->error, Enoerror, ERRLEN); return 0; } diff --git a/port/tcpif.c b/port/tcpif.c index 882c0f891f2a930a6f0d3027d025b990b7441e9c..494ac5de9e0c9df988e94560bba549f651b3577a 100644 --- a/port/tcpif.c +++ b/port/tcpif.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" #include "arp.h" #include "ipdat.h" @@ -16,7 +16,7 @@ state_upcall(Ipconv *s, char oldstate, char newstate) Block *bp; int len; - DPRINT("state_upcall: %s -> %s err %d\n", + DPRINT("state_upcall: %s -> %s err %s\n", tcpstate[oldstate], tcpstate[newstate], s->err); if(oldstate == newstate) @@ -33,9 +33,9 @@ state_upcall(Ipconv *s, char oldstate, char newstate) break; if(s->err) { - len = strlen(errstrtab[s->err]); + len = strlen(s->err); bp = allocb(len); - strcpy((char *)bp->wptr, errstrtab[s->err]); + strcpy((char *)bp->wptr, s->err); bp->wptr += len; } else diff --git a/port/tcpinput.c b/port/tcpinput.c index c10a1a8b270811be00e14051e8c94adcd1b4a977..0e70c891b3da76682066ba3205aa8e6eaf4e1460 100644 --- a/port/tcpinput.c +++ b/port/tcpinput.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" #include "arp.h" #include "ipdat.h" @@ -261,7 +261,7 @@ process: case Last_ack: update(s, &seg); if(tcb->sndcnt == 0) { - close_self(s, 0); + close_self(s, Enoerror); goto done; } case Time_wait: @@ -849,7 +849,7 @@ init_tcpctl(Ipconv *s) } void -close_self(Ipconv *s, int reason) +close_self(Ipconv *s, char reason[]) { Reseq *rp,*rp1; Tcpctl *tcb = &s->tcpctl; diff --git a/port/tcpoutput.c b/port/tcpoutput.c index ad19c94ec1ac8d984bc3a551dad7e08e680bf0a7..8b89e4ceef13e572cf0cf2583a4af37d03f3b3d5 100644 --- a/port/tcpoutput.c +++ b/port/tcpoutput.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" #include "arp.h" #include "ipdat.h" diff --git a/port/tcptimer.c b/port/tcptimer.c index e34b624428cb2c1b437dcf93e33b8487dfe65ba1..debc17ef3a36320d0d42519e5071ebeffb47e8c1 100644 --- a/port/tcptimer.c +++ b/port/tcptimer.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" #include "arp.h" #include "ipdat.h" diff --git a/power/boot.c b/power/boot.c index 44d2e73630f343d6f03de776d00ce48eb4119068..1d3c4ff0c136571b14097bccb6535f9130d0414a 100644 --- a/power/boot.c +++ b/power/boot.c @@ -608,8 +608,10 @@ passtokey(char *key, char *p, int n) int c; memset(t, ' ', sizeof t); - if(n > 10 || n < 5) + if(n < 5) return 0; + if(n > 10) + n = 10; strncpy((char*)t, p, n); if(n >= 9){ c = p[8] & 0xf; diff --git a/power/devbit3.c b/power/devbit3.c index f2f049c38d934172a54c043b7cd9554b50bf5bee..792ba199b294f0bf27999159c059e2874b32c857 100644 --- a/power/devbit3.c +++ b/power/devbit3.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" #include "devtab.h" #include "io.h" diff --git a/power/devduart.c b/power/devduart.c index d715d4e9fe5a64c214cbd0ff990328e078025674..58821498e42b0ce796b4aa0b09021816fcb29c41 100644 --- a/power/devduart.c +++ b/power/devduart.c @@ -4,7 +4,7 @@ #include "dat.h" #include "fns.h" #include "io.h" -#include "errno.h" +#include "../port/error.h" int duartacr; int duartimr; diff --git a/power/devhotrod.c b/power/devhotrod.c index dde112b259b82f71de33f71292a7b6ce42c7cfc3..39662779d23942c0bc6cca10ddedc4c707be10d6 100644 --- a/power/devhotrod.c +++ b/power/devhotrod.c @@ -4,7 +4,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" #include "devtab.h" #include "fcall.h" diff --git a/power/devhs.c b/power/devhs.c index 601e152cbebd7cb7935f757f20396008d0b2b926..2f99adaa61a2e1ab90074b464ecf9c6bdb6c8b06 100644 --- a/power/devhs.c +++ b/power/devhs.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" #include "devtab.h" #include "io.h" diff --git a/power/devrtc.c b/power/devrtc.c index 729c7d60216c37025c929f8b40883d850e59ea58..95594452e19c9de36feb886277b1149dc819ea48 100644 --- a/power/devrtc.c +++ b/power/devrtc.c @@ -3,7 +3,7 @@ #include "mem.h" #include "dat.h" #include "fns.h" -#include "errno.h" +#include "../port/error.h" #include "devtab.h" #include "io.h" diff --git a/power/errno.h b/power/errno.h deleted file mode 100644 index 0ae0c2267cc7d3f07c0626df5955a3caba1e819d..0000000000000000000000000000000000000000 --- a/power/errno.h +++ /dev/null @@ -1,67 +0,0 @@ -enum{ - Enoerror, /* no error */ - Enofd, /* no free file descriptors */ - Ebadfd, /* fd out of range or not open */ - Ebadusefd, /* inappropriate use of fd */ - Ebadarg, /* bad arg in system call */ - Enonexist, /* file does not exist */ - Efilename, /* file name syntax */ - Ebadchar, /* bad character in file name */ - Ebadsharp, /* unknown device in # filename */ - Ebadexec, /* a.out header invalid */ - Eioload, /* i/o error in demand load */ - Eperm, /* permission denied */ - Enotdir, /* not a directory */ - Enochild, /* no living children */ - Enoseg, /* no free segments */ - Ebadmount, /* inconsistent mount */ - Enomount, /* mount table full */ - Enomntdev, /* no free mount devices */ - Eshutdown, /* mounted device shut down */ - Einuse, /* device or object already in use */ - Eio, /* i/o error */ - Eisdir, /* file is a directory */ - Ebaddirread, /* directory read not quantized */ - Esegaddr, /* illegal segment addresses or size */ - Enoenv, /* no free environment resources */ - Eprocdied, /* process exited */ - Enocreate, /* mounted directory forbids creation */ - Enotunion, /* attempt to union with non-mounted directory */ - Emount, /* inconsistent mount */ - Enosrv, /* no free server slots */ - Enoqueue, /* no free stream queues */ - Ebadld, /* illegal line discipline */ - Enostream, /* no free stream heads */ - Etoobig, /* read or write too large */ - Etoosmall, /* read or write too small */ - Ehungup, /* write to hungup stream */ - Ebadnet, /* illegal network address */ - Enoifc, /* bad interface or no free interface slots */ - Enodev, /* no free devices */ - Ebadctl, /* bad process or stream control request */ - Enonote, /* note overflow */ - Eintr, /* interrupted */ - Edestbusy, /* datakit destination busy */ - Enetbusy, /* datakit controller busy */ - Edestotl, /* datakit destination out to lunch */ - Enetotl, /* datakit controller out to lunch */ - Erejected, /* datakit destination rejected call */ - Eshortmsg, /* short message */ - Ebadmsg, /* format error or mismatch in message */ - Ebadcnt, /* read count greater than requested */ - Enoannounce, /* listening on an unannounced network connection */ - Enovmem, /* virtual memory allocation failed */ - Enoasync, /* out of async stream modules */ - Enopipe, /* out of pipes */ - Emsgsize, /* message is too big for protocol */ - Enoport, /* network port not available */ - Edevbusy, /* network device is busy or allocated */ - Eaddrnotfound, /* network address not found */ - Enetunreach, /* network unreachable */ - Etimedout, /* connection timed out */ - Econrefused, /* connection refused */ - Enoproto, /* network protocol not supported */ - Eprotonosup, /* operation not supported by network protocol */ - Eisstream, /* seek on a stream */ - Egreg, /* ken has implemented datakit */ -}; diff --git a/power/faultmips.c b/power/faultmips.c index cf571d92114d792598bc8f4ed96239f2f8e22565..04abd2c0c34cc245fbde6054c9343e3253434938 100644 --- a/power/faultmips.c +++ b/power/faultmips.c @@ -4,7 +4,7 @@ #include "dat.h" #include "fns.h" #include "ureg.h" -#include "errno.h" +#include "../port/error.h" /* * find out fault address and type of access. diff --git a/power/lock.c b/power/lock.c index d83e70de84696c17d8afcfda7e4103a78f1ee72c..0cec3d0aae4bbe8bb9de09eb0e9e3c51a6c373d7 100644 --- a/power/lock.c +++ b/power/lock.c @@ -4,7 +4,7 @@ #include "dat.h" #include "fns.h" #include "io.h" -#include "errno.h" +#include "../port/error.h" /* * The hardware semaphores are strange. 64 per page, replicated 16 times diff --git a/power/trap.c b/power/trap.c index 5f176eefa77e53927663a31eafb88ab5476379ff..0fd4a5cb64ca09adceff1ab0f615ab983194c6b8 100644 --- a/power/trap.c +++ b/power/trap.c @@ -5,7 +5,7 @@ #include "fns.h" #include "ureg.h" #include "io.h" -#include "errno.h" +#include "../port/error.h" /* * vme interrupt routines diff --git a/ss/faultsparc.c b/ss/faultsparc.c index 0d7a5dd2d9fdb56b8d8e8d9709c7da70b8bf49ac..b2153523ef23d220f3e75d19f4b4920c6704052e 100644 --- a/ss/faultsparc.c +++ b/ss/faultsparc.c @@ -4,7 +4,7 @@ #include "dat.h" #include "fns.h" #include "ureg.h" -#include "errno.h" +#include "../port/error.h" void faultsparc(Ureg *ur) diff --git a/ss/screen.c b/ss/screen.c index 6c94941d6ac55035112e9c4ed198d4da8f998698..f4a719f415306514a740ba2212a233969bd1fa4f 100644 --- a/ss/screen.c +++ b/ss/screen.c @@ -5,7 +5,7 @@ #include "fns.h" #include "io.h" #include "ureg.h" -#include "errno.h" +#include "../port/error.h" #include #include diff --git a/ss/trap.c b/ss/trap.c index d2f501eed188f6dcb7520b234e557f5cf3b57cc8..0ba27d0a386eef7f47073113b1bd1d438f8e1eae 100644 --- a/ss/trap.c +++ b/ss/trap.c @@ -5,7 +5,7 @@ #include "fns.h" #include "ureg.h" #include "io.h" -#include "errno.h" +#include "../port/error.h" void noted(Ureg**, ulong); void rfnote(Ureg**);