lobo/isync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make sure that entries with deleted placeholders are pruned

Browse Source 
we need to copy the S_DEL status bits when upgrading sync entries, so
that when a placeholder is flagged at the same time for both deletion
and upgrade, the entry pruning loop sees that the dummy message got
expunged.

note that we don't mask any bits, so the post-split entries may end up
with S_DEL for a zero UID - which doesn't matter.
This commit is contained in:
Oswald Buddenhagen 2022-04-14 14:30:25 +02:00
parent 0da273686f
commit eab4a12a63
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sync_state.c
View File

@ -615,7 +615,7 @@ upgrade_srec( sync_vars_t *svars, sync_rec_t *srec, int t )
// Mark the original entry for upgrade. // Mark the original entry for upgrade.
srec->status = (srec->status & ~(S_DUMMY(F) | S_DUMMY(N))) | S_PENDING | S_UPGRADE; srec->status = (srec->status & ~(S_DUMMY(F) | S_DUMMY(N))) | S_PENDING | S_UPGRADE;
// Mark the placeholder for nuking. // Mark the placeholder for nuking.
nsrec->status = S_PURGE; nsrec->status = S_PURGE | (srec->status & (S_DEL(F) | S_DEL(N)));
nsrec->aflags[t] = F_DELETED; nsrec->aflags[t] = F_DELETED;
return nsrec; return nsrec;
} }