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

merge

Browse source
This commit is contained in:
cinap_lenrek 2015-09-26 11:46:31 +02:00
commit c124b9f8b2
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
sys/src/cmd/cwfs/9p2.c
View file

@ -93,7 +93,9 @@ mkdir9p2(Dir* dir, Dentry* dentry, void* strs)
op = p = strs; op = p = strs;
dir->name = p; dir->name = p;
p += sprint(p, "%s", dentry->name)+1; strncpy(p, dentry->name, NAMELEN);
p[NAMELEN-1] = 0;
p += strlen(p)+1;
dir->uid = p; dir->uid = p;
uidtostr(p, dentry->uid, 1); uidtostr(p, dentry->uid, 1);
@ -346,7 +348,7 @@ attach(Chan* chan, Fcall* f, Fcall* r)
r->qid = file->qid; r->qid = file->qid;
strncpy(chan->whoname, f->uname, sizeof(chan->whoname)); snprint(chan->whoname, sizeof(chan->whoname), "%s", f->uname);
chan->whotime = time(nil); chan->whotime = time(nil);
out: out:
if(p != nil) if(p != nil)
@ -911,7 +913,7 @@ fs_create(Chan* chan, Fcall* f, Fcall* r)
goto phase; goto phase;
} }
strncpy(d1->name, f->name, sizeof(d1->name)); strncpy(d1->name, f->name, NAMELEN);
if(chan == cons.chan){ if(chan == cons.chan){
d1->uid = cons.uid; d1->uid = cons.uid;
d1->gid = cons.gid; d1->gid = cons.gid;
@ -1012,7 +1014,6 @@ fs_read(Chan* chan, Fcall* f, Fcall* r, uchar* data)
} }
iounit = chan->msize-IOHDRSZ; iounit = chan->msize-IOHDRSZ;
if(count < 0 || count > iounit){ if(count < 0 || count > iounit){
fprint(2, "fs_read %d %d\n", count, iounit);
error = Ecount; error = Ecount;
goto out; goto out;
} }
@ -1784,7 +1785,7 @@ fs_wstat(Chan* chan, Fcall* f, Fcall*, char* strs)
} }
d->size = dir.length; d->size = dir.length;
if(dir.name != d->name) if(dir.name != d->name)
strncpy(d->name, dir.name, sizeof(d->name)); strncpy(d->name, dir.name, NAMELEN);
d->uid = uid; d->uid = uid;
d->gid = gid; d->gid = gid;
d->muid = muid; d->muid = muid;

5
sys/src/cmd/cwfs/con.c
View file

@ -14,7 +14,7 @@ consserve(void)
{ {
int i; int i;
strncpy(cons.chan->whochan, "console", sizeof(cons.chan->whochan)); snprint(cons.chan->whochan, sizeof(cons.chan->whochan), "console");
installcmds(); installcmds();
con_session(); con_session();
cmd_exec("cfs"); cmd_exec("cfs");
@ -312,8 +312,7 @@ cmd_who(int argc, char *argv[])
continue; continue;
} }
} }
print("%3d: %10s %24s", cp->chan, print("%3d: %10s %24s", cp->chan, cp->whoname, cp->whochan);
cp->whoname? cp->whoname: "<nowhoname>", cp->whochan);
if(cp->whoprint) if(cp->whoprint)
cp->whoprint(cp); cp->whoprint(cp);
print("\n"); print("\n");

2
sys/src/cmd/cwfs/sub.c
View file

@ -46,7 +46,7 @@ fs_chaninit(int count, int data)
chans = cp; chans = cp;
cp->chan = cons.chano; cp->chan = cons.chano;
cons.chano++; cons.chano++;
strncpy(cp->whoname, "<none>", sizeof cp->whoname); snprint(cp->whoname, sizeof(cp->whoname), "<none>");
wlock(&cp->reflock); wlock(&cp->reflock);
wunlock(&cp->reflock); wunlock(&cp->reflock);
rlock(&cp->reflock); rlock(&cp->reflock);