20100221-1211

4 files changed, 8 insertions, 9 deletions

diff --git a/appl/cmd/9660srv.b b/appl/cmd/9660srv.b
index 17fa053b..90de6918 100644
--- a/appl/cmd/9660srv.b
+++ b/appl/cmd/9660srv.b
@@ -185,7 +185,7 @@ fileserve(rfd: ref Sys->FD, sync: chan of int)
 			error("bad R-message conversion");
 		if(showstyx)
 			chat(r.text()+"\n");
-		if(styx->write(rfd, rbuf, len rbuf) != len rbuf)
+		if(sys->write(rfd, rbuf, len rbuf) != len rbuf)
 			error(sys->sprint("connection write error: %r"));
 	}
 
diff --git a/appl/cmd/auth/keyfs.b b/appl/cmd/auth/keyfs.b
index f81c3ee7..f1f1a25a 100644
--- a/appl/cmd/auth/keyfs.b
+++ b/appl/cmd/auth/keyfs.b
@@ -415,6 +415,7 @@ serveloop(tchan: chan of ref Tmsg, srv: ref Styxserver, pidc: chan of int, navop
 			}
 			case TYPE(c.path) {
 			Quser =>
+				srv.delfid(c);
 				u := finduserpath(c.path);
 				if(u == nil){
 					srv.reply(ref Rmsg.Error(m.tag, Eremoved));
@@ -422,9 +423,9 @@ serveloop(tchan: chan of ref Tmsg, srv: ref Styxserver, pidc: chan of int, navop
 				}
 				removeuser(u);
 				writekeys(keyfile);
-				srv.delfid(c);
 				srv.reply(ref Rmsg.Remove(m.tag));
 			Qsecret =>
+				srv.delfid(c);
 				u := finduserpath(c.path);
 				if(u == nil){
 					srv.reply(ref Rmsg.Error(m.tag, Eremoved));
@@ -432,7 +433,6 @@ serveloop(tchan: chan of ref Tmsg, srv: ref Styxserver, pidc: chan of int, navop
 				}
 				u.secret = nil;
 				writekeys(keyfile);
-				srv.delfid(c);
 				srv.reply(ref Rmsg.Remove(m.tag));
 			* =>
 				srv.remove(m);	# let it reject it
diff --git a/appl/cmd/dossrv.b b/appl/cmd/dossrv.b
index aefe7948..1cfcdf93 100644
--- a/appl/cmd/dossrv.b
+++ b/appl/cmd/dossrv.b
@@ -195,7 +195,6 @@ dossrv(rfd: ref Sys->FD)
 {
 	sys->pctl(Sys->NEWFD, rfd.fd :: 2 :: nil);
 	rfd = sys->fildes(rfd.fd);
-	data := array[Styx->MAXRPC] of byte;
 	while((t := Tmsg.read(rfd, 0)) != nil){
 		if(debug & STYX_MESS)
 			chat(sys->sprint("%s...", t.text()));
@@ -242,7 +241,7 @@ dossrv(rfd: ref Sys->FD)
 			panic("Rmsg.pack");
 		if(debug & STYX_MESS)
 			chat(sys->sprint("%s\n", r.text()));
-		if(styx->write(rfd, rbuf, len rbuf) != len rbuf)
+		if(sys->write(rfd, rbuf, len rbuf) != len rbuf)
 			panic("mount write");
 	}
 
@@ -967,7 +966,7 @@ rwstat(t: ref Tmsg.Wstat): ref Rmsg
 		oaddr := dp.addr;
 		ooffset := dp.offset;
 		d := dpd;
-		od := *d;
+#		od := *d;
 		# start := getstart(f.xf, d);
 		start := d.start;
 		length := d.length;
@@ -1395,7 +1394,7 @@ putstart(nil: ref Xfs, d: ref Dosdir, start: int)
 fileclust(f: ref Xfile, iclust: int, cflag: int): int
 {
 
-	bp := f.xf.ptr;
+#	bp := f.xf.ptr;
 	dp := f.ptr;
 	if(isroot(dp.addr))
 		return -1;		# root directory for old FAT format does not start on a cluster boundary
@@ -2067,7 +2066,7 @@ writefile(f: ref Xfile, buf: array of byte, offset,count: int): int
 truncfile(f: ref Xfile): int
 {
 	xf := f.xf;
-	bp := xf.ptr;
+#	bp := xf.ptr;
 	dp := f.ptr;
 	d := Dosdir.arr2Dd(dp.p.iobuf[dp.offset:dp.offset+DOSDIRSIZE]);
 
diff --git a/appl/cmd/ftpfs.b b/appl/cmd/ftpfs.b
index ee5a44d4..9d074124 100644
--- a/appl/cmd/ftpfs.b
+++ b/appl/cmd/ftpfs.b
@@ -280,7 +280,7 @@ sendreply(r: ref Rmsg)
 	if (debug)
 		sys->print("> %s\n", r.text());
 	a := r.pack();
-	if(styx->write(styxfd, a, len a) != len a)
+	if(sys->write(styxfd, a, len a) != len a)
 		sys->print("ftpfs: error replying: %r\n");
 }