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

+Thu Aug 31 00:37:10 CEST 2006 (tk)

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

+  * freshclam: minor code cleanup

+

 Wed Aug 30 23:20:42 CEST 2006 (tk)

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

   * configure: check for socklen_t and define it if needed

@@ -57,7 +57,6 @@

 #include "misc.h"

 void help(void);

-void daemonize(void);

 short debug_mode = 0, logok = 0;

@@ -278,11 +277,12 @@ int main(int argc, char **argv)

 	exit(1);

     }

-

     /* fork into background */

-    if(!cfgopt(copt, "Foreground")->enabled)

+    if(!cfgopt(copt, "Foreground")->enabled) {

 	daemonize();

-    else

+	if(!debug_mode)

+	    chdir("/");

+    } else

         foreground = 1;

     if(tcpsock)

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

     logg_close();

     freecfg(copt);

+    return ret;

 }

 void help(void)

@@ -312,32 +313,3 @@ void help(void)

     exit(0);

 }

-void daemonize(void)

-{

-	int i;

-

-

-#ifdef C_OS2

-    return;

-#else

-

-    if((i = open("/dev/null", O_WRONLY)) == -1) {

-	logg("!Cannot open /dev/null. Only use Debug if Foreground is enabled.\n");

-	for(i = 0; i <= 2; i++)

-	    close(i);

-

-    } else {

-	close(0);

-	dup2(i, 1);

-	dup2(i, 2);

-    }

-

-    if(!debug_mode)

-	chdir("/");

-

-    if(fork())

-	exit(0);

-

-    setsid();

-#endif

-}

@@ -35,10 +35,8 @@ freshclam_SOURCES = \

     $(top_srcdir)/shared/cdiff.c \

     $(top_srcdir)/shared/cdiff.h \

     freshclam.c \

-    freshclam.h \

     manager.c \

     manager.h \

-    defaults.h \

     notify.c \

     notify.h \

     dns.c \

@@ -223,10 +223,8 @@ freshclam_SOURCES = \

     $(top_srcdir)/shared/cdiff.c \

     $(top_srcdir)/shared/cdiff.h \

     freshclam.c \

-    freshclam.h \

     manager.c \

     manager.h \

-    defaults.h \

     notify.c \

     notify.h \

     dns.c \

deleted file mode 100644

@@ -1,40 +0,0 @@

-/*

- *  Copyright (C) 2002 - 2005 Tomasz Kojm <tkojm@clamav.net>

- *

- *  This program is free software; you can redistribute it and/or modify

- *  it under the terms of the GNU General Public License as published by

- *  the Free Software Foundation; either version 2 of the License, or

- *  (at your option) any later version.

- *

- *  This program is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with this program; if not, write to the Free Software

- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

- *  MA 02110-1301, USA.

- */

-

-#ifndef DATADIR

-# define DATADIR "/usr/local/share/clamav"

-#endif

-

-#define VIRUSDBDIR DATADIR

-

-/* default names */

-

-#ifdef CLAMAVUSER

-#define UNPUSER CLAMAVUSER

-#else

-#define UNPUSER "clamav"

-#endif

-

-#ifdef CLAMAVGROUP

-#define UNPGROUP CLAMAVGROUP

-#else

-#define UNPGROUP "clamav"

-#endif

-

-#define CL_MAX_CHILDREN 5

@@ -32,8 +32,9 @@

 #include <resolv.h>

 #include <sys/types.h>

-#include "memory.h"

-#include "output.h"

+#include "shared/memory.h"

+#include "shared/output.h"

+

 #include "dns.h"

 #ifndef PACKETSZ

@@ -27,9 +27,9 @@

 #include <string.h>

 #include <errno.h>

-#include "defaults.h"

-#include "freshclam.h"

-#include "output.h"

+#include "shared/output.h"

+

+#define MAX_CHILDREN 5

 int active_children;

