From 49588d5d9089589ccda28c41aae90c29d6f72787 Mon Sep 17 00:00:00 2001
From: rsc <devnull@localhost>
Date: Wed, 17 Dec 2003 04:34:52 +0000
Subject: Tweaks to various bits.

Until I hear otherwise, Refs aren't used enough to
merit their own assembly.  They are now implemented with locks.
---
 src/cmd/acme/fsys.c | 7 +++++--
 src/cmd/acme/mkfile | 2 +-
 src/cmd/acme/xfid.c | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/cmd/acme')

diff --git a/src/cmd/acme/fsys.c b/src/cmd/acme/fsys.c
index cd333dc7..d220bdef 100644
--- a/src/cmd/acme/fsys.c
+++ b/src/cmd/acme/fsys.c
@@ -306,6 +306,7 @@ fsysattach(Xfid *x, Fid *f)
 	Fcall t;
 	int id;
 	Mntdir *m;
+	char buf[128];
 
 	if(strcmp(x->fcall.uname, user) != 0)
 		return respond(x, &t, Eperm);
@@ -327,8 +328,10 @@ fsysattach(Xfid *x, Fid *f)
 			m->ref++;
 			break;
 		}
-	if(m == nil)
-		sendp(cerr, estrdup("unknown id in attach"));
+	if(m == nil){
+		snprint(buf, sizeof buf, "unknown id '%s' in attach", x->fcall.aname);
+		sendp(cerr, estrdup(buf));
+	}
 	qunlock(&mnt.lk);
 	return respond(x, &t, nil);
 }
diff --git a/src/cmd/acme/mkfile b/src/cmd/acme/mkfile
index 84149eb9..f92f903a 100644
--- a/src/cmd/acme/mkfile
+++ b/src/cmd/acme/mkfile
@@ -36,6 +36,6 @@ UPDATE=\
 
 <$PLAN9/src/mkone
 
-LDFLAGS=$LDFLAGS -lfs -lmux -lplumb -lthread -lframe -ldraw -lbio -l9 -lfmt -lutf -L$X11/lib -lX11
+LDFLAGS=$LDFLAGS -lplumb -lfs -lmux -lthread -lframe -ldraw -lbio -l9 -lfmt -lutf -L$X11/lib -lX11
 
 edit.$O ecmd.$O elog.$O:	edit.h
diff --git a/src/cmd/acme/xfid.c b/src/cmd/acme/xfid.c
index f397623e..13af7395 100644
--- a/src/cmd/acme/xfid.c
+++ b/src/cmd/acme/xfid.c
@@ -194,6 +194,7 @@ xfidclose(Xfid *x)
 
 	w = x->f->w;
 	x->f->busy = FALSE;
+	x->f->w = nil;
 	if(x->f->open == FALSE){
 		if(w != nil)
 			winclose(w);
-- 
cgit v1.2.3