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

+Wed Jan 19 00:48:48 CET 2005 (tk)

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

+  * improve OS/2 support (patch by Yuri Dario <mc6530*mclink.it>)

+

 Wed Jan 19 00:17:25 CET 2005 (tk)

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

   * zziplib/zzip-zip.c: fix possible small memory leak (thanks to Trog)

@@ -28,7 +32,7 @@ Wed Jan 12 08:58:29 GMT 2005 (njh)

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

   * clamav-milter:	Fixed DNS resolution error messages which could print

 		the incorrect hostname that is not being resolved. Patch from

-		Yar Tikhiy <yar@comp.chem.msu.su>

+		Yar Tikhiy <yar*comp.chem.msu.su>

 Tue Jan 11 20:24:36 CET 2005 (tk)

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

@@ -1,5 +1,5 @@

 /*

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

+ *  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

@@ -197,7 +197,8 @@ void clamd(struct optstruct *opt)

 	exit(1);

     }

-    /* drop priviledges */

+    /* drop privileges */

+#ifndef C_OS2

     if(geteuid() == 0 && (cpt = cfgopt(copt, "User"))) {

 	if((user = getpwnam(cpt->strarg)) == NULL) {

 	    fprintf(stderr, "ERROR: Can't get information about user %s.\n", cpt->strarg);

@@ -239,6 +240,7 @@ void clamd(struct optstruct *opt)

 	logg("Running as user %s (UID %d, GID %d)\n", cpt->strarg, user->pw_uid, user->pw_gid);

     }

+#endif

     /* set the temporary dir */

     if((cpt = cfgopt(copt, "TemporaryDirectory")))

@@ -1,5 +1,5 @@

 /*

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

+ *  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

@@ -228,7 +228,7 @@ int writen(int fd, void *buff, unsigned int count)

 /* Submitted by Richard Lyons <frob-clamav*webcentral.com.au> */

-#if defined(HAVE_RECVMSG) && (defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR)) && !defined(C_CYGWIN)

+#if defined(HAVE_RECVMSG) && (defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR)) && !defined(C_CYGWIN) && !defined(C_OS2)

 int readsock(int sockfd, char *buf, size_t size)

 {

@@ -1,5 +1,5 @@

 /*

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

+ *  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

@@ -31,7 +31,7 @@ int is_fd_connected(int fd);

 void virusaction(const char *virname, const struct cfgstruct *copt);

 int writen(int fd, void *buff, unsigned int count);

-#if defined(HAVE_RECVMSG) && (defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR)) && !defined(C_CYGWIN)

+#if defined(HAVE_RECVMSG) && (defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR)) && !defined(C_CYGWIN) && !defined(C_OS2)

 int readsock(int sockfd, char *buf, size_t size);

 #else

 #define	readsock	read

@@ -1,5 +1,5 @@

 /*

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

+ *  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

@@ -1,5 +1,5 @@

 /*

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

+ *  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

@@ -66,7 +66,11 @@ int dsresult(int sockd, const struct optstruct *opt)

 	FILE *fd;

+#ifndef C_OS2

     if((fd = fdopen(dup(sockd), "r")) == NULL) {

+#else /* FIXME: accoriding to YD OS/2 does not support dup() for sockets */

+    if((fd = fdopen(sockd, "r")) == NULL) {

+#endif

 	mprintf("@Can't open descriptor for reading.\n");

 	return -1;

     }

@@ -102,7 +106,9 @@ int dsresult(int sockd, const struct optstruct *opt)

 	}

     }

+#ifndef C_OS2 /* Small memory leak under OS/2 (see above) */

     fclose(fd);

+#endif

     return infected ? infected : (waserror ? -1 : 0);

 }

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

 /* njh@bandsman.co.uk: BeOS */

-#if !defined(C_CYGWIN) && !defined(C_BEOS)

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

     if(!geteuid()) {

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

 	    mprintf("@Can't get information about user "UNPUSER".\n");

@@ -1,6 +1,5 @@

 /*

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

- *			     Damien Curtain <damien@pagefault.org>

+ *  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

@@ -98,7 +97,7 @@ int freshclam(struct optstruct *opt)

 	struct cfgstruct *copt, *cpt;

 	struct sigaction sigact;

 	struct sigaction oldact;

-#ifndef C_CYGWIN

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

 	char *unpuser;

 	struct passwd *user;

 #endif

@@ -139,7 +138,7 @@ int freshclam(struct optstruct *opt)

 #endif

     }

-#ifndef C_CYGWIN

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

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

     if(optc(opt, 'u')) {

 	unpuser = getargc(opt, 'u');

@@ -1,5 +1,5 @@

 /*

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

+ *  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

@@ -861,13 +861,13 @@ int cl_statinidir(const char *dirname, struct cl_stat *dbstat)

 		dbstat->no++;

 		dbstat->stattab = (struct stat *) realloc(dbstat->stattab, dbstat->no * sizeof(struct stat));

-#if defined(CL_INTERIX) || defined(CL_OS2)

+#if defined(C_INTERIX) || defined(C_OS2)

 		dbstat->statdname = (char **) realloc(dbstat->statdname, dbstat->no * sizeof(char *));

 #endif

                 fname = cli_calloc(strlen(dirname) + strlen(dent->d_name) + 2, sizeof(char));

 		sprintf(fname, "%s/%s", dirname, dent->d_name);

-#if defined(CL_INTERIX) || defined(CL_OS2)

+#if defined(C_INTERIX) || defined(C_OS2)

 		dbstat->statdname[dbstat->no - 1] = (char *) calloc(strlen(dent->d_name) + 1, sizeof(char));

 		strcpy(dbstat->statdname[dbstat->no - 1], dent->d_name);

 #endif

@@ -934,7 +934,7 @@ int cl_statchkdir(const struct cl_stat *dbstat)

 		found = 0;

 		for(i = 0; i < dbstat->no; i++)

-#if defined(CL_INTERIX) || defined(CL_OS2)

+#if defined(C_INTERIX) || defined(C_OS2)

 		    if(!strcmp(dbstat->statdname[i], dent->d_name)) {

 #else

 		    if(dbstat->stattab[i].st_ino == sb.st_ino) {

@@ -963,7 +963,7 @@ int cl_statfree(struct cl_stat *dbstat)

     if(dbstat) {

-#if defined(CL_INTERIX) || defined(CL_OS2)

+#if defined(C_INTERIX) || defined(C_OS2)

 	    int i;

 	for(i = 0;i < dbstat->no; i++) {

@@ -29,7 +29,7 @@

 #include <stddef.h> /* size_t and friends */

 /* msvc6 has neither ssize_t (we assume "int") nor off_t (assume "long") */

-#ifdef CL_OS2

+#ifdef C_OS2

 #include <types.h>

 #endif