@@ -37,7 +37,7 @@ void execute( const char *type, const char *text )

 {

 	pid_t pid;

-	if ( active_children<CL_MAX_CHILDREN )

+	if ( active_children<MAX_CHILDREN )

 	switch( pid=fork() ) {

 	case 0:

 		if ( -1==system(text) )

@@ -40,19 +40,20 @@

 #include <syslog.h>

 #endif

-#include "options.h"

-#include "manager.h"

-#include "defaults.h"

-#include "freshclam.h"

-#include "output.h"

 #include "target.h"

-#include "misc.h"

+#include "clamav.h"

+

+#include "shared/options.h"

+#include "shared/output.h"

+#include "shared/misc.h"

+

 #include "execute.h"

+#include "manager.h"

 static short terminate = 0;

 extern int active_children;

-short foreground = 1;

+static short foreground = 1;

 static void daemon_sighandler(int sig) {

@@ -79,10 +80,11 @@ static void daemon_sighandler(int sig) {

     return;

 }

-

-static void writepid(char *pidfile) {

+static void writepid(char *pidfile)

+{

 	FILE *fd;

 	int old_umask;

+

     old_umask = umask(0006);

     if((fd = fopen(pidfile, "w")) == NULL) {

 	logg("!Can't save PID to file %s: %s\n", pidfile, strerror(errno));

@@ -93,14 +95,89 @@ static void writepid(char *pidfile) {

     umask(old_umask);

 }

+void help(void)

+{

+    mprintf_stdout = 1;

+

+    mprintf("\n");

+    mprintf("                   Clam AntiVirus: freshclam  "VERSION"\n");

+    mprintf("    (C) 2002 - 2005 ClamAV Team - http://www.clamav.net/team.html\n\n");

+

+    mprintf("    --help               -h              show help\n");

+    mprintf("    --version            -V              print version number and exit\n");

+    mprintf("    --verbose            -v              be verbose\n");

+    mprintf("    --debug                              enable debug messages\n");

+    mprintf("    --quiet                              only output error messages\n");

+    mprintf("    --stdout                             write to stdout instead of stderr\n");

+    mprintf("\n");

+    mprintf("    --config-file=FILE                   read configuration from FILE.\n");

+    mprintf("    --log=FILE           -l FILE         log into FILE\n");

+    mprintf("    --daemon             -d              run in daemon mode\n");

+    mprintf("    --pid=FILE           -p FILE         save daemon's pid in FILE\n");

+    mprintf("    --user=USER          -u USER         run as USER\n");

+    mprintf("    --no-dns                             force old non-DNS verification method\n");

+    mprintf("    --checks=#n          -c #n           number of checks per day, 1 <= n <= 50\n");

+    mprintf("    --datadir=DIRECTORY                  download new databases into DIRECTORY\n");

+#ifdef BUILD_CLAMD

+    mprintf("    --daemon-notify[=/path/clamd.conf]   send RELOAD command to clamd\n");

+#endif

+    mprintf("    --local-address=IP   -a IP           bind to IP for HTTP downloads\n");

+    mprintf("    --on-update-execute=COMMAND          execute COMMAND after successful update\n");

+    mprintf("    --on-error-execute=COMMAND           execute COMMAND if errors occured\n");

+    mprintf("    --on-outdated-execute=COMMAND        execute COMMAND when software is outdated\n");

+

+    mprintf("\n");

+}

+

+int download(const struct cfgstruct *copt, const struct optstruct *opt)

+{

+	int ret = 0, try = 0, maxattempts = 0;

+	struct cfgstruct *cpt;

+

+

+    maxattempts = cfgopt(copt, "MaxAttempts")->numarg;

+    logg("*Max retries == %d\n", maxattempts);

+

+    if(!(cpt = cfgopt(copt, "DatabaseMirror"))->enabled) {

+	logg("^You must specify at least one database mirror.\n");

+	return 56;

+    } else {

+

+	while(cpt) {

+	    ret = downloadmanager(copt, opt, cpt->strarg);

+	    alarm(0);

+

+	    if(ret == 52 || ret == 54 || ret == 58 || ret == 59) {

+		if(try < maxattempts - 1) {

+		    logg("Trying again in 5 secs...\n");

+		    try++;

+		    sleep(5);

+		    continue;

+		} else {

+		    logg("Giving up on %s...\n", cpt->strarg);

+		    cpt = (struct cfgstruct *) cpt->nextarg;

+		    if(!cpt) {

+			logg("^Update failed. Your network may be down or none of the mirrors listed in freshclam.conf is working.\n");

+		    }

+		    try = 0;

+		}

+

+	    } else {

+		return ret;

+	    }

+	}

+    }

+

+    return ret;

+}

+

 int main(int argc, char **argv)

 {

 	int ret = 52;

 	char *newdir, *cfgfile;

 	char *pidfile = NULL;

 	struct cfgstruct *copt, *cpt;

-	struct sigaction sigact;

-	struct sigaction oldact;

+	struct sigaction sigact, oldact;

 #if !defined(C_CYGWIN)  && !defined(C_OS2)

 	char *unpuser;

 	struct passwd *user;

@@ -142,8 +219,15 @@ int main(int argc, char **argv)

     }

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

-	opt_free(opt);

     	help();

+	opt_free(opt);

+	return 0;

+    }

+

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

+	print_version();

+	opt_free(opt);

+	return 0;

     }

     /* parse the config file */

@@ -181,44 +265,46 @@ int main(int argc, char **argv)

 #if !defined(C_CYGWIN)  && !defined(C_OS2)

     /* freshclam shouldn't work with root privileges */

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

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

 	unpuser = opt_arg(opt, "user");

-    } else if((cpt = cfgopt(copt, "DatabaseOwner"))->enabled) {

-	unpuser = cpt->strarg;

-    } else {

-	unpuser = UNPUSER;

-    }

+    else

+	unpuser = cfgopt(copt, "DatabaseOwner")->strarg;

     if(!geteuid()) {

 	if((user = getpwnam(unpuser)) == NULL) {

 	    logg("^Can't get information about user %s.\n", unpuser);

-	    exit(60); /* this is critical problem, so we just exit here */

+	    opt_free(opt);

+	    return 60;

 	}

 	if(cfgopt(copt, "AllowSupplementaryGroups")->enabled) {

 #ifdef HAVE_INITGROUPS

 	    if(initgroups(unpuser, user->pw_gid)) {

 		logg("^initgroups() failed.\n");

-		exit(61);

+		opt_free(opt);

+		return 61;

 	    }

 #endif

 	} else {

 #ifdef HAVE_SETGROUPS

 	    if(setgroups(1, &user->pw_gid)) {

 		logg("^setgroups() failed.\n");

-		exit(61);

+		opt_free(opt);

+		return 61;

 	    }

 #endif

 	}

 	if(setgid(user->pw_gid)) {

 	    logg("^setgid(%d) failed.\n", (int) user->pw_gid);

-	    exit(61);

+	    opt_free(opt);

+	    return 61;

 	}

 	if(setuid(user->pw_uid)) {

 	    logg("^setuid(%d) failed.\n", (int) user->pw_uid);

-	    exit(61);

+	    opt_free(opt);

+	    return 61;

 	}

     }

 #endif

@@ -237,11 +323,6 @@ int main(int argc, char **argv)

     if(opt_check(opt, "stdout"))

 	mprintf_stdout = 1;

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

-	print_version();

-	exit(0);

-    }

-

     /* initialize logger */

     if(cfgopt(copt, "LogVerbose")->enabled)

@@ -251,13 +332,15 @@ int main(int argc, char **argv)

 	logg_file = opt_arg(opt, "log");

 	if(logg("#--------------------------------------\n")) {

 	    mprintf("!Problem with internal logger (--log=%s).\n", logg_file);

-	    exit(62);

+	    opt_free(opt);

+	    return 62;

 	}

     } else if((cpt = cfgopt(copt, "UpdateLogFile"))->enabled) {

 	logg_file = cpt->strarg; 

 	if(logg("#--------------------------------------\n")) {

 	    mprintf("!Problem with internal logger (UpdateLogFile = %s).\n", logg_file);

-	    exit(62);

+	    opt_free(opt);

+	    return 62;

 	}

     } else

 	logg_file = NULL;

@@ -269,7 +352,8 @@ int main(int argc, char **argv)

 	if((cpt = cfgopt(copt, "LogFacility"))->enabled) {

 	    if((fac = logg_facility(cpt->strarg)) == -1) {

 		mprintf("!LogFacility: %s: No such facility.\n", cpt->strarg);

-		exit(62);

+		opt_free(opt);

+		return 62;

 	    }

 	}

@@ -286,11 +370,11 @@ int main(int argc, char **argv)

     if(chdir(newdir)) {

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

-	exit(50);

+	opt_free(opt);

+	return 50;

     } else

 	logg("*Current working dir is %s\n", newdir);

-

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

 	    int bigsleep, checks;

 	    time_t now, wakeup;

@@ -305,13 +389,15 @@ int main(int argc, char **argv)

 	if(checks <= 0) {

 	    logg("^Number of checks must be a positive integer.\n");

-	    exit(41);

+	    opt_free(opt);

+	    return 41;

 	}

 	if(!cfgopt(copt, "DNSDatabaseInfo")->enabled || opt_check(opt, "no-dns")) {

 	    if(checks > 50) {

 		logg("^Number of checks must be between 1 and 50.\n");

-		exit(41);

+		opt_free(opt);

+		return 41;

 	    }

 	}

@@ -320,6 +406,7 @@ int main(int argc, char **argv)

 	if(!cfgopt(copt, "Foreground")->enabled) {

             foreground = 0;

 	    daemonize();

+	    mprintf_disabled = 1;

         }

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

@@ -397,96 +484,3 @@ int main(int argc, char **argv)

     opt_free(opt);

     return(ret);

 }

