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

rio: simplify filsysinit() by using getuser(), format pid's as ulongs

Browse source
This commit is contained in:
cinap_lenrek 2020-12-07 14:22:30 +01:00
parent c924edb91d
commit c86a960880
1 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
sys/src/cmd/rio/fsys.c
View file

@ -118,37 +118,27 @@ cexecpipe(int *p0, int *p1)
Filsys* Filsys*
filsysinit(Channel *cxfidalloc) filsysinit(Channel *cxfidalloc)
{ {
int n, fd, pid, p0; int p0;
Filsys *fs; Filsys *fs;
Channel *c; Channel *c;
char buf[128];
fs = emalloc(sizeof(Filsys)); fs = emalloc(sizeof(Filsys));
if(cexecpipe(&fs->cfd, &fs->sfd) < 0) if(cexecpipe(&fs->cfd, &fs->sfd) < 0)
goto Rescue; goto Rescue;
fmtinstall('F', fcallfmt); fmtinstall('F', fcallfmt);
clockfd = open("/dev/time", OREAD|OCEXEC); clockfd = open("/dev/time", OREAD|OCEXEC);
fd = open("/dev/user", OREAD); fs->user = getuser();
strcpy(buf, "Jean-Paul_Belmondo");
if(fd >= 0){
n = read(fd, buf, sizeof buf-1);
if(n > 0)
buf[n] = 0;
close(fd);
}
fs->user = estrdup(buf);
fs->csyncflush = chancreate(sizeof(int), 0); fs->csyncflush = chancreate(sizeof(int), 0);
if(fs->csyncflush == nil) if(fs->csyncflush == nil)
error("chancreate syncflush"); error("chancreate syncflush");
fs->cxfidalloc = cxfidalloc; fs->cxfidalloc = cxfidalloc;
pid = getpid();
/* /*
* Create and post wctl pipe * Create and post wctl pipe
*/ */
if(cexecpipe(&p0, &wctlfd) < 0) if(cexecpipe(&p0, &wctlfd) < 0)
goto Rescue; goto Rescue;
snprint(srvwctl, sizeof(srvwctl), "/srv/riowctl.%s.%d", fs->user, pid); snprint(srvwctl, sizeof(srvwctl), "/srv/riowctl.%s.%lud", fs->user, (ulong)getpid());
post(srvwctl, "wctl", p0); post(srvwctl, "wctl", p0);
close(p0); close(p0);
@ -165,7 +155,7 @@ filsysinit(Channel *cxfidalloc)
/* /*
* Post srv pipe * Post srv pipe
*/ */
snprint(srvpipe, sizeof(srvpipe), "/srv/rio.%s.%d", fs->user, pid); snprint(srvpipe, sizeof(srvpipe), "/srv/rio.%s.%lud", fs->user, (ulong)getpid());
post(srvpipe, "wsys", fs->cfd); post(srvpipe, "wsys", fs->cfd);
return fs; return fs;
@ -234,7 +224,7 @@ filsysmount(Filsys *fs, int id)
char buf[32]; char buf[32];
close(fs->sfd); /* close server end so mount won't hang if exiting */ close(fs->sfd); /* close server end so mount won't hang if exiting */
sprint(buf, "%d", id); snprint(buf, sizeof buf, "%d", id);
if(mount(fs->cfd, -1, "/mnt/wsys", MREPL, buf) == -1){ if(mount(fs->cfd, -1, "/mnt/wsys", MREPL, buf) == -1){
fprint(2, "mount failed: %r\n"); fprint(2, "mount failed: %r\n");
return -1; return -1;