Browse code

update

git-svn: trunk@2133

Tomasz Kojm authored on 2006/07/27 22:25:50
Showing 1 changed files
... ...
@@ -321,7 +321,7 @@ static int build(struct optstruct *opt)
321 321
 {
322 322
 	int ret, inc = 1;
323 323
 	size_t bytes;
324
-	unsigned int sigs = 0, lines = 0, version, real_header;
324
+	unsigned int sigs = 0, oldsigs = 0, lines = 0, version, real_header;
325 325
 	struct stat foo;
326 326
 	char buffer[FILEBUFF], *tarfile, *gzfile, header[513], smbuff[32],
327 327
 	     builder[32], *pt, *dbname, olddb[512], patch[32], broken[32];
... ...
@@ -364,7 +364,6 @@ static int build(struct optstruct *opt)
364 364
     if(!sigs) {
365 365
 	mprintf("!build: There are no signatures in database files\n");
366 366
     } else {
367
-	mprintf("Signatures: %d\n", sigs);
368 367
 	lines = countlines("main.db") + countlines("daily.db") +
369 368
 		countlines("main.hdb") + countlines("daily.hdb") +
370 369
 		countlines("main.ndb") + countlines("daily.ndb") +
... ...
@@ -404,6 +403,7 @@ static int build(struct optstruct *opt)
404 404
 
405 405
     if(oldcvd) {
406 406
 	version = oldcvd->version + 1;
407
+	oldsigs = oldcvd->sigs;
407 408
 	cl_cvdfree(oldcvd);
408 409
     } else {
409 410
 	fflush(stdin);
... ...
@@ -411,6 +411,10 @@ static int build(struct optstruct *opt)
411 411
 	scanf("%u", &version);
412 412
     }
413 413
 
414
+    mprintf("Total sigs: %u\n", sigs);
415
+    if(sigs > oldsigs)
416
+	mprintf("New sigs: %u\n", sigs - oldsigs);
417
+
414 418
     strcpy(header, "ClamAV-VDB:");
415 419
 
416 420
     /* time */
... ...
@@ -1261,7 +1265,7 @@ static int verifycdiff(const char *diff, const char *cvd, const char *incdir)
1261 1261
 	if(cvd)
1262 1262
 	    mprintf("Verification: %s correctly applies to %s\n", diff, cvd);
1263 1263
 	else
1264
-	    mprintf("Verification: %s correctly applies to the previous version\n");
1264
+	    mprintf("Verification: %s correctly applies to the previous version\n", diff);
1265 1265
     }
1266 1266
 
1267 1267
     return ret;