purge handling of pending sync entries from state file

these cannot actually end up in the committed state.

amends bd5fb6ff.
This commit is contained in:
Oswald Buddenhagen 2020-07-04 16:13:50 +02:00
parent d93726067d
commit b514d9ddbc

View File

@ -703,7 +703,7 @@ save_state( sync_vars_t *svars )
continue; continue;
make_flags( srec->flags, fbuf ); make_flags( srec->flags, fbuf );
Fprintf( svars->nfp, "%u %u %s%s\n", srec->uid[M], srec->uid[S], Fprintf( svars->nfp, "%u %u %s%s\n", srec->uid[M], srec->uid[S],
(srec->status & S_SKIPPED) ? "^" : (srec->status & S_PENDING) ? "!" : (srec->status & S_EXPIRED) ? "~" : "", fbuf ); (srec->status & S_SKIPPED) ? "^" : (srec->status & S_EXPIRED) ? "~" : "", fbuf );
} }
Fclose( svars->nfp, 1 ); Fclose( svars->nfp, 1 );
@ -799,28 +799,19 @@ load_state( sync_vars_t *svars )
if (*s == '^') { if (*s == '^') {
s++; s++;
srec->status = S_SKIPPED; srec->status = S_SKIPPED;
} else if (*s == '!') {
s++;
srec->status = S_PENDING;
} else if (*s == '~' || *s == 'X' /* Pre-1.3 legacy */) { } else if (*s == '~' || *s == 'X' /* Pre-1.3 legacy */) {
s++; s++;
srec->status = S_EXPIRE | S_EXPIRED; srec->status = S_EXPIRE | S_EXPIRED;
} else if (srec->uid[M] == (uint)-1) { // Pre-1.3 legacy } else if (srec->uid[M] == (uint)-1) { // Pre-1.3 legacy
srec->uid[M] = 0; srec->uid[M] = 0;
srec->status = S_SKIPPED; srec->status = S_SKIPPED;
} else if (srec->uid[M] == (uint)-2) {
srec->uid[M] = 0;
srec->status = S_PENDING;
} else if (srec->uid[S] == (uint)-1) { } else if (srec->uid[S] == (uint)-1) {
srec->uid[S] = 0; srec->uid[S] = 0;
srec->status = S_SKIPPED; srec->status = S_SKIPPED;
} else if (srec->uid[S] == (uint)-2) {
srec->uid[S] = 0;
srec->status = S_PENDING;
} }
srec->flags = parse_flags( s ); srec->flags = parse_flags( s );
debug( " entry (%u,%u,%u,%s)\n", srec->uid[M], srec->uid[S], srec->flags, debug( " entry (%u,%u,%u,%s)\n", srec->uid[M], srec->uid[S], srec->flags,
(srec->status & S_SKIPPED) ? "SKIP" : (srec->status & S_PENDING) ? "FAIL" : (srec->status & S_EXPIRED) ? "XPIRE" : "" ); (srec->status & S_SKIPPED) ? "SKIP" : (srec->status & S_EXPIRED) ? "XPIRE" : "" );
*svars->srecadd = srec; *svars->srecadd = srec;
svars->srecadd = &srec->next; svars->srecadd = &srec->next;
svars->nsrecs++; svars->nsrecs++;