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

+Sun Jun 13 04:03:01 CEST 2004 (tk)

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

+  * freshclam, clamd: log version and platform information (requested by

+		      Tomasz Papszun <tomek*clamav.net>)

+

 Sat Jun 12 21:08:55 CEST 2004 (tk)

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

   * libclamav: mspack: fix bounds error (found by Nigel). Original author

@@ -26,6 +26,9 @@

  *

  * Change History:

  * $Log: clamav-milter.c,v $

+ * Revision 1.94  2004/06/13 02:11:25  kojm

+ * improve output

+ *

  * Revision 1.93  2004/06/08 21:44:59  nigelhorne

  * Ensure --from takes an argument

  *

@@ -290,7 +293,7 @@

  * Revision 1.6  2003/09/28 16:37:23  nigelhorne

  * Added -f flag use MaxThreads if --max-children not set

  */

-static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.93 2004/06/08 21:44:59 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.94 2004/06/13 02:11:25 kojm Exp $";

 #define	CM_VERSION	"0.72a"

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

 	/*

 	 * Sanity checks on the clamav configuration file

 	 */

-	if((copt = parsecfg(cfgfile)) == NULL) {

+	if((copt = parsecfg(cfgfile, 1)) == NULL) {

 		fprintf(stderr, "%s: Can't parse the config file %s\n",

 			argv[0], cfgfile);

 		return EX_CONFIG;

@@ -53,6 +53,7 @@

 #include "memory.h"

 #include "output.h"

 #include "shared.h"

+#include "target.h"

 void help(void);

 void daemonize(void);

@@ -102,7 +103,7 @@ void clamd(struct optstruct *opt)

     else

 	cfgfile = CL_DEFAULT_CFG;

-    if((copt = parsecfg(cfgfile)) == NULL) {

+    if((copt = parsecfg(cfgfile, 1)) == NULL) {

 	fprintf(stderr, "ERROR: Can't open/parse the config file %s\n", cfgfile);

 	exit(1);

     }

@@ -165,6 +166,8 @@ void clamd(struct optstruct *opt)

     }

 #endif

+    logg("clamd daemon "VERSION" (OS: "TARGET_OS_TYPE", ARCH: "TARGET_ARCH_TYPE", CPU: "TARGET_CPU_TYPE")\n");

+

     if(logg_size)

 	logg("Log file size limited to %d bytes.\n", logg_size);

     else

@@ -59,8 +59,8 @@ int client(const struct optstruct *opt)

     if(!clamav_conf)

 	clamav_conf = DEFAULT_CFG;

-    if((copt = parsecfg(clamav_conf)) == NULL) {

-	mprintf("@Can't parse configuration file.\n");

+    if((copt = parsecfg(clamav_conf, 1)) == NULL) {

+	mprintf("@Can't parse the configuration file.\n");

 	return 2;

     }

@@ -113,7 +113,7 @@ int scanmanager(const struct optstruct *opt)

     } else {

 	/* try to find fresh directory */

 	dbdir = cl_retdbdir();

-	if((copt = parsecfg(CONFDIR"/clamav.conf"))) {

+	if((copt = parsecfg(CONFDIR"/clamav.conf", 0))) {

 	    if((cpt = cfgopt(copt, "DatabaseDirectory")) || (cpt = cfgopt(copt, "DataDirectory"))) {

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

 			char *daily = (char *) mmalloc(strlen(cpt->strarg) + strlen(cl_retdbdir()) + 15);

@@ -43,6 +43,7 @@

 #include "defaults.h"

 #include "freshclam.h"

 #include "output.h"

+#include "target.h"

 static short terminate = 0;

@@ -108,11 +109,11 @@ int freshclam(struct optstruct *opt)

     /* parse the config file */

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

-	copt = parsecfg(cfgfile);

+	copt = parsecfg(cfgfile, 1);

     } else {

 	/* TODO: force strict permissions on freshclam.conf */

-	if((copt = parsecfg((cfgfile = CONFDIR"/freshclam.conf"))) == NULL)

-	    copt = parsecfg((cfgfile = CONFDIR"/clamav.conf"));

+	if((copt = parsecfg((cfgfile = CONFDIR"/freshclam.conf"), 1)) == NULL)

+	    copt = parsecfg((cfgfile = CONFDIR"/clamav.conf"), 1);

     }

     if(!copt) {

@@ -274,11 +275,13 @@ int freshclam(struct optstruct *opt)

 	if (pidfile) {

 	    writepid(pidfile);

 	}

-	logg("freshclam daemon started (pid=%d)\n", getpid());

+

+	logg("freshclam daemon "VERSION" (OS: "TARGET_OS_TYPE", ARCH: "TARGET_ARCH_TYPE", CPU: "TARGET_CPU_TYPE")\n");

 	sigaction(SIGTERM, &sigact, NULL);

 	sigaction(SIGHUP, &sigact, NULL);

 	sigaction(SIGINT, &sigact, NULL);

+

 	while(!terminate) {

 	    ret = download(copt, opt);

@@ -46,7 +46,7 @@ int notify(const char *cfgfile)

 	char *socktype;

-    if((copt = parsecfg(cfgfile)) == NULL) {

+    if((copt = parsecfg(cfgfile, 1)) == NULL) {

 	mprintf("@Clamd was NOT notified: Can't find or parse configuration file %s\n", cfgfile);

 	return 1;

     }

@@ -42,7 +42,7 @@ static int isnumb(const char *str)

     return 1;

 }

-struct cfgstruct *parsecfg(const char *cfgfile)

+struct cfgstruct *parsecfg(const char *cfgfile, int messages)

 {

 	char buff[LINE_LENGTH], *name, *arg;

 	FILE *fs;

@@ -131,7 +131,8 @@ struct cfgstruct *parsecfg(const char *cfgfile)

 	    continue;

 	if(!strncmp("Example", buff, 7)) {

-	    fprintf(stderr, "ERROR: Please edit the example config file %s.\n", cfgfile);

+	    if(messages)

+		fprintf(stderr, "ERROR: Please edit the example config file %s.\n", cfgfile);

 	    return NULL;

 	}

@@ -147,14 +148,16 @@ struct cfgstruct *parsecfg(const char *cfgfile)

 			switch(pt->argtype) {

 			    case OPT_STR:

 				if(!arg) {

-				    fprintf(stderr, "ERROR: Parse error at line %d: Option %s requires string as argument.\n", line, name);

+				    if(messages)

+					fprintf(stderr, "ERROR: Parse error at line %d: Option %s requires string as argument.\n", line, name);

 				    return NULL;

 				}

 				copt = regcfg(copt, name, arg, 0);

 				break;

 			    case OPT_FULLSTR:

 				if(!arg) {

-				    fprintf(stderr, "ERROR: Parse error at line %d: Option %s requires string as argument.\n", line, name);

+				    if(messages)

+					fprintf(stderr, "ERROR: Parse error at line %d: Option %s requires string as argument.\n", line, name);

 				    return NULL;

 				}

 				/* FIXME: this one is an ugly hack of the above case */

@@ -165,7 +168,8 @@ struct cfgstruct *parsecfg(const char *cfgfile)

 				break;

 			    case OPT_NUM:

 				if(!arg || !isnumb(arg)) {

-				    fprintf(stderr, "ERROR: Parse error at line %d: Option %s requires numerical argument.\n", line, name);

+				    if(messages)

+					fprintf(stderr, "ERROR: Parse error at line %d: Option %s requires numerical argument.\n", line, name);

 				    return NULL;

 				}

 				copt = regcfg(copt, name, NULL, atoi(arg));

@@ -173,7 +177,8 @@ struct cfgstruct *parsecfg(const char *cfgfile)

 				break;

 			    case OPT_COMPSIZE:

 				if(!arg) {

-				    fprintf(stderr, "ERROR: Parse error at line %d: Option %s requires argument.\n", line, name);

+				    if(messages)

+					fprintf(stderr, "ERROR: Parse error at line %d: Option %s requires argument.\n", line, name);

 				    return NULL;

 				}

 				ctype = tolower(arg[strlen(arg) - 1]);

@@ -181,7 +186,8 @@ struct cfgstruct *parsecfg(const char *cfgfile)

 				    char *cpy = (char *) mcalloc(strlen(arg), sizeof(char));

 				    strncpy(cpy, arg, strlen(arg) - 1);

 				    if(!isnumb(cpy)) {

-					fprintf(stderr, "ERROR: Parse error at line %d: Option %s requires numerical (raw/K/M) argument.\n", line, name);

+					if(messages)

+					    fprintf(stderr, "ERROR: Parse error at line %d: Option %s requires numerical (raw/K/M) argument.\n", line, name);

 					return NULL;

 				    }

 				    if(ctype == 'm')

@@ -191,7 +197,8 @@ struct cfgstruct *parsecfg(const char *cfgfile)

 				    free(cpy);

 				} else {

 				    if(!isnumb(arg)) {

-					fprintf(stderr, "ERROR: Parse error at line %d: Option %s requires numerical (raw/K/M) argument.\n", line, name);

+					if(messages)

+					    fprintf(stderr, "ERROR: Parse error at line %d: Option %s requires numerical (raw/K/M) argument.\n", line, name);

 					return NULL;

 				    }

 				    calc = atoi(arg);

@@ -201,7 +208,8 @@ struct cfgstruct *parsecfg(const char *cfgfile)

 				break;

 			    case OPT_NOARG:

 				if(arg) {

-				    fprintf(stderr, "ERROR: Parse error at line %d: Option %s doesn't support arguments (got '%s').\n", line, name, arg);

+				    if(messages)

+					fprintf(stderr, "ERROR: Parse error at line %d: Option %s doesn't support arguments (got '%s').\n", line, name, arg);

 				    return NULL;

 				}

 				copt = regcfg(copt, name, NULL, 0);

@@ -210,7 +218,8 @@ struct cfgstruct *parsecfg(const char *cfgfile)

 				copt = regcfg(copt, name, arg, 0);

 				break;

 			    default:

-				fprintf(stderr, "ERROR: Parse error at line %d: Option %s is of unknown type %d\n", line, name, pt->argtype);

+				if(messages)

+				    fprintf(stderr, "ERROR: Parse error at line %d: Option %s is of unknown type %d\n", line, name, pt->argtype);

 				free(name);

 				free(arg);

 				break;

@@ -221,7 +230,8 @@ struct cfgstruct *parsecfg(const char *cfgfile)

 	    } 

 	    if(!found) {

-		fprintf(stderr, "ERROR: Parse error at line %d: Unknown option %s.\n", line, name);

+		if(messages)

+		    fprintf(stderr, "ERROR: Parse error at line %d: Unknown option %s.\n", line, name);

 		return NULL;

 	    }

 	}

@@ -43,7 +43,7 @@ struct cfgstruct {

 };

-struct cfgstruct *parsecfg(const char *cfgfile);

+struct cfgstruct *parsecfg(const char *cfgfile, int messages);

 struct cfgstruct *regcfg(struct cfgstruct *copt, char *optname, char *strarg, int numarg);

@@ -486,7 +486,7 @@ const char *getdbdir(void)

     dbdir = cl_retdbdir();

-    if((copt = parsecfg(CONFDIR"/clamav.conf"))) {

+    if((copt = parsecfg(CONFDIR"/clamav.conf", 0))) {

 	if((cpt = cfgopt(copt, "DatabaseDirectory")) || (cpt = cfgopt(copt, "DataDirectory"))) {

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

 		char *daily = (char *) mmalloc(strlen(cpt->strarg) + strlen(cl_retdbdir()) + 15);