-

-int download(const struct cfgstruct *copt, const struct optstruct *opt)

-{

-	int ret = 0, try = 0, maxattempts = 0;

-	struct cfgstruct *cpt;

-

-

-    maxattempts = cfgopt(copt, "MaxAttempts")->numarg;

-    logg("*Max retries == %d\n", maxattempts);

-

-    if(!(cpt = cfgopt(copt, "DatabaseMirror"))->enabled) {

-	logg("^You must specify at least one database mirror.\n");

-	return 56;

-    } else {

-

-	while(cpt) {

-	    ret = downloadmanager(copt, opt, cpt->strarg);

-	    alarm(0);

-

-	    if(ret == 52 || ret == 54 || ret == 58 || ret == 59) {

-		if(try < maxattempts - 1) {

-		    logg("Trying again in 5 secs...\n");

-		    try++;

-		    sleep(5);

-		    continue;

-		} else {

-		    logg("Giving up on %s...\n", cpt->strarg);

-		    cpt = (struct cfgstruct *) cpt->nextarg;

-		    if(!cpt) {

-			logg("^Update failed. Your network may be down or none of the mirrors listed in freshclam.conf is working.\n");

-		    }

-		    try = 0;

-		}

-

-	    } else {

-		return ret;

-	    }

-	}

-    }

-

-    return ret;

-}

