aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/acme
diff options
context:
space:
mode:
authorrsc <devnull@localhost>2003-12-17 04:34:52 +0000
committerrsc <devnull@localhost>2003-12-17 04:34:52 +0000
commit49588d5d9089589ccda28c41aae90c29d6f72787 (patch)
tree48cbc911e34b71977b7b98b4d0b94b27d4454081 /src/cmd/acme
parent7f11104a5737adf261d10bc1a7b85e740f2eb491 (diff)
downloadplan9port-49588d5d9089589ccda28c41aae90c29d6f72787.tar.gz
plan9port-49588d5d9089589ccda28c41aae90c29d6f72787.tar.bz2
plan9port-49588d5d9089589ccda28c41aae90c29d6f72787.zip
Tweaks to various bits.
Until I hear otherwise, Refs aren't used enough to merit their own assembly. They are now implemented with locks.
Diffstat (limited to 'src/cmd/acme')
-rw-r--r--src/cmd/acme/fsys.c7
-rw-r--r--src/cmd/acme/mkfile2
-rw-r--r--src/cmd/acme/xfid.c1
3 files changed, 7 insertions, 3 deletions
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);