@@ -1,3 +1,27 @@

+Tue Dec  2 23:41:04 CET 2003 (tk)

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

+  * New fixes from Thomas Lamy <Thomas.Lamy*in-online.net>:

+    + configure.in: check for memcpy()

+    + libclamav:

+      + cli_strtok(): more generic replacement for tok() and cli_tok()

+      + cli_enqueue(): return CL_EMEM on malloc problems

+      + cli_maketrans(): return cli_enqueue()s result

+      + cl_buildtrie(): same

+    + clamd:

+      + fixed memleaks in config file parsing

+      + replaced tok() with new and more general cli_strtok() in libclamav

+      + check return value of cl_buildtrie()

+    + clamscan:

+      + more than one filename may be given on cmdline

+      + check return value of cl_buildtrie()

+      + opt->filename cleanup

+    + examples/ex1.c: check return value of cl_buildtrie()

+    + other cosmetic fixes (removed unused variables, added missing includes)

+

+  * configure.in: define _REENTRANT on pthread compliant systems only (thanks

+		  to Nigel)

+  * clamd: usleep if there are no free sessions (thanks to Ed Phillips)

+

 Tue Dec  2 06:38:13 GMT 2003 (njh)

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

   * clamav-milter: use setsid if setpgrp not available

@@ -81,7 +81,7 @@ dnl there is now a CREATE_PREFIX_TARGET_H in this file as a shorthand for

 dnl PREFIX_CONFIG_H from a target.h file, however w/o the target.h ever created

 dnl (the prefix is a bit different, since we add an extra -target- and -host-)

 dnl 

-dnl @version: $Id: aclocal.m4,v 1.13 2003/12/01 22:55:35 kojm Exp $

+dnl @version: $Id: aclocal.m4,v 1.14 2003/12/02 22:48:56 kojm Exp $

 dnl @author Guido Draheim <guidod@gmx.de>                 STATUS: used often

 AC_DEFUN([AC_CREATE_TARGET_H],

@@ -4041,7 +4041,7 @@ dnl      AC_COMPILE_CHECK_SIZEOF(ptrdiff_t, $headers)

 dnl      AC_COMPILE_CHECK_SIZEOF(off_t, $headers)

 dnl

 dnl @author Kaveh Ghazi <ghazi@caip.rutgers.edu>

-dnl @version $Id: aclocal.m4,v 1.13 2003/12/01 22:55:35 kojm Exp $

+dnl @version $Id: aclocal.m4,v 1.14 2003/12/02 22:48:56 kojm Exp $

 dnl

 AC_DEFUN([AC_COMPILE_CHECK_SIZEOF],

 [changequote(<<, >>)dnl

@@ -25,6 +25,7 @@

 #include "cfgfile.h"

 #include "others.h"

 #include "defaults.h"

+#include "str.h"

 struct cfgstruct *parsecfg(const char *cfgfile)

@@ -103,8 +104,8 @@ struct cfgstruct *parsecfg(const char *cfgfile)

 	}

-	if((name = tok(buff, 1))) {

-	    arg = tok(buff, 2);

+	if((name = cli_strtok(buff, 0, " \r\n"))) {

+	    arg = cli_strtok(buff, 1, " \r\n");

 	    found = 0;

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

 		pt = &cfg_options[i];

@@ -137,6 +138,7 @@ struct cfgstruct *parsecfg(const char *cfgfile)

 				    return NULL;

 				}

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

+				free(arg);

 				break;

 			    case OPT_COMPSIZE:

 				if(!arg) {

@@ -164,10 +166,11 @@ struct cfgstruct *parsecfg(const char *cfgfile)

 				    calc = atoi(arg);

 				}

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

+				free(arg);

 				break;

 			    case OPT_NOARG:

 				if(arg) {

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

+				    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);

@@ -175,6 +178,11 @@ struct cfgstruct *parsecfg(const char *cfgfile)

 			    case OPT_OPTARG:

 				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);

+				free(name);

+				free(arg);

+				break;

 			}

 		    }

 		} else

@@ -221,44 +229,6 @@ void freecfg(struct cfgstruct *copt)

     return;

 }

-char *tok(const char *line, int field)

