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

+Thu Jan  3 12:38:03 CET 2008 (tk)

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

+  * shared/misc.c, clamd/session.c: add support for .cld files (bb#745)

+

 Wed Jan  2 13:46:24 CET 2008 (acab)

   * libclamav/explode.c: big endian support

@@ -105,7 +105,6 @@ int command(int desc, const struct cl_engine *engine, const struct cl_limits *li

 	    const char *dbdir = cfgopt(copt, "DatabaseDirectory")->strarg;

 	    char *path;

 	    struct cl_cvd *daily;

-	    struct stat foo;

 	if(!(path = malloc(strlen(dbdir) + 30))) {

@@ -114,10 +113,10 @@ int command(int desc, const struct cl_engine *engine, const struct cl_limits *li

 	}

 	sprintf(path, "%s/daily.cvd", dbdir);

-	if(stat(path, &foo) == -1)

-	    sprintf(path, "%s/daily.inc/daily.info", dbdir);

+	if(access(path, R_OK))

+	    sprintf(path, "%s/daily.cld", dbdir);

-	if((daily = cl_cvdhead(path))) {

+	if(!access(path, R_OK) && (daily = cl_cvdhead(path))) {

 		time_t t = (time_t) daily->stime;

 	    pthread_mutex_lock(&ctime_mutex);

@@ -59,7 +59,6 @@ char *freshdbdir(void)

 	struct cl_cvd *d1, *d2;

 	struct cfgstruct *copt;

 	const struct cfgstruct *cpt;

-	struct stat foo;

 	const char *dbdir;

 	char *retdir;

@@ -71,13 +70,13 @@ char *freshdbdir(void)

 	    if(strcmp(dbdir, cpt->strarg)) {

 		    char *daily = (char *) malloc(strlen(cpt->strarg) + strlen(dbdir) + 30);

 		sprintf(daily, "%s/daily.cvd", cpt->strarg);

-		if(stat(daily, &foo) == -1)

-		    sprintf(daily, "%s/daily.inc/daily.info", cpt->strarg);

+		if(access(daily, R_OK))

+		    sprintf(daily, "%s/daily.cld", cpt->strarg);

 		if((d1 = cl_cvdhead(daily))) {

 		    sprintf(daily, "%s/daily.cvd", dbdir);

-		    if(stat(daily, &foo) == -1)

-			sprintf(daily, "%s/daily.inc/daily.info", dbdir);

+		    if(access(daily, R_OK))

+			sprintf(daily, "%s/daily.cld", dbdir);

 		    if((d2 = cl_cvdhead(daily))) {

 			free(daily);

@@ -106,10 +105,8 @@ char *freshdbdir(void)

 void print_version(void)

 {

-	char *dbdir;

-	char *path;

+	char *dbdir, *path;

 	struct cl_cvd *daily;

-	struct stat foo;

     dbdir = freshdbdir();

@@ -119,11 +116,11 @@ void print_version(void)

     }

     sprintf(path, "%s/daily.cvd", dbdir);

-    if(stat(path, &foo) == -1)

-	sprintf(path, "%s/daily.inc/daily.info", dbdir);

+    if(access(path, R_OK))

+	sprintf(path, "%s/daily.cld", dbdir);

     free(dbdir);

-    if((daily = cl_cvdhead(path))) {

+    if(!access(path, R_OK) && (daily = cl_cvdhead(path))) {

 	    time_t t = (time_t) daily->stime;

 	printf("ClamAV "VERSION_EXP"/%d/%s", daily->version, ctime(&t));