From 4a18fa68b01bf8121a8660d3f5214e5927763251 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Teichgr=C3=A4ber?= <mt@ib.wmipf.de>
Date: Wed, 8 Jul 2009 09:18:42 -0700
Subject: src: use whatis instead of which

---
 bin/src             |  2 +-
 src/cmd/acme/exec.c |  2 +-
 src/cmd/vac/file.c  | 18 +++++++++++++-----
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/bin/src b/bin/src
index 03987627..bedb9f9a 100755
--- a/bin/src
+++ b/bin/src
@@ -49,7 +49,7 @@ if(~ $#* 0) usage
 ifs='
 '
 for(i){
-	wi=`{which $i >[2]/dev/null}
+	wi=`{whatis $i >[2]/dev/null}
 	if(test -f $i) go $i
 	if not if(~ $#wi 1 && test -f $wi) go $wi
 	if not echo 'src: can''t find '$i
diff --git a/src/cmd/acme/exec.c b/src/cmd/acme/exec.c
index 157c0a51..86c21d64 100644
--- a/src/cmd/acme/exec.c
+++ b/src/cmd/acme/exec.c
@@ -194,7 +194,7 @@ execute(Text *t, uint aq0, uint aq1, int external, Text *argt)
 			if(strlen(a) > EVENTSIZE){	/* too big; too bad */
 				free(aa);
 				free(a);
-				warning(nil, "`argument string too long\n");
+				warning(nil, "argument string too long\n");
 				return;
 			}
 			f |= 8;
diff --git a/src/cmd/vac/file.c b/src/cmd/vac/file.c
index bf17ea38..d73934e8 100644
--- a/src/cmd/vac/file.c
+++ b/src/cmd/vac/file.c
@@ -1788,6 +1788,7 @@ vacfsopen(VtConn *z, char *file, int mode, ulong cachemem)
 		}
 		close(fd);
 	}
+fprint(2, "vacfsopen %V\n", score);
 	return vacfsopenscore(z, score, mode, cachemem);
 }
 
@@ -1803,17 +1804,23 @@ vacfsopenscore(VtConn *z, u8int *score, int mode, ulong cachemem)
 	VtEntry e;
 
 	n = vtread(z, score, VtRootType, buf, VtRootSize);
-	if(n < 0)
+	if(n < 0) {
+fprint(2, "read %r\n");
 		return nil;
+	}
 	if(n != VtRootSize){
 		werrstr("vtread on root too short");
+fprint(2, "size %d\n", n);
 		return nil;
 	}
 
-	if(vtrootunpack(&rt, buf) < 0)
+	if(vtrootunpack(&rt, buf) < 0) {
+fprint(2, "unpack: %r\n");
 		return nil;
+	}
 
 	if(strcmp(rt.type, "vac") != 0) {
+fprint(2, "bad type %s\n", rt.type);
 		werrstr("not a vac root");
 		return nil;
 	}
@@ -1825,13 +1832,14 @@ vacfsopenscore(VtConn *z, u8int *score, int mode, ulong cachemem)
 	memmove(e.score, rt.score, VtScoreSize);
 	e.gen = 0;
 	
-	// Don't waste cache memory on directories
+	// Don't waste cache memory on pointer blocks
 	// when rt.blocksize is large.
 	e.psize = (rt.blocksize/VtEntrySize)*VtEntrySize;
 	if(e.psize > 60000)
 		e.psize = (60000/VtEntrySize)*VtEntrySize;
 
 	e.dsize = rt.blocksize;
+fprint(2, "openscore %d psize %d dsize %d\n", (int)rt.blocksize, (int)e.psize, (int)e.dsize);
 	e.type = VtDirType;
 	e.flags = VtEntryActive;
 	e.size = 3*VtEntrySize;
@@ -1949,9 +1957,9 @@ vacfscreate(VtConn *z, int bsize, ulong cachemem)
 	/*
 	 * Fake up an empty vac fs.
 	 */
-	psize = bsize/VtEntrySize*VtEntrySize;
+	psize = bsize/VtScoreSize*VtScoreSize;
 	if(psize > 60000)
-		psize = 60000/VtEntrySize*VtEntrySize;
+		psize = 60000/VtScoreSize*VtScoreSize;
 fprint(2, "create bsize %d psize %d\n", bsize, psize);
 
 	f = vtfilecreateroot(fs->cache, psize, bsize, VtDirType);
-- 
cgit v1.2.3