aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/vac/vac.c
diff options
context:
space:
mode:
authorRuss Cox <rsc@swtch.com>2008-07-02 15:39:13 -0400
committerRuss Cox <rsc@swtch.com>2008-07-02 15:39:13 -0400
commit9b3ac170501c1f1b50a8e7eaf39d68653b3bd72d (patch)
treef9cef604fb349d68021fc7edcf5b06afd92f927b /src/cmd/vac/vac.c
parenta1b61b4635adf4e070fdf91e3a512d94195214cd (diff)
downloadplan9port-9b3ac170501c1f1b50a8e7eaf39d68653b3bd72d.tar.gz
plan9port-9b3ac170501c1f1b50a8e7eaf39d68653b3bd72d.tar.bz2
plan9port-9b3ac170501c1f1b50a8e7eaf39d68653b3bd72d.zip
vac: fix -m bug (Myron Cheung)
Diffstat (limited to 'src/cmd/vac/vac.c')
-rw-r--r--src/cmd/vac/vac.c6
1 files changed, 3 insertions, 3 deletions
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;
}