vac: fix -m bug (Myron Cheung)
This commit is contained in:
parent
a1b61b4635
commit
9b3ac17050
2 changed files with 4 additions and 5 deletions
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue