diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/vac/file.c | 3 | ||||
| -rw-r--r-- | src/cmd/vac/vac.c | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/cmd/vac/file.c b/src/cmd/vac/file.c index 407ccd81..f5f823d7 100644 --- a/src/cmd/vac/file.c +++ b/src/cmd/vac/file.c @@ -408,7 +408,6 @@ dirlookup(VacFile *f, char *elem) filefree(ff); goto Err; } -fprint(2, "offset %s %lld\n", ff->dir.elem, ff->dir.qidoffset); ff->qidoffset = f->qidoffset + ff->dir.qidoffset; vtfileunlock(meta); vtblockput(b); @@ -664,7 +663,7 @@ vacfilegetentries(VacFile *f, VtEntry *e, VtEntry *me) if(me){ if(f->msource == nil) memset(me, 0, sizeof *me); - if(getentry(f->msource, me) < 0){ + else if(getentry(f->msource, me) < 0){ filerunlock(f); return -1; } diff --git a/src/cmd/vac/vac.c b/src/cmd/vac/vac.c index e97951b8..183fa380 100644 --- a/src/cmd/vac/vac.c +++ b/src/cmd/vac/vac.c @@ -616,9 +616,9 @@ vacmerge(VacFile *fp, char *name) if(verbose) fprint(2, "merging %s\n", name); - de = vdeopen(fs->root); + mp = vacfsgetroot(mfs); + de = vdeopen(mp); if(de){ - mp = vacfsgetroot(mfs); offset = 0; if(vacfsgetmaxqid(mfs, &maxqid) >= 0){ _vacfsnextqid(fs, &offset); @@ -636,8 +636,8 @@ vacmerge(VacFile *fp, char *name) vdcleanup(&vd); } vdeclose(de); - vacfiledecref(mp); } + vacfiledecref(mp); vacfsclose(mfs); return 0; } |