-{

-        int length, counter = 0, i, j = 0, k;

-        char *buffer;

-

-

-    length = strlen(line);

-    buffer = (char *) mcalloc(length, sizeof(char));

-

-    for(i = 0; i < length; i++) {

-        if(line[i] == ' ' || line[i] == '\n') {

-            counter++;

-            if(counter == field)

-		break;

-

-            for(k = 0; k < length; k++)

-		buffer[k] = 0;

-

-            j = 0;

-	    while((line[i+1] == ' ' || line[i+1] == '\n') && i < length)

-		i++;

-        } else {

-	    if(line[i] != ' ') {

-		buffer[j]=line[i];

-		j++;

-	    }

-	}

-    }

-

-    chomp(buffer); /* preventive */

-

-    if(strlen(buffer) == 0) {

-	free(buffer);

-	return NULL;

-    } else

-	return realloc(buffer, strlen(buffer) + 1);

-}

-

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

 {

 	struct cfgstruct *newnode, *pt;

@@ -304,3 +274,4 @@ struct cfgstruct *cfgopt(const struct cfgstruct *copt, const char *optname)

     return NULL;

 }

+

@@ -50,7 +50,6 @@ struct cfgstruct *parsecfg(const char *cfgfile);

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

 struct cfgstruct *cfgopt(const struct cfgstruct *copt, const char *optname);

-char *tok(const char *line, int field);

 void freecfg(struct cfgstruct *copt);

@@ -190,7 +190,11 @@ void clamd(struct optstruct *opt)

     }

     logg("Protecting against %d viruses.\n", virnum);

-    cl_buildtrie(root);

+    if((ret = cl_buildtrie(root)) != 0) {

+	fprintf(stderr, "ERROR: Database initialization error: %s\n", cl_strerror(ret));;

+	logg("!Database initialization error: %s\n", cl_strerror(ret));;

+	exit(1);

+    }

     /* fork into background */

@@ -31,6 +31,7 @@

 #include "options.h"

 #include "others.h"

+#include "../libclamav/others.h"

 void clamd(struct optstruct *opt);

@@ -58,6 +59,7 @@ int main(int argc, char **argv)

 #endif

     opt=(struct optstruct*)mmalloc(sizeof(struct optstruct));

     opt->optlist = NULL;

+    opt->filename = NULL;

     while(1) {

@@ -101,15 +103,13 @@ int main(int argc, char **argv)

 		strncat(opt->filename, " ", 1);

 	}

-    } else

-	/* FIXME !!! Without this, we have segfault */

-	opt->filename=(char*)mcalloc(1, sizeof(char));

-

+    }

     clamd(opt);

     free_opt(opt);

+    cli_dbgmsg("exit main()");

     return(0);

 }

@@ -299,10 +299,9 @@ void free_opt(struct optstruct *opt)

 {

 	struct optnode *handler, *prev;

-    if(!opt || !opt->optlist)

+    if(!opt)

 	return;

-    //mprintf("*Freeing option list... ");

     handler = opt->optlist;

     while(handler != NULL) {

@@ -314,7 +313,7 @@ void free_opt(struct optstruct *opt)

 	free(prev);

     }

-    free(opt->filename);

+    if(opt->filename)

+	free(opt->filename);

     free(opt);

-    //mprintf("*done\n");

 }

@@ -128,13 +128,13 @@ int logg(const char *str, ...)

 	if(*str == '!') {

 	    fprintf(log_fd, "ERROR: ");

-	    vfprintf(log_fd, ++str, args);

+	    vfprintf(log_fd, str+1, args);

 	} else if(*str == '^') {

 	    fprintf(log_fd, "WARNING: ");

-	    vfprintf(log_fd, ++str, args);

+	    vfprintf(log_fd, str+1, args);

 	} else if(*str == '*') {

 	    if(logverbose)

-		vfprintf(log_fd, ++str, args);

+		vfprintf(log_fd, str+1, args);

 	} else vfprintf(log_fd, str, args);

 	va_end(args);

