JehanneOS/jehanne
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

decouple Jehanne from 9P2000 (as much as needed)

Browse Source 
Jehanne is going to use a new file protocol, but Plan 9 is really
coupled with 9P2000.

Renamed fcall.h as 9P2000.h and introduced specific constants such
as NP_OREAD, NP_OWRITE and so on, so that we can use different values
in the kernel and new protocol.

Renamed devmnt to devninep, since it's actually a device serving 9P2000
file systems.

Also, fixed 9P2000 support in Jehanne, that was broken with the introduction
of OSTAT.
This commit is contained in:
Giacomo Tesio
2016-12-01 00:09:42 +01:00
parent bbb375a585
commit f52a185030
199 changed files with 649 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
sys/src/kern/port/sysfile.c
View File

@@ -134,7 +134,7 @@ newfd2(int fd[2], Chan *c[2])
}
Chan*
fdtochan(int fd, int mode, int chkmnt, int iref)
fdtochan(int fd, unsigned long mode, int chkmnt, int iref)
{
Chan *c;
Fgrp *f;
@@ -157,16 +157,21 @@ fdtochan(int fd, int mode, int chkmnt, int iref)
error(Ebadusefd);
}
if(mode<0 || c->mode==ORDWR)
if(mode==~0 || c->mode==ORDWR)
return c;
/* In Jehanne OTRUNC is not a "kernel reserved flag" (see libc.h):
* it's up to the server/device handing the request to ensure
* that OREAD|OTRUNC or any other combination produce an error...
*
if((mode&OTRUNC) && c->mode==OREAD) {
if(iref)
cclose(c);
error(Ebadusefd);
}
*/
if((mode&~OTRUNC) != c->mode) {
if((mode&c->mode) != mode) {
if(iref)
cclose(c);
error(Ebadusefd);
@@ -175,14 +180,14 @@ fdtochan(int fd, int mode, int chkmnt, int iref)
return c;
}
int
openmode(int omode)
unsigned long
openmode(unsigned long omode)
{
omode &= ~(OTRUNC|OCEXEC|ORCLOSE);
if(omode > OEXEC)
if((omode&OEXEC) && (omode&ORDWR))
error(Ebadarg);
if(omode == OEXEC)
return OREAD;
if((omode&OKMODE) == OEXEC)
return (omode|OREAD)&~OEXEC;
return omode;
}
@@ -291,7 +296,7 @@ sysopen(char *aname, uint32_t omode)
nexterror();
}
aname = validaddr(aname, 1, 0);
if((omode&OEXEC) == OSTAT)
if((omode&OKMODE) == OSTAT)
c = namec(aname, Aaccess, 0, 0);
else
c = namec(aname, Aopen, omode, 0);
@@ -937,7 +942,7 @@ syschdir(char *aname)
*/
static int dcok[] = {
'M'
'9'
};
static int checkdc(int dc)
{