commit - bb7ff349fb314edffabb01c418e146d563548058
commit + 4a18fa68b01bf8121a8660d3f5214e5927763251
blob - 03987627a43c55e0c1459e6870731e5dcf6c5a4c
blob + bedb9f9ab753443fdbac135b5ea487915e0a9d50
--- bin/src
+++ bin/src
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
blob - 157c0a51d85c312aee6515726d396c097e63206d
blob + 86c21d6439cb46ca36f6068cd0aa6d01d1a94f7b
--- src/cmd/acme/exec.c
+++ src/cmd/acme/exec.c
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;
blob - bf17ea3806ca25ab7cc57e26fa1b058a2ebbf26c
blob + d73934e8e5cf30c74622592e0642c5bf9935687e
--- src/cmd/vac/file.c
+++ src/cmd/vac/file.c
}
close(fd);
}
+fprint(2, "vacfsopen %V\n", score);
return vacfsopenscore(z, score, mode, 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;
}
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;
/*
* 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);