@@ -159,12 +159,13 @@ int logg(const char *str, ...)

 	va_start(args, str);

 	if(*str == '!') {

-	    vsyslog(LOG_ERR,++str, args);

+	    vsyslog(LOG_ERR, str+1, args);

 	} else if(*str == '^') {

-	    vsyslog(LOG_WARNING,++str, args);

+	    vsyslog(LOG_WARNING, str+1, args);

 	} else if(*str == '*') {

-	    if(logverbose)

-		vsyslog(LOG_DEBUG, ++str, args);

+	    if(logverbose) {

+		vsyslog(LOG_DEBUG, str+1, args);

+	    }

 	} else vsyslog(LOG_INFO, str, args);

 	va_end(args);

@@ -16,8 +16,8 @@

  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

  */

-#ifndef __OTHERS_H

-#define __OTHERS_H

+#ifndef __CLAMD_OTHERS_H

+#define __CLAMD_OTHERS_H

 #include <stdlib.h>

 #include "cfgfile.h"

@@ -32,6 +32,7 @@ short int logverbose, logcompressed, loglock, logtime, sighup;

 int logsize;

 const char *logfile;

 int logg(const char *str, ...);

+void logg_close(void);

 #if defined(CLAMD_USE_SYSLOG) && !defined(C_AIX)

 short use_syslog;

@@ -86,8 +86,8 @@ int dirscan(const char *dirname, char **virname, unsigned long int *scanned, con

 				closedir(dd);

 				return 1;

 			    }

-			} else

-			    if(S_ISREG(statbuf.st_mode) || (S_ISLNK(statbuf.st_mode) && (checksymlink(fname) == 2) && cfgopt(copt, "FollowFileSymlinks")))

+			} else {

+			    if(S_ISREG(statbuf.st_mode) || (S_ISLNK(statbuf.st_mode) && (checksymlink(fname) == 2) && cfgopt(copt, "FollowFileSymlinks"))) {

 				if((scanret = cl_scanfile(fname, virname, scanned, root, limits, options)) == CL_VIRUS) {

 				    mdprintf(odesc, "%s: %s FOUND\n", fname, *virname);

 				    logg("%s: %s FOUND\n", fname, *virname);

@@ -102,18 +102,20 @@ int dirscan(const char *dirname, char **virname, unsigned long int *scanned, con

 				    mdprintf(odesc, "%s: %s ERROR\n", fname, cl_strerror(scanret));

 				    logg("%s: %s ERROR\n", fname, cl_strerror(scanret));

 				}

+			    }

+			}

 		    }

 		    free(fname);

 		}

 	    }

 	}

+	closedir(dd);

     } else {

 	return -1;

     }

     (*reclev)--;

-    closedir(dd);

     return ret;

 }

