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

null-terminate lines read from state file & journal

Browse Source 
makes the subsequent code less convoluted.
This commit is contained in:
Oswald Buddenhagen 2016-11-13 22:19:40 +01:00
parent 879eb623be
commit 1330f43034
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/sync.c
View File

@ -734,10 +734,11 @@ load_state( sync_vars_t *svars )
gothdr: gothdr:
while (fgets( buf, sizeof(buf), jfp )) { while (fgets( buf, sizeof(buf), jfp )) {
line++; line++;
if (!(t = strlen( buf )) || buf[t - 1] != '\n') { if (!(t = strlen( buf )) || buf[--t] != '\n') {
error( "Error: incomplete sync state entry at %s:%d\n", svars->dname, line ); error( "Error: incomplete sync state entry at %s:%d\n", svars->dname, line );
goto jbail; goto jbail;
} }
buf[t] = 0;
fbuf[0] = 0; fbuf[0] = 0;
if (sscanf( buf, "%d %d %15s", &t1, &t2, fbuf ) < 2) { if (sscanf( buf, "%d %d %15s", &t1, &t2, fbuf ) < 2) {
error( "Error: invalid sync state entry at %s:%d\n", svars->dname, line ); error( "Error: invalid sync state entry at %s:%d\n", svars->dname, line );
@ -779,25 +780,27 @@ load_state( sync_vars_t *svars )
goto jbail; goto jbail;
if (!stat( svars->nname, &st ) && fgets( buf, sizeof(buf), jfp )) { if (!stat( svars->nname, &st ) && fgets( buf, sizeof(buf), jfp )) {
debug( "recovering journal ...\n" ); debug( "recovering journal ...\n" );
if (!(t = strlen( buf )) || buf[t - 1] != '\n') { if (!(t = strlen( buf )) || buf[--t] != '\n') {
error( "Error: incomplete journal header in %s\n", svars->jname ); error( "Error: incomplete journal header in %s\n", svars->jname );
goto jbail; goto jbail;
} }
if (!equals( buf, t, JOURNAL_VERSION "\n", strlen(JOURNAL_VERSION) + 1 )) { buf[t] = 0;
if (!equals( buf, t, JOURNAL_VERSION, strlen(JOURNAL_VERSION) )) {
error( "Error: incompatible journal version " error( "Error: incompatible journal version "
"(got %.*s, expected " JOURNAL_VERSION ")\n", t - 1, buf ); "(got %s, expected " JOURNAL_VERSION ")\n", buf );
goto jbail; goto jbail;
} }
srec = 0; srec = 0;
line = 1; line = 1;
while (fgets( buf, sizeof(buf), jfp )) { while (fgets( buf, sizeof(buf), jfp )) {
line++; line++;
if (!(t = strlen( buf )) || buf[t - 1] != '\n') { if (!(t = strlen( buf )) || buf[--t] != '\n') {
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;
} }
buf[t] = 0;
if ((c = 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 + 2)) :
c == '(' || c == ')' || c == '{' || c == '}' || c == '[' || c == ']' || c == '!' ? c == '(' || c == ')' || c == '{' || c == '}' || c == '[' || c == ']' || c == '!' ?
(sscanf( buf + 2, "%d", &t1 ) != 1) : (sscanf( buf + 2, "%d", &t1 ) != 1) :
c == '+' || c == '&' || c == '-' || c == '|' || c == '/' || c == '\\' ? c == '+' || c == '&' || c == '-' || c == '|' || c == '/' || c == '\\' ?