-

-void daemonize(void)

-{

-	int i;

-

-    for(i = 0; i < 3; i++)

-	close(i);

-

-    umask(0);

-

-    if(fork())

-	exit(0);

-

-    setsid();

-    mprintf_disabled = 1;

-}

-

-void help(void)

-{

-    mprintf_stdout = 1;

-

-    mprintf("\n");

-    mprintf("                   Clam AntiVirus: freshclam  "VERSION"\n");

-    mprintf("    (C) 2002 - 2005 ClamAV Team - http://www.clamav.net/team.html\n\n");

-

-    mprintf("    --help               -h              show help\n");

-    mprintf("    --version            -V              print version number and exit\n");

-    mprintf("    --verbose            -v              be verbose\n");

-    mprintf("    --debug                              enable debug messages\n");

-    mprintf("    --quiet                              only output error messages\n");

-    mprintf("    --stdout                             write to stdout instead of stderr\n");

-    mprintf("\n");

-    mprintf("    --config-file=FILE                   read configuration from FILE.\n");

-    mprintf("    --log=FILE           -l FILE         log into FILE\n");

-    mprintf("    --daemon             -d              run in daemon mode\n");

-    mprintf("    --pid=FILE           -p FILE         save daemon's pid in FILE\n");

-    mprintf("    --user=USER          -u USER         run as USER\n");

-    mprintf("    --no-dns                             force old non-DNS verification method\n");

-    mprintf("    --checks=#n          -c #n           number of checks per day, 1 <= n <= 50\n");

-    mprintf("    --datadir=DIRECTORY                  download new databases into DIRECTORY\n");

-#ifdef BUILD_CLAMD

-    mprintf("    --daemon-notify[=/path/clamd.conf]   send RELOAD command to clamd\n");

-#endif

-    mprintf("    --local-address=IP   -a IP           bind to IP for HTTP downloads\n");

-    mprintf("    --on-update-execute=COMMAND          execute COMMAND after successful update\n");

-    mprintf("    --on-error-execute=COMMAND           execute COMMAND if errors occured\n");

-    mprintf("    --on-outdated-execute=COMMAND        execute COMMAND when software is outdated\n");

-

-    mprintf("\n");

-    exit(0);

-}

deleted file mode 100644

@@ -1,30 +0,0 @@

