EliasFleckenstein03
/
plan9front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aux/kbdfs: use getuser() from libc

front
cinap_lenrek 2020-12-19 15:52:41 +01:00
parent ba20914d01
commit daccd2b226
1 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sys/src/cmd/aux/kbdfs/kbdfs.c
View File

@ -104,6 +104,7 @@ int consctlopen;
int quiet = 0; int quiet = 0;
char *sname = nil; char *sname = nil;
char *mntpt = "/dev"; char *mntpt = "/dev";
char *user;
int debug; int debug;
@ -1249,36 +1250,14 @@ kbmapwrite(Req *req)
* Filesystem * Filesystem
*/ */
static char*
getauser(void)
{
static char user[64];
int fd;
int n;
if(*user)
return user;
if((fd = open("/dev/user", OREAD)) < 0)
strcpy(user, "none");
else {
n = read(fd, user, (sizeof user)-1);
close(fd);
if(n < 0)
strcpy(user, "none");
else
user[n] = 0;
}
return user;
}
static int static int
fillstat(ulong qid, Dir *d) fillstat(ulong qid, Dir *d)
{ {
static char *user;
struct Qtab *t; struct Qtab *t;
memset(d, 0, sizeof *d); memset(d, 0, sizeof *d);
d->uid = getauser(); d->uid = d->gid = user;
d->gid = getauser();
d->muid = ""; d->muid = "";
d->qid = (Qid){qid, 0, 0}; d->qid = (Qid){qid, 0, 0};
d->atime = time(0); d->atime = time(0);
@ -1639,6 +1618,7 @@ threadmain(int argc, char** argv)
kbdchan = chancreate(sizeof(char*), 128); kbdchan = chancreate(sizeof(char*), 128);
intchan = chancreate(sizeof(int), 0); intchan = chancreate(sizeof(int), 0);
user = getuser();
threadpostmountsrv(&fs, sname, mntpt, MBEFORE); threadpostmountsrv(&fs, sname, mntpt, MBEFORE);
threadexits(0); threadexits(0);
} }