@@ -1,3 +1,7 @@

+Tue Feb 15 19:19:31 CET 2011 (tk)

+---------------------------------

+ * sigtool/sigtool.c: improve handling of bytecode.info (bb#2292)

+

 Thu Apr 14 21:29:36 EEST 2011 (edwin)

 -------------------------------------

  * libclamav/others.c: make sure TLS key is initializer (bb #2588).

@@ -110,12 +110,6 @@ static const struct dblist_s {

     { NULL,	    0 }

 };

-struct dblist_scan

-{

-    char *name;

-    struct dblist_scan *next;

-};

-

 static const char *getdbname(const char *str)

 {

     if(strstr(str, "main"))

@@ -413,7 +407,7 @@ static char *sha256file(const char *file, unsigned int *size)

     return sha;

 }

-static int writeinfo(const char *dbname, const char *builder, const char *header, const struct optstruct *opts, const struct dblist_scan *dbl)

+static int writeinfo(const char *dbname, const char *builder, const char *header, const struct optstruct *opts, char * const *dblist2, unsigned int dblist2cnt)

 {

 	FILE *fh;

 	unsigned int i, bytes;

@@ -440,21 +434,20 @@ static int writeinfo(const char *dbname, const char *builder, const char *header

 	return -1;

     }

-    if(dbl) {

-	while(dbl) {

-	    if(!(pt = sha256file(dbl->name, &bytes))) {

+    if(dblist2cnt) {

+	for(i = 0; i < dblist2cnt; i++) {

+	    if(!(pt = sha256file(dblist2[i], &bytes))) {

 		mprintf("!writeinfo: Can't generate SHA256 for %s\n", file);

 		fclose(fh);

 		return -1;

 	    }

-	    if(fprintf(fh, "%s:%u:%s\n", dbl->name, bytes, pt) < 0) {

+	    if(fprintf(fh, "%s:%u:%s\n", dblist2[i], bytes, pt) < 0) {

 		mprintf("!writeinfo: Can't write to info file\n");

 		fclose(fh);

 		free(pt);

 		return -1;

 	    }

 	    free(pt);

-	    dbl = dbl->next;

 	}

     } else {

 	for(i = 0; dblist[i].name; i++) {

@@ -612,6 +605,11 @@ static int script2cdiff(const char *script, const char *builder, const struct op

     return 0;

 }

+static int qcompare(const void *a, const void *b)

+{

+    return strcmp(*(char * const *) a, *(char * const *) b);

+}

+

 static int build(const struct optstruct *opts)

 {

 	int ret, bc = 0;

@@ -627,17 +625,15 @@ static int build(const struct optstruct *opts)

 	time_t timet;

 	struct tm *brokent;

 	struct cl_cvd *oldcvd;

-	struct dblist_scan *dblist2 = NULL, *lspt;

+	char **dblist2 = NULL;

+	unsigned int dblist2cnt = 0;

 	DIR *dd;

 	struct dirent *dent;

-#define FREE_LS(x)	    \

-    while(x) {		    \

-	lspt = x;	    \

-	x = x->next;	    \

-	free(lspt->name);   \

-	free(lspt);	    \

-    }

+#define FREE_LS(x)		    \

+    for(i = 0; i < dblist2cnt; i++) \

+	free(x[i]);		    \

+    free(x);

     if(!optget(opts, "server")->enabled) {

 	mprintf("!build: --server is required for --build\n");

@@ -679,46 +675,42 @@ static int build(const struct optstruct *opts)

 	    while((dent = readdir(dd))) {

 		if(dent->d_ino) {

 		    if(cli_strbcasestr(dent->d_name, ".cbc")) {

-			lspt = (struct dblist_scan *) malloc(sizeof(struct dblist_scan));

-			if(!lspt) {

-			    FREE_LS(dblist2);

+			dblist2 = (char **) realloc(dblist2, (dblist2cnt + 1) * sizeof(char *));

+			if(!dblist2) { /* dblist2 leaked but we don't really care */

 			    mprintf("!build: Memory allocation error\n");

 			    return -1;

 			}

-			lspt->name = strdup(dent->d_name);

-			if(!lspt->name) {

+			dblist2[dblist2cnt] = strdup(dent->d_name);

+			if(!dblist2[dblist2cnt]) {

 			    FREE_LS(dblist2);

 			    mprintf("!build: Memory allocation error\n");

 			    return -1;

 			}

-			lspt->next = dblist2;

-			dblist2 = lspt;

-			entries++;

+			dblist2cnt++;

 		    }

 		}

 	    }

 	    closedir(dd);

+	    entries += dblist2cnt;

+	    qsort(dblist2, dblist2cnt, sizeof(char *), qcompare);

+

 	    if(!access("last.hdb", R_OK)) {

-		if(!dblist2) {

+		if(!dblist2cnt) {

 		    mprintf("!build: dblist2 == NULL (no .cbc files?)\n");

 		    return -1;

 		}

-		lspt = dblist2;

-		while(lspt->next)

-		    lspt = lspt->next;

-		lspt->next = (struct dblist_scan *) malloc(sizeof(struct dblist_scan));

-		if(!lspt->next) {

-		    FREE_LS(dblist2);

+		dblist2 = (char **) realloc(dblist2, (dblist2cnt + 1) * sizeof(char *));

+		if(!dblist2) {

 		    mprintf("!build: Memory allocation error\n");

 		    return -1;

 		}

-		lspt->next->name = strdup("last.hdb");

-		lspt->next->next = NULL;

-		if(!lspt->next->name) {

+		dblist2[dblist2cnt] = strdup("last.hdb");

+		if(!dblist2[dblist2cnt]) {

 		    FREE_LS(dblist2);

 		    mprintf("!build: Memory allocation error\n");

 		    return -1;

 		}

+		dblist2cnt++;

 		entries += countlines("last.hdb");

 	    }

 	} else {

@@ -831,7 +823,7 @@ static int build(const struct optstruct *opts)

     /* add current time */

     sprintf(header + strlen(header), ":%u", (unsigned int) timet);

-    if(writeinfo(dbname, builder, header, opts, dblist2) == -1) {

+    if(writeinfo(dbname, builder, header, opts, dblist2, dblist2cnt) == -1) {

 	mprintf("!build: Can't generate info file\n");

 	FREE_LS(dblist2);

 	return -1;

@@ -869,16 +861,14 @@ static int build(const struct optstruct *opts)

 	    FREE_LS(dblist2);

 	    return -1;

 	}

-	lspt = dblist2;

-	while(lspt) {

-	    if(tar_addfile(-1, tar, lspt->name) == -1) {

+	for(i = 0; i < dblist2cnt; i++) {

+	    if(tar_addfile(-1, tar, dblist2[i]) == -1) {

 		gzclose(tar);

 		unlink(tarfile);

 		free(tarfile);

 		FREE_LS(dblist2);

 		return -1;

 	    }

-	    lspt = lspt->next;

 	}

     } else {

 	for(i = 0; dblist[i].name; i++) {