-/*

- *  Copyright (C) 2002 - 2005 Tomasz Kojm <tkojm@clamav.net>

- *

- *  This program is free software; you can redistribute it and/or modify

- *  it under the terms of the GNU General Public License as published by

- *  the Free Software Foundation; either version 2 of the License, or

- *  (at your option) any later version.

- *

- *  This program is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with this program; if not, write to the Free Software

- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

- *  MA 02110-1301, USA.

- */

-

-#ifndef __FRESHCLAM_H

-#define __FRESHCLAM_H

-

-#include "cfgparser.h"

-#include "options.h"

-

-void help(void);

-void daemonize(void);

-int download(const struct cfgstruct *copt, const struct optstruct *opt);

-

-#endif

@@ -531,7 +531,7 @@ static int getfile(const char *srcfile, const char *destfile, const char *hostna

     if(!strstr(buffer, "HTTP/1.1 200") && !strstr(buffer, "HTTP/1.0 200") &&

        !strstr(buffer, "HTTP/1.1 206") && !strstr(buffer, "HTTP/1.0 206")) {

 	logg("!getfile: Unknown response from remote server\n");

-	return NULL;

+	return 58;

     }

     /* get size of resource */

@@ -38,7 +38,7 @@

 #include <clamav.h>

 #include <errno.h>

-#include "output.h"

+#include "shared/output.h"

 #ifndef timercmp

 # define timercmp(a, b, cmp)          \

@@ -33,9 +33,8 @@

 #include <netdb.h>

 #include <string.h>

-#include "others.h"

-#include "cfgparser.h"

-#include "output.h"

+#include "shared/cfgparser.h"

+#include "shared/output.h"

 int notify(const char *cfgfile)

 {

@@ -20,7 +20,7 @@

 #ifndef __NOTIFY_H

 #define __NOTIFY_H

-#include "cfgparser.h"

+#include "shared/cfgparser.h"

 int notify(const char *cfgfile);

@@ -26,11 +26,11 @@

 #include <string.h>

 #include <ctype.h>

-#include "cfgparser.h"

-#include "memory.h"

-#include "misc.h"

+#include "shared/cfgparser.h"

+#include "shared/memory.h"

+#include "shared/misc.h"

-#include "../libclamav/str.h"

+#include "libclamav/str.h"

 struct cfgoption cfg_options[] = {

     {"LogFile",	OPT_STR, -1, NULL, 0, OPT_CLAMD},

@@ -90,7 +90,7 @@ struct cfgoption cfg_options[] = {

     {"ClamukoExcludePath", OPT_STR, 0, NULL, 0, OPT_CLAMD},

     {"ClamukoMaxFileSize", OPT_COMPSIZE, 5242880, NULL, 0, OPT_CLAMD},

     {"ClamukoScanArchive", OPT_BOOL, 0, NULL, 0, OPT_CLAMD},

-    {"DatabaseOwner", OPT_STR, -1, NULL, 0, OPT_FRESHCLAM},

+    {"DatabaseOwner", OPT_STR, -1, CLAMAVUSER, 0, OPT_FRESHCLAM},

     {"Checks", OPT_NUM, 12, NULL, 0, OPT_FRESHCLAM},

     {"UpdateLogFile", OPT_STR, -1, NULL, 0, OPT_FRESHCLAM},

     {"DNSDatabaseInfo", OPT_STR, -1, "current.cvd.clamav.net", 0, OPT_FRESHCLAM},

@@ -289,3 +289,28 @@ int cvd_unpack(const char *cvd, const char *destdir)

     return 0;

 }

+

+void daemonize(void)

+{

+	int i;

+

+#ifdef C_OS2

+    return;

+#else

+

+    if((i = open("/dev/null", O_WRONLY)) == -1) {

+	for(i = 0; i <= 2; i++)

+	    close(i);

+

+    } else {

+	close(0);

+	dup2(i, 1);

+	dup2(i, 2);

+    }

+

+    if(fork())

+	exit(0);

+

+    setsid();

+#endif

+}

@@ -29,5 +29,6 @@ int isnumb(const char *str);

 int rmdirs(const char *dirname);

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

 int cvd_unpack(const char *cvd, const char *destdir);

+void daemonize(void);

 #endif

@@ -93,7 +93,7 @@ int mdprintf(int desc, const char *str, ...)

     if(bytes == -1)

 	return bytes;

-    if(bytes >= sizeof(buff))

+    if(bytes >= (int) sizeof(buff))

 	bytes = sizeof(buff) - 1;

     return send(desc, buff, bytes, 0);