commit - 946b8d7086d5e1aa97e19bac52fc1a416a56110e
commit + 6932098c9fc67a291ff44881c76ab7785873cf09
blob - f93bba7d1c8d9715f04b6c84b9786c4d9bee67a0
blob + 3e51908919d5169ca298e00c0dd537c0072a63b5
--- src/cmd/venti/srv/fixarenas.c
+++ src/cmd/venti/srv/fixarenas.c
@@ -1357,6 +1357,7 @@ guessarena(vlong offset0, int anum, ArenaHead *head, A
 		 * (the same pattern gets written many times in a row)
 		 * and should never happen during regular use.
 		 */
+		magic = 0;
 		if((n = isclump(p, &cl, &magic)) > 0){
 			/*
 			 * If we were in the middle of some corrupted data,
blob - e71bd4367c6b035433faaf4314529becaa976548
blob + 6b7f20fab74a9807ea3c5808545bdfcaa4be37da
--- src/cmd/venti/srv/httpd.c
+++ src/cmd/venti/srv/httpd.c
@@ -168,11 +168,6 @@ httpproc(void *v)
 		if(hparsereq(c, 0) < 0)
 			break;
 		
-		if(c->req.search)
-			c->req.searchpairs = hparsequery(c, c->req.search);
-		else
-			c->req.searchpairs = nil;
-
 		for(i = 0; i < MaxObjs && objs[i].name[0]; i++){
 			n = strlen(objs[i].name);
 			if((objs[i].name[n-1] == '/' && strncmp(c->req.uri, objs[i].name, n) == 0)
@@ -791,7 +786,7 @@ pctdiffgraph(Stats *s, Stats *t, void *va)
 }
 
 static long
-div(long a, long b)
+xdiv(long a, long b)
 {
 	if(b == 0)
 		b++;
@@ -804,7 +799,7 @@ divdiffgraph(Stats *s, Stats *t, void *va)
 	Arg *a;
 
 	a = va;
-	return div(t->n[a->index] - s->n[a->index], t->n[a->index2] - s->n[a->index2]);
+	return xdiv(t->n[a->index] - s->n[a->index], t->n[a->index2] - s->n[a->index2]);
 }
 
 static long
blob - 9591c3b70eb7b2d77cfa9fc669b8ea1f06f7deeb
blob + 099430134e87bb3142d2215680974ad965d3e3d2
--- src/cmd/venti/srv/mirrorarenas.c
+++ src/cmd/venti/srv/mirrorarenas.c
@@ -301,6 +301,7 @@ mirror(Arena *sa, Arena *da)
 	if(ewritepart(dst, base - blocksize, buf, blocksize) < 0)
 		return;
 
+	shaoff = 0;
 	ds = nil;
 	if(sa->diskstats.sealed && scorecmp(sa->score, zeroscore) != 0){
 		/* start sha1 state with header */
blob - 095a298ef37d336c644e8d65dcfb5cb7516157ab
blob + 2c55495148d73d7a94a0874393b4af00300034ea
--- src/cmd/venti/srv/mkfile
+++ src/cmd/venti/srv/mkfile
@@ -40,7 +40,7 @@ LIBOFILES=\
 
 SLIB=libvs.a
 
-LIB=$SLIB $LIBDIR/libnventi.a
+LIB=$SLIB $LIBDIR/libventi.a
 
 HFILES=	dat.h\
 	fns.h\
@@ -73,10 +73,8 @@ it:V: $O.venti
 
 CLEANFILES=$CLEANFILES $SLIB
 
-<$PLAN9/src/cmd/mkmany
+<$PLAN9/src/mkmany
 
-CFLAGS=$CFLAGS -I.
-
 $SLIB: $LIBOFILES
 	ar rvc $SLIB $LIBOFILES