commit b3732ebc60af9abe6d63bd6209ce367c56888766
Author: Oswald Buddenhagen <o...@users.sf.net>
Date: Sun Dec 29 11:52:26 2019 +0100
WIP: fix condition of seenuid calculation wrt. OPEN_*_SIZE
src/sync.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/sync.c b/src/sync.c
index a1ad215..d2273be 100644
--- a/src/sync.c
+++ b/src/sync.c
@@ -1375,7 +1375,9 @@ load_box( sync_vars_t *svars, int t, uint minwuid,
uint_array_t mexcs )
if (minwuid > svars->maxuid[t] + 1)
minwuid = svars->maxuid[t] + 1;
maxwuid = UINT_MAX;
- if (svars->opts[t] & (OPEN_OLD_IDS|OPEN_OLD_SIZE))
+ // XXX does this actually make sense given the nesting?
+ if ((svars->opts[t] & OPEN_OLD_IDS) ||
+ ((svars->opts[t] & OPEN_OLD_SIZE) !=
shifted_bit(svars->opts[t], OPEN_NEW_SIZE, OPEN_OLD_SIZE)))
seenuid = get_seenuid( svars, t );
else
seenuid = 0;
_______________________________________________
isync-devel mailing list
isync-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/isync-devel