@@ -80,7 +80,7 @@ int acceptd = -1;

 int acceptloop_proc(int socketd, struct cl_node *root, const struct cfgstruct *copt)

 {

-	int i, j, bread, options = 0, maxwait, childs, *session, status,

+	int i, j, bread, options = 0, childs, *session, status,

 	    virnum, need_wait, ret;

 	struct cfgstruct *cpt;

 	struct cl_limits limits;

@@ -223,8 +223,10 @@ int acceptloop_proc(int socketd, struct cl_node *root, const struct cfgstruct *c

 		if(session[j] && waitpid(session[j], &status, WNOHANG))

 		    session[j] = 0;

-	    if(i == childs)

+	    if(i == childs) {

 		i = 0;

+		usleep(50000);

+	    }

 	    if(!session[i])

 		break;

@@ -289,7 +291,10 @@ int acceptloop_proc(int socketd, struct cl_node *root, const struct cfgstruct *c

 		    logg("!Database initialization problem.\n");

 		    exit(1);

 		} else {

-		    cl_buildtrie(root);

+		    if((ret = cl_buildtrie(root)) != 0) {

+			logg("!Database initialization error: can't build the trie: %s\n", cl_strerror(i));

+			exit(1);

+		    }

 		    /* check integrity */

 		    if(!testsignature(root)) {

 			logg("!Unable to detect test signature.\n");

@@ -61,7 +61,7 @@ void *threadscanner(void *arg)

 	struct thrarg *tharg = (struct thrarg *) arg;

 	char buff[32769];

 	sigset_t sigset;

-	int bread, options, maxwait = CL_DEFAULT_MAXWHILEWAIT;

+	int bread, options;

     /* ignore all signals */

@@ -343,7 +343,10 @@ void *threadwatcher(void *arg)

 		logg("!Database initialization problem.\n");

 		kill(progpid, SIGTERM);

 	    } else {

-		cl_buildtrie(*thwarg->root);

+		if((ret = cl_buildtrie(*thwarg->root)) != 0) {

+		    logg("!Database initialization error: can't build the trie: %s\n", cl_strerror(ret));

+		    kill(progpid, SIGTERM);

+		}

 		/* check integrity */

 		if(!testsignature(*thwarg->root)) {

 		    logg("!Unable to detect test signature.\n");

@@ -562,8 +565,10 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop

 	/* find a free session */

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

-	    if(i == threads)

+	    if(i == threads) {

 		i = 0;

+		usleep(50000);

+	    }

 	    if(!ths[i].active) {

 		/* logg("*Found free slot: %d\n", i); */

@@ -623,12 +628,16 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop

 	}

     }

     free(ths);

+    return 0;

 }

 void sighandler_th(int sig)

 {

 	time_t currtime;

-	int maxwait = CL_DEFAULT_MAXWHILEWAIT * 5, i;

+	int maxwait = CL_DEFAULT_MAXWHILEWAIT * 5;

+#ifndef CL_DEBUG

+	int i;

+#endif

     switch(sig) {

 	case SIGINT:

@@ -21,9 +21,11 @@

 #include <sys/types.h>

 #include <sys/socket.h>

 #include <netinet/in.h>

+#include <arpa/inet.h>

 #include <clamav.h>

 #include <errno.h>

+

 #include "options.h"

 #include "cfgfile.h"

 #include "defaults.h"

@@ -44,7 +46,7 @@ int tcpserver(const struct optstruct *opt, const struct cfgstruct *copt, struct

     server.sin_port = htons(cfgopt(copt, "TCPSocket")->numarg);

-    if (taddr = cfgopt(copt, "TCPAddr"))

+    if((taddr = cfgopt(copt, "TCPAddr")))

     {

 	server.sin_addr.s_addr = inet_addr( taddr->strarg );

     }else

@@ -27,6 +27,7 @@

 #include "others.h"

 #include "shared.h"

 #include "defaults.h"

+#include "client.h"

 void help(void);

@@ -38,7 +38,6 @@ int client(const struct optstruct *opt)

 	int sockd, wsockd, loopw = 60, bread, port;

 	const char *clamav_conf = getargl(opt, "config-file");

 	FILE *fd;

-int bw;

     if(!clamav_conf)

 	clamav_conf = DEFAULT_CFG;

@@ -41,6 +41,8 @@

 #include "treewalk.h"

 #include "shared.h"

 #include "mbox.h"

+#include "str.h"

+#include "strrcpy.h"

 #ifdef C_LINUX

 dev_t procdev;

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

     }

     /* build the proper trie */

-    cl_buildtrie(trie);

+    if((ret=cl_buildtrie(trie)) != 0) {

+	mprintf("@Database initialization error: %s\n", cl_strerror(ret));;

+	return 50;

+    }

     /* set (default) limits */

@@ -149,7 +154,16 @@ int scanmanager(const struct optstruct *opt)

 #endif

     /* check filetype */

-    if(!strcmp(opt->filename, "-")) { /* read data from stdin */

+    if(opt->filename == NULL || strlen(opt->filename) == 0) {

+

+	/* we need full path for some reasons (eg. archive handling) */

+	if(!getcwd(cwd, 200)) {

+	    mprintf("@Can't get absolute pathname of current working directory.\n");

+	    ret = 57;

+	} else

+	    ret = scandirs(cwd, trie, user, opt, limits);

+

+    } else if(!strcmp(opt->filename, "-")) { /* read data from stdin */

 	/*

 	 * njh@bandsman.co.uk: treat the input as a mailbox, the program

 	 * can then be used as a filter called when mail is received

@@ -212,60 +226,57 @@ int scanmanager(const struct optstruct *opt)

 	} else

 	    ret = checkstdin(trie, limits);

-    } else if(strlen(opt->filename) == 0) {

-

-	/* we need full path for some reasons (eg. archive handling) */

-	if(!getcwd(cwd, 200)) {

-	    mprintf("@Can't get absolute pathname of current working directory.\n");

-	    ret = 57;

-	} else

-	    ret = scandirs(cwd, trie, user, opt, limits);

-

-    } else if((fmodeint = fileinfo(opt->filename, 2)) == -1) {

-               mprintf("@Can't access file %s\n", opt->filename);

-               perror(opt->filename);

-               ret = 56;

     } else {

-	fmode = (mode_t) fmodeint;

-

-        if(compression && (opt->filename[0] != '/')) {

-	    /* we need to complete the path */

-            if(!getcwd(cwd, 200)) {

-		mprintf("@Can't get absolute pathname of current working directory.\n");

-                return 57;

-            } else {

-		fullpath = mcalloc(512, sizeof(char));

+	int x;

+	char *thefilename;

+	for (x=0; (thefilename = cli_strtok(opt->filename, x, "\t")) != NULL; x++) {

+	    if((fmodeint = fileinfo(thefilename, 2)) == -1) {

+		mprintf("@Can't access file %s\n", thefilename);

+		perror(thefilename);

+		ret = 56;

+	    } else {

+		fmode = (mode_t) fmodeint;

+

+		if(compression && (thefilename[0] != '/')) {

+		    /* we need to complete the path */

+		    if(!getcwd(cwd, 200)) {

+			mprintf("@Can't get absolute pathname of current working directory.\n");

+			return 57;

+		    } else {

+			fullpath = mcalloc(512, sizeof(char));

 #ifdef NO_SNPRINTF

-                sprintf(fullpath, "%s/%s", cwd, opt->filename);

+			sprintf(fullpath, "%s/%s", cwd, thefilename);

 #else

-                snprintf(fullpath, 512, "%s/%s", cwd, opt->filename);

+			snprintf(fullpath, 512, "%s/%s", cwd, thefilename);

 #endif

-                mprintf("*Full path: %s\n", fullpath);

-            }

-        } else

-	    fullpath = (char *) opt->filename;

+			mprintf("*Full path: %s\n", fullpath);

+		    }

+		} else

+		    fullpath = (char *) thefilename;

-        switch(fmode & S_IFMT) {

-	    case S_IFREG:

-		ret = scanfile(fullpath, trie, user, opt, limits);

-                break;

+		switch(fmode & S_IFMT) {

+		    case S_IFREG:

+			ret = scanfile(fullpath, trie, user, opt, limits);

+			break;

-            case S_IFDIR:

-		ret = scandirs(fullpath, trie, user, opt, limits);

-                break;

+		    case S_IFDIR:

+			ret = scandirs(fullpath, trie, user, opt, limits);

+			break;

-            default:

-                mprintf("@Not supported file type (%s)\n", opt->filename);

-                ret = 52;

-	}

+		    default:

+			mprintf("@Not supported file type (%s)\n", thefilename);

+			ret = 52;

+		}

-	if(compression && fullpath) {

-	    free(fullpath);

-	    fullpath = NULL;

+		if(compression && thefilename[0] != '/') {

+		    free(fullpath);

+		    fullpath = NULL;

+		}

+	    }

+	    free(thefilename);

 	}

     }

-

     /* free the trie */

     cl_freetrie(trie);

@@ -127,16 +127,14 @@ int main(int argc, char **argv)

         for(i=optind; i<argc; i++) {

 	    strncat(opt->filename, argv[i], strlen(argv[i]));

 	    if(i != argc-1)

-		strncat(opt->filename, " ", 1);

+		strncat(opt->filename, "\t", 1);

 	}

-    } else

-	/* FIXME !!! Without this, we have segfault */

-	opt->filename=(char*)mcalloc(1, sizeof(char));

-

-

+    }

     clamscan(opt);

+    free_opt(opt);

+

     return(0);

 }

@@ -323,10 +321,9 @@ void free_opt(struct optstruct *opt)

 {

 	struct optnode *handler, *prev;

-    if(!opt || !opt->optlist)

+    if(!opt)

 	return;

-    mprintf("*Freeing option list... ");

     handler = opt->optlist;

     while(handler != NULL) {

@@ -338,7 +335,7 @@ void free_opt(struct optstruct *opt)

 	free(prev);

     }

-    free(opt->filename);

+    if (opt->filename)

+    	free(opt->filename);

     free(opt);

-    mprintf("*done\n");

 }

@@ -8619,7 +8619,8 @@ fi

 fi

-for ac_func in setsid

+

+for ac_func in setsid memcpy

 do

 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

 echo "$as_me:$LINENO: checking for $ac_func" >&5

@@ -9130,11 +9131,6 @@ fi

 if test "${enable_pthreads+set}" = set; then

   enableval="$enable_pthreads"

   have_pthreads=no

-else

-  cat >>confdefs.h <<\_ACEOF

-#define _REENTRANT 1

-_ACEOF

-

 fi;

 # Check whether --enable-cr or --disable-cr was given.

@@ -9335,6 +9331,10 @@ _ACEOF

 #define CL_THREAD_SAFE 1

 _ACEOF

+	cat >>confdefs.h <<\_ACEOF

+#define _REENTRANT 1

+_ACEOF

+

 	CLAMD_LIBS="-lpthread"

 	if test "$want_clamuko" = "yes"; then

 	    cat >>confdefs.h <<\_ACEOF

@@ -9362,6 +9362,10 @@ _ACEOF

 #define CL_THREAD_SAFE 1

 _ACEOF

+	cat >>confdefs.h <<\_ACEOF

+#define _REENTRANT 1

+_ACEOF

+

     fi

     ;;

 solaris*)

@@ -9374,6 +9378,10 @@ solaris*)

 #define CL_THREAD_SAFE 1

 _ACEOF

+	cat >>confdefs.h <<\_ACEOF

+#define _REENTRANT 1

+_ACEOF

+

     fi

     cat >>confdefs.h <<\_ACEOF

 #define C_SOLARIS 1

@@ -9389,6 +9397,10 @@ freebsd*)

 #define CL_THREAD_SAFE 1

 _ACEOF

+	cat >>confdefs.h <<\_ACEOF

+#define _REENTRANT 1

+_ACEOF

+

     fi

     cat >>confdefs.h <<\_ACEOF

 #define C_BSD 1

@@ -9408,6 +9420,10 @@ openbsd*)

 #define CL_THREAD_SAFE 1

 _ACEOF

