bbs/deb-mbse
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed CRC error created by last mbdiff change

Browse Source
This commit is contained in:
Michiel Broek 2007-03-30 19:17:36 +00:00
parent e177571049
commit 23f4730614
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -28,6 +28,7 @@ v0.91.7 07-Mar-2007
mbdiff: mbdiff:
Wrote a lf instead of eof character as last character in the Wrote a lf instead of eof character as last character in the
new nodelist. new nodelist.
Fixed CRC error made by previous change.
mbnntp: mbnntp:
Suppress logging of passwords. Suppress logging of passwords.

24
mbfido/mbdiff.c
View File

@ -482,6 +482,7 @@ int apply(char *nl, char *nd, char *nn)
while ((rc == 0) && fgets(cmdbuf, sizeof(cmdbuf)-1, fd)) { while ((rc == 0) && fgets(cmdbuf, sizeof(cmdbuf)-1, fd)) {
switch (cmdbuf[0]) { switch (cmdbuf[0]) {
case '\032': break;
case ';': Striplf(cmdbuf); case ';': Striplf(cmdbuf);
break; break;
case 'A': count = atoi(cmdbuf+1); case 'A': count = atoi(cmdbuf+1);
@ -514,9 +515,14 @@ int apply(char *nl, char *nd, char *nn)
Striplf(cmdbuf); Striplf(cmdbuf);
for (i = 0; (i < count) && (rc == 0); i++) for (i = 0; (i < count) && (rc == 0); i++)
if (fgets(lnbuf, sizeof(lnbuf) - 1, fo)) { if (fgets(lnbuf, sizeof(lnbuf) - 1, fo)) {
/*
* Don't use EOF character for CRC test.
*/
if (lnbuf[0] != '\032') {
for (p = lnbuf; *p; p++) for (p = lnbuf; *p; p++)
mycrc = updcrc(*p, mycrc); mycrc = updcrc(*p, mycrc);
fputs(lnbuf, fn); fputs(lnbuf, fn);
}
} else } else
rc = 3; rc = 3;
break; break;
@ -539,15 +545,23 @@ int apply(char *nl, char *nd, char *nn)
if ((rc == 0) && (mycrc != theircrc)) if ((rc == 0) && (mycrc != theircrc))
rc = 4; rc = 4;
if (rc == 3) if (rc == 3) {
WriteError("Could not read some of the files"); WriteError("Could not read some of the files");
else if (rc == 4) if (!do_quiet)
printf("Could not read some of the files\n");
} else if (rc == 4) {
WriteError("CRC is %hu, should be %hu", mycrc, theircrc); WriteError("CRC is %hu, should be %hu", mycrc, theircrc);
else if (rc == 5) if (!do_quiet)
printf("CRC is %hu, should be %hu\n", mycrc, theircrc);
} else if (rc == 5) {
WriteError("Unknown input line: \"%s\"", cmdbuf); WriteError("Unknown input line: \"%s\"", cmdbuf);
else if (rc == 6) if (!do_quiet)
printf("Unknown input line: \"%s\"\n", cmdbuf);
} else if (rc == 6) {
WriteError("Diff does not match old list"); WriteError("Diff does not match old list");
else { if (!do_quiet)
printf("Diff does not match old list\n");
} else {
Syslog('+', "Copied %d, added %d, deleted %d, difference %d", cc, ac, dc, ac-dc); Syslog('+', "Copied %d, added %d, deleted %d, difference %d", cc, ac, dc, ac-dc);
if (!do_quiet) if (!do_quiet)
printf("Created new nodelist\n"); printf("Created new nodelist\n");