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

use a temporary for sanity

Browse Source
This commit is contained in:
Oswald Buddenhagen 2016-11-05 18:16:43 +01:00
parent ae95490d52
commit 5b0c8cfa60
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/sync.c
View File

@ -682,6 +682,7 @@ load_state( sync_vars_t *svars )
char *s; char *s;
FILE *jfp; FILE *jfp;
int line, t, t1, t2, t3; int line, t, t1, t2, t3;
char c;
struct stat st; struct stat st;
char fbuf[16]; /* enlarge when support for keywords is added */ char fbuf[16]; /* enlarge when support for keywords is added */
char buf[128], buf1[64], buf2[64]; char buf[128], buf1[64], buf2[64];
@ -796,31 +797,31 @@ load_state( sync_vars_t *svars )
error( "Error: incomplete journal entry at %s:%d\n", svars->jname, line ); error( "Error: incomplete journal entry at %s:%d\n", svars->jname, line );
goto jbail; goto jbail;
} }
if (buf[0] == '#' ? if ((c = buf[0]) == '#' ?
(t3 = 0, (sscanf( buf + 2, "%d %d %n", &t1, &t2, &t3 ) < 2) || !t3 || (t - t3 != TUIDL + 3)) : (t3 = 0, (sscanf( buf + 2, "%d %d %n", &t1, &t2, &t3 ) < 2) || !t3 || (t - t3 != TUIDL + 3)) :
buf[0] == '(' || buf[0] == ')' || buf[0] == '{' || buf[0] == '}' || buf[0] == '!' ? c == '(' || c == ')' || c == '{' || c == '}' || c == '!' ?
(sscanf( buf + 2, "%d", &t1 ) != 1) : (sscanf( buf + 2, "%d", &t1 ) != 1) :
buf[0] == '+' || buf[0] == '&' || buf[0] == '-' || buf[0] == '|' || buf[0] == '/' || buf[0] == '\\' ? c == '+' || c == '&' || c == '-' || c == '|' || c == '/' || c == '\\' ?
(sscanf( buf + 2, "%d %d", &t1, &t2 ) != 2) : (sscanf( buf + 2, "%d %d", &t1, &t2 ) != 2) :
(sscanf( buf + 2, "%d %d %d", &t1, &t2, &t3 ) != 3)) (sscanf( buf + 2, "%d %d %d", &t1, &t2, &t3 ) != 3))
{ {
error( "Error: malformed journal entry at %s:%d\n", svars->jname, line ); error( "Error: malformed journal entry at %s:%d\n", svars->jname, line );
goto jbail; goto jbail;
} }
if (buf[0] == '(') if (c == '(')
svars->maxuid[M] = t1; svars->maxuid[M] = t1;
else if (buf[0] == ')') else if (c == ')')
svars->maxuid[S] = t1; svars->maxuid[S] = t1;
else if (buf[0] == '{') else if (c == '{')
svars->newuid[M] = t1; svars->newuid[M] = t1;
else if (buf[0] == '}') else if (c == '}')
svars->newuid[S] = t1; svars->newuid[S] = t1;
else if (buf[0] == '!') else if (c == '!')
svars->smaxxuid = t1; svars->smaxxuid = t1;
else if (buf[0] == '|') { else if (c == '|') {
svars->uidval[M] = t1; svars->uidval[M] = t1;
svars->uidval[S] = t2; svars->uidval[S] = t2;
} else if (buf[0] == '+') { } else if (c == '+') {
srec = nfmalloc( sizeof(*srec) ); srec = nfmalloc( sizeof(*srec) );
srec->uid[M] = t1; srec->uid[M] = t1;
srec->uid[S] = t2; srec->uid[S] = t2;
@ -848,7 +849,7 @@ load_state( sync_vars_t *svars )
goto jbail; goto jbail;
syncfnd: syncfnd:
debugn( " entry(%d,%d,%u) ", srec->uid[M], srec->uid[S], srec->flags ); debugn( " entry(%d,%d,%u) ", srec->uid[M], srec->uid[S], srec->flags );
switch (buf[0]) { switch (c) {
case '-': case '-':
debug( "killed\n" ); debug( "killed\n" );
if (srec->msg[M]) if (srec->msg[M])