+	cat >>confdefs.h <<\_ACEOF

+#define _REENTRANT 1

+_ACEOF

+

     fi

     cat >>confdefs.h <<\_ACEOF

 #define C_BSD 1

@@ -9469,6 +9485,10 @@ hpux*)

 #define CL_THREAD_SAFE 1

 _ACEOF

+	cat >>confdefs.h <<\_ACEOF

+#define _REENTRANT 1

+_ACEOF

+

     fi

     cat >>confdefs.h <<\_ACEOF

 #define C_HPUX 1

@@ -9484,6 +9504,10 @@ aix*)

 #define CL_THREAD_SAFE 1

 _ACEOF

+	cat >>confdefs.h <<\_ACEOF

+#define _REENTRANT 1

+_ACEOF

+

     fi

     cat >>confdefs.h <<\_ACEOF

 #define C_AIX 1

@@ -9499,6 +9523,10 @@ irix*)

 #define CL_THREAD_SAFE 1

 _ACEOF

+	cat >>confdefs.h <<\_ACEOF

+#define _REENTRANT 1

+_ACEOF

+

     fi

     cat >>confdefs.h <<\_ACEOF

 #define C_IRIX 1

@@ -74,7 +74,7 @@ then

     AC_CHECK_LIB(bz2, bzReadOpen, AC_DEFINE(NOBZ2PREFIX),)

 fi

