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

iostats: remove unused fcallfmt, dont leak our mount pipe end into exportfs proc

Browse source
This commit is contained in:
cinap_lenrek 2014-08-03 16:28:07 +02:00
parent d63734eb53
commit 718f3358bb
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sys/src/cmd/iostats.c
View file

@ -327,6 +327,7 @@ main(int argc, char **argv)
if(chdir(buf) < 0) if(chdir(buf) < 0)
sysfatal("chdir"); sysfatal("chdir");
exec(*argv, argv); exec(*argv, argv);
if(**argv != '/' && strncmp(*argv, "./", 2) != 0 && strncmp(*argv, "../", 3) != 0) if(**argv != '/' && strncmp(*argv, "./", 2) != 0 && strncmp(*argv, "../", 3) != 0)
exec(smprint("/bin/%s", *argv), argv); exec(smprint("/bin/%s", *argv), argv);
@ -354,6 +355,7 @@ main(int argc, char **argv)
dup(efd[0], 0); dup(efd[0], 0);
close(efd[0]); close(efd[0]);
close(efd[1]); close(efd[1]);
close(pfd[1]);
if(dbg){ if(dbg){
execl("/bin/exportfs", "exportfs", "-df", dbfile, "-r", "/", nil); execl("/bin/exportfs", "exportfs", "-df", dbfile, "-r", "/", nil);
} else { } else {
@ -364,6 +366,8 @@ main(int argc, char **argv)
switch(fspid = fork()) { switch(fspid = fork()) {
default: default:
close(pfd[1]);
close(efd[1]);
while(cpid != waitpid()) while(cpid != waitpid())
; ;
postnote(PNPROC, fspid, DONESTR); postnote(PNPROC, fspid, DONESTR);
@ -377,8 +381,6 @@ main(int argc, char **argv)
break; break;
} }
fmtinstall('F', fcallfmt);
stats->rpc[Tversion].name = "version"; stats->rpc[Tversion].name = "version";
stats->rpc[Tauth].name = "auth"; stats->rpc[Tauth].name = "auth";
stats->rpc[Tflush].name = "flush"; stats->rpc[Tflush].name = "flush";