@@ -1,3 +1,8 @@

+Tue Jan 22 11:20:12 CET 2008 (tk)

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

+  * shared/misc.c, clamd, clamscan, freshclam: respect custom dbdir settings

+					       in print_version() (bb#699)

+

 Tue Jan 22 09:16:24 CET 2008 (tk)

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

   * clamd, clamdscan: drop support for direct fd passing (not maintained)

@@ -121,12 +121,6 @@ int main(int argc, char **argv)

 	return 1;

     }

-    if(opt_check(opt, "version")) {

-	print_version();

-	opt_free(opt);

-	return 0;

-    }

-

     if(opt_check(opt, "help")) {

     	help();

 	opt_free(opt);

@@ -156,6 +150,14 @@ int main(int argc, char **argv)

 	opt_free(opt);

 	return 1;

     }

+

+    if(opt_check(opt, "version")) {

+	print_version(cfgopt(copt, "DatabaseDirectory")->strarg);

+	opt_free(opt);

+	freecfg(copt);

+	return 0;

+    }

+

     opt_free(opt);

     umask(0);

@@ -104,8 +104,8 @@ int main(int argc, char **argv)

     }

     if(opt_check(opt, "version")) {

+	print_version(opt_arg(opt, "database"));

 	opt_free(opt);

-	print_version();

 	return 0;

     }

@@ -247,12 +247,6 @@ int main(int argc, char **argv)

 	return 0;

     }

-    if(opt_check(opt, "version")) {

-	print_version();

-	opt_free(opt);

-	return 0;

-    }

-

     /* parse the config file */

     if((cfgfile = opt_arg(opt, "config-file"))) {

 	copt = getcfg(cfgfile, 1);

@@ -268,6 +262,18 @@ int main(int argc, char **argv)

 	return 56;

     }

+    if(opt_check(opt, "datadir"))

+	newdir = opt_arg(opt, "datadir");

+    else

+	newdir = cfgopt(copt, "DatabaseDirectory")->strarg;

+

+    if(opt_check(opt, "version")) {

+	print_version(newdir);

+	opt_free(opt);

+	freecfg(copt);

+	return 0;

+    }

+

 #ifdef C_WINDOWS

     if(!pthread_win32_process_attach_np()) {

 	mprintf("!Can't start the win32 pthreads layer\n");

@@ -406,11 +412,6 @@ int main(int argc, char **argv)

 #endif

     /* change the current working directory */

-    if(opt_check(opt, "datadir"))

-	newdir = opt_arg(opt, "datadir");

-    else

-	newdir = cfgopt(copt, "DatabaseDirectory")->strarg;

-

     if(chdir(newdir)) {

 	logg("Can't change dir to %s\n", newdir);

 	opt_free(opt);

@@ -105,22 +105,35 @@ char *freshdbdir(void)

     return retdir;

 }

-void print_version(void)

+void print_version(const char *dbdir)

 {

-	char *dbdir, *path;

+	char *fdbdir, *path;

+	const char *pt;

 	struct cl_cvd *daily;

-    dbdir = freshdbdir();

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

-	free(dbdir);

+    if(dbdir)

+	pt = dbdir;

+    else

+	pt = fdbdir = freshdbdir();

+

+    if(!pt) {

+	printf("ClamAV "VERSION_EXP"\n");

+	return;

+    }

+

+    if(!(path = malloc(strlen(pt) + 11))) {

+	if(!dbdir)

+	    free(fdbdir);

 	return;

     }

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

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

     if(access(path, R_OK))

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

-    free(dbdir);

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

+

+    if(!dbdir)

+	free(fdbdir);

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

 	    time_t t = (time_t) daily->stime;

@@ -33,7 +33,7 @@

 #include "cfgparser.h"

 char *freshdbdir(void);

-void print_version(void);

+void print_version(const char *dbdir);

 int filecopy(const char *src, const char *dest);

 int isnumb(const char *str);

 int dircopy(const char *src, const char *dest);

@@ -1787,7 +1787,7 @@ int main(int argc, char **argv)

 	cl_debug();

     if(opt_check(opt, "version")) {

-	print_version();

+	print_version(NULL);

 	opt_free(opt);

 	return 0;

     }