-AC_CHECK_FUNCS(setsid)

+AC_CHECK_FUNCS(setsid memcpy)

 AC_FUNC_SETPGRP

 have_milter="no"

@@ -101,7 +101,7 @@ dnl AC_CHECK_LIB(c, mkstemp, AC_DEFINE(HAVE_MKSTEMP),)

 AC_ARG_ENABLE(pthreads,

 [  --disable-pthreads      Disable POSIX threads support],

-have_pthreads=no, AC_DEFINE(_REENTRANT))

+have_pthreads=no, )

 AC_ARG_ENABLE(cr,

 [  --disable-cr      Don't link with C reentrant library (BSD) ],

@@ -220,6 +220,7 @@ linux*)

 	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"

 	TH_SAFE="-thread-safe"

 	AC_DEFINE(CL_THREAD_SAFE)

+	AC_DEFINE(_REENTRANT)

 	CLAMD_LIBS="-lpthread"

 	if test "$want_clamuko" = "yes"; then

 	    AC_DEFINE(CLAMUKO)

@@ -239,6 +240,7 @@ cygwin*)

 	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"

 	TH_SAFE="-thread-safe"

 	AC_DEFINE(CL_THREAD_SAFE)

+	AC_DEFINE(_REENTRANT)

     fi

     ;;

 solaris*)

