xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

kernel: simplify fdclose()

Browse source
This commit is contained in:
cinap_lenrek 2014-05-26 22:47:34 +02:00
parent 89acedb9b8
commit 9ebbfae28b
1 changed files with 5 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
sys/src/9/port/sysfile.c
View file

@ -292,28 +292,20 @@ sysopen(va_list list)
void void
fdclose(int fd, int flag) fdclose(int fd, int flag)
{ {
int i;
Chan *c; Chan *c;
Fgrp *f = up->fgrp; Fgrp *f = up->fgrp;
lock(f); lock(f);
c = f->fd[fd]; c = f->fd[fd];
if(c == 0){ if(c == nil || (flag != 0 && (c->flag&flag) == 0)){
/* can happen for users with shared fd tables */
unlock(f); unlock(f);
return; return;
} }
if(flag){ f->fd[fd] = nil;
if(c==0 || !(c->flag&flag)){ if(fd == f->maxfd){
unlock(f); while(fd > 0 && f->fd[fd] == nil)
return; f->maxfd = --fd;
}
} }
f->fd[fd] = 0;
if(fd == f->maxfd)
for(i=fd; --i>=0 && f->fd[i]==0; )
f->maxfd = i;
unlock(f); unlock(f);
cclose(c); cclose(c);
} }