@@ -248,6 +250,7 @@ solaris*)

 	CLAMD_LIBS="-lpthread -lsocket -lnsl -lresolv"

 	TH_SAFE="-thread-safe"

 	AC_DEFINE(CL_THREAD_SAFE)

+	AC_DEFINE(_REENTRANT)

     fi

     AC_DEFINE(C_SOLARIS)

     ;;

@@ -257,6 +260,7 @@ freebsd*)

 	CLAMD_LIBS="-pthread -lc_r"

 	TH_SAFE="-thread-safe"

 	AC_DEFINE(CL_THREAD_SAFE)

+	AC_DEFINE(_REENTRANT)

     fi

     AC_DEFINE(C_BSD)

     ;;

@@ -270,6 +274,7 @@ openbsd*)

 	fi

 	TH_SAFE="-thread-safe"

 	AC_DEFINE(CL_THREAD_SAFE)

+	AC_DEFINE(_REENTRANT)

     fi

     AC_DEFINE(C_BSD)

     ;;

@@ -307,6 +312,7 @@ hpux*)

 	CLAMD_LIBS="-lpthread"

 	TH_SAFE="-thread-safe"

 	AC_DEFINE(CL_THREAD_SAFE)

+	AC_DEFINE(_REENTRANT)

     fi

     AC_DEFINE(C_HPUX)

     ;;

@@ -316,6 +322,7 @@ aix*)

 	CLAMD_LIBS="-lpthread"

 	TH_SAFE="-thread-safe"

 	AC_DEFINE(CL_THREAD_SAFE)

+	AC_DEFINE(_REENTRANT)

     fi

     AC_DEFINE(C_AIX)

     ;;

@@ -325,6 +332,7 @@ irix*)

 	CLAMD_LIBS="-lpthread"

 	TH_SAFE="-thread-safe"

 	AC_DEFINE(CL_THREAD_SAFE)

+	AC_DEFINE(_REENTRANT)

     fi

     AC_DEFINE(C_IRIX)

     AC_DEFINE(NO_SNPRINTF)

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

     printf("Loaded %d signatures.\n", no);

     /* build the trie */

-    cl_buildtrie(root);

+    if((ret = cl_buildtrie(root)) != 0) {

+	printf("Database initialization error: %s\n", cl_strerror(ret));;

+	exit(2);

+    }

     if((fd = open(argv[1], O_RDONLY)) == -1) {

 	printf("Can't open file %s\n", argv[1]);

@@ -39,7 +39,7 @@

 #define TIMEOUT 1200

-void freshclam(struct optstruct *opt)

+int freshclam(struct optstruct *opt)

 {

 	int ret;

 	char *newdir;

@@ -154,8 +154,7 @@ void freshclam(struct optstruct *opt)

 	if(ret > 1)

 	    system(getargl(opt, "on-error-execute"));

-    exit(ret);

-

+    return(ret);

 }

 void d_timeout(int sig)

@@ -103,13 +103,12 @@ int main(int argc, char **argv)

 		strncat(opt->filename, " ", 1);

 	}

-    } else

-	/* FIXME !!! Without this, we have segfault */

-	opt->filename=(char*)mcalloc(1, sizeof(char));

-

+    }

     freshclam(opt);

+    free_opt(opt);

+

     return(0);

 }

@@ -216,10 +215,10 @@ void free_opt(struct optstruct *opt)

 {

 	struct optnode *handler, *prev;

-    if(!opt || !opt->optlist)

+    if(!opt)

 	return;

-    mprintf("*Freeing option list... ");

+    mprintf("*Freeing option list...");

     handler = opt->optlist;