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

+Wed Mar 11 21:11:03 EET 2009 (edwin)

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

+ * clamav-milter/, clamd/, libclamav/, sigtool/, unit_tests/: 

+ strerror/strerror_r->cli_strerror which is always thread safe.

+

 Wed Mar 11 19:18:15 CET 2009 (acab)

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

  * libclamav: changed some warning texts (bb#1456)

@@ -45,14 +45,7 @@

 #include "libclamav/others.h"

 #include "netcode.h"

-#ifdef HAVE_STRERROR_R

-#define strerror_print(msg) \

-	strerror_r(errno, er, sizeof(er)); \

-	logg(msg": %s\n", er);

-#else

-#define strerror_print(msg) \

-	logg(msg"\n");

-#endif

+#define strerror_print(msg) logg(msg": %s\n", cli_strerror(errno, er, sizeof(er)))

 enum {

     NON_SMTP,

@@ -610,16 +610,11 @@ int fds_poll_recv(struct fd_data *data, int timeout, int check_signals)

 #endif

     if (retval == -1 && errno != EINTR) {

-	char buff[BUFFSIZE + 1];

-#ifdef HAVE_STRERROR_R

-	strerror_r(errno, buff, BUFFSIZE);

-#else

-	buff[0] = '\0';

-#endif

+	char err[128];

 #ifdef HAVE_POLL

-	logg("!poll_recv_fds: poll failed: %s\n", buff);

+	logg("!poll_recv_fds: poll failed: %s\n", cli_strerror(errno, err, sizeof(err)));

 #else

-	logg("!poll_recv_fds: select failed: %s\n", buff);

+	logg("!poll_recv_fds: select failed: %s\n", cli_strerror(errno, err, sizeof(err)));

 #endif

     }

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

 #include "clamav-config.h"

 #endif

-#ifdef C_LINUX

-/* We want XSI compliant strerror_r, not GNU one.*/

-#define _XOPEN_SOURCE 600

-#endif

-

 #include <stdio.h>

 #include <stdlib.h>

 #include <string.h>

@@ -172,14 +167,10 @@ int conn_reply_error(const client_conn_t *conn, const char *msg)

 int conn_reply_errno(const client_conn_t *conn, const char *path,

 		     const char *msg)

 {

-    char buf[BUFFSIZE + sizeof(". ERROR")];

-#ifdef HAVE_STRERROR_R

-    strerror_r(errno, buf, BUFFSIZE-1);

-    strcat(buf, ". ERROR");

-#else

-    snprintf(buf, sizeof(buf), "%u. ERROR", errno);

-#endif

-    return conn_reply(conn, path, msg, buf);

+    char err[BUFFSIZE + sizeof(". ERROR")];

+    cli_strerror(errno, err, BUFFSIZE-1);

+    strcat(err, ". ERROR");

+    return conn_reply(conn, path, msg, err);

 }

 /* returns

@@ -706,6 +706,7 @@ static int in_iconv_u16(const m_area_t* in_m_area, iconv_t* iconv_struct, m_area

 	char*  input   = (char*)in_m_area->buffer + in_m_area->offset;

 	size_t outleft = out_m_area->length > 0 ? out_m_area->length : 0;

 	char* out      = (char*)out_m_area->buffer;

+	char err[128];

 	out_m_area->offset = 0;

 	if(!inleft) {

@@ -734,7 +735,7 @@ static int in_iconv_u16(const m_area_t* in_m_area, iconv_t* iconv_struct, m_area

 				/* not enough space in output buffer */

 				break;

 			}

-			cli_dbgmsg(MODULE_NAME "iconv error:%s\n", strerror(errno));

+			cli_dbgmsg(MODULE_NAME "iconv error:%s\n", cli_strerror(errno, err, sizeof(err)));

 		} else if(outleft == outleft_last) {

 			cli_dbgmsg(MODULE_NAME "iconv stall (no output)\n");

 		} else {

@@ -135,6 +135,7 @@ CLAMAV_PRIVATE {

     sha256_update;

     sha256_final;

     cli_url_canon;

+    cli_strerror;

   local:

     *;

 };

@@ -3744,8 +3744,9 @@ rfc1341(message *m, const char *dir)

 		struct stat statb;

 		if(stat(pdir, &statb) < 0) {

+			char err[128];

 			cli_errmsg("Partial directory %s: %s\n", pdir,

-				strerror(errno));

+				cli_strerror(errno, err, sizeof(err)));

 			free(id);

 			return -1;

 		}

@@ -4566,6 +4567,7 @@ nonblock_connect(SOCKET sock, const struct sockaddr_in *sin, const char *hostnam

 	struct timeval timeout;	/* When we should time out */

 	int numfd;		/* Highest fdset fd plus 1 */

 	long flags;

+	char err[128];

 	gettimeofday(&timeout, 0);	/* store when we started to connect */

@@ -4576,9 +4578,9 @@ nonblock_connect(SOCKET sock, const struct sockaddr_in *sin, const char *hostnam

 	flags = fcntl(sock, F_GETFL, 0);

 	if(flags == -1L)

-		cli_dbgmsg("getfl: %s\n", strerror(errno));

+		cli_dbgmsg("getfl: %s\n", cli_strerror(errno, err, sizeof(err)));

 	else if(fcntl(sock, F_SETFL, (long)(flags | O_NONBLOCK)) < 0)

-		cli_dbgmsg("setfl: %s\n", strerror(errno));

+		cli_dbgmsg("setfl: %s\n", cli_strerror(errno, err, sizeof(err)));

 #else

 	flags = -1L;

 #endif

@@ -4587,17 +4589,17 @@ nonblock_connect(SOCKET sock, const struct sockaddr_in *sin, const char *hostnam

 			case EALREADY:

 			case EINPROGRESS:

 				cli_dbgmsg("%s: connect: %s\n", hostname,

-					strerror(errno));

+					cli_strerror(errno, err, sizeof(err)));

 				break; /* wait for connection */

 			case EISCONN:

 				return 0; /* connected */

 			default:

 				cli_dbgmsg("%s: connect: %s\n",

-					hostname, strerror(errno));

+					hostname, cli_strerror(errno, err, sizeof(err)));

 #ifdef	F_SETFL

 				if(flags != -1L)

 					if(fcntl(sock, F_SETFL, flags))

-						cli_dbgmsg("f_setfl: %s\n", strerror(errno));

+						cli_dbgmsg("f_setfl: %s\n", cli_strerror(errno, err, sizeof(err)));

 #endif

 				return -1; /* failed */

 		}

@@ -4605,7 +4607,7 @@ nonblock_connect(SOCKET sock, const struct sockaddr_in *sin, const char *hostnam

 #ifdef	F_SETFL

 		if(flags != -1L)

 			if(fcntl(sock, F_SETFL, flags))

-				cli_dbgmsg("f_setfl: %s\n", strerror(errno));

+				cli_dbgmsg("f_setfl: %s\n", cli_strerror(errno, err, sizeof(err)));

 #endif

 		return connect_error(sock, hostname);

 	}

@@ -4647,7 +4649,7 @@ nonblock_connect(SOCKET sock, const struct sockaddr_in *sin, const char *hostnam

 		n = select(numfd, 0, &fds, 0, &waittime);

 		if(n < 0) {

 			cli_dbgmsg("%s: select attempt %d %s\n",

-				hostname, select_failures, strerror(errno));

+				hostname, select_failures, cli_strerror(errno, err, sizeof(err)));

 			if(--select_failures >= 0)

 				continue; /* not timed-out, try again */

 			break; /* failed */

@@ -4659,7 +4661,7 @@ nonblock_connect(SOCKET sock, const struct sockaddr_in *sin, const char *hostnam

 #ifdef	F_SETFL

 			if(flags != -1L)

 				if(fcntl(sock, F_SETFL, flags))

-					cli_dbgmsg("f_setfl: %s\n", strerror(errno));

+					cli_dbgmsg("f_setfl: %s\n", cli_strerror(errno, err, sizeof(err)));

 #endif

 			return connect_error(sock, hostname);

 		}

@@ -4674,7 +4676,7 @@ nonblock_connect(SOCKET sock, const struct sockaddr_in *sin, const char *hostnam

 #ifdef	F_SETFL

 	if(flags != -1L)

 		if(fcntl(sock, F_SETFL, flags))

-			cli_dbgmsg("f_setfl: %s\n", strerror(errno));

+			cli_dbgmsg("f_setfl: %s\n", cli_strerror(errno, err, sizeof(err)));

 #endif

 	return -1; /* failed */

 }

@@ -4682,6 +4684,7 @@ nonblock_connect(SOCKET sock, const struct sockaddr_in *sin, const char *hostnam

 static int

 connect_error(SOCKET sock, const char *hostname)

 {

+        char err[128];

 #ifdef	SO_ERROR

 	int optval;

 	socklen_t optlen = sizeof(optval);

@@ -4689,7 +4692,7 @@ connect_error(SOCKET sock, const char *hostname)

 	getsockopt(sock, SOL_SOCKET, SO_ERROR, &optval, &optlen);

 	if(optval) {

-		cli_dbgmsg("%s: %s\n", hostname, strerror(optval));

+		cli_dbgmsg("%s: %s\n", hostname, cli_strerror(optval, err, sizeof(err)));

 		return -1;

 	}

 #endif

@@ -668,7 +668,8 @@ int cli_gentempfd(const char *dir, char **name, int *fd)

      * errors

      */

    if(*fd == -1) {

-	cli_errmsg("cli_gentempfd: Can't create temporary file %s: %s\n", *name, strerror(errno));

+        char err[128];

+	cli_errmsg("cli_gentempfd: Can't create temporary file %s: %s\n", *name, cli_strerror(errno, err, sizeof(err)));

 	free(*name);

 	return CL_ECREAT;

     }

@@ -682,7 +683,8 @@ int cli_gentempfd(const char *dir, char **name, int *fd)

 int cli_unlink(const char *pathname)

 {

 	if (unlink(pathname)==-1) {

-	    cli_warnmsg("cli_unlink: failure - %s\n", strerror(errno));

+	    char err[128];

+	    cli_warnmsg("cli_unlink: failure - %s\n", cli_strerror(errno, err, sizeof(err)));

 	    return 1;

 	}

 	return 0;

@@ -705,10 +707,11 @@ cli_rmdirs(const char *name)

 	    char b[offsetof(struct dirent, d_name) + NAME_MAX + 1];

 	} result;

 #endif

+	char err[128];

     if(stat(name, &statb) < 0) {

-	cli_warnmsg("cli_rmdirs: Can't locate %s: %s\n", name, strerror(errno));

+	cli_warnmsg("cli_rmdirs: Can't locate %s: %s\n", name, cli_strerror(errno, err, sizeof(err)));

 	return -1;

     }

@@ -753,7 +756,7 @@ cli_rmdirs(const char *name)

     closedir(dd);

     if(rmdir(name) < 0) {

-	cli_errmsg("cli_rmdirs: Can't remove temporary directory %s: %s\n", name, strerror(errno));

+	cli_errmsg("cli_rmdirs: Can't remove temporary directory %s: %s\n", name, cli_strerror(errno, err, sizeof(err)));

 	return -1;

     }

@@ -772,6 +775,7 @@ int cli_rmdirs(const char *dirname)

 #endif

 	struct stat maind, statbuf;

 	char *path;

+	char err[128];

     chmod(dirname, 0700);

@@ -779,7 +783,7 @@ int cli_rmdirs(const char *dirname)

 	while(stat(dirname, &maind) != -1) {

 	    if(!rmdir(dirname)) break;

 	    if(errno != ENOTEMPTY && errno != EEXIST && errno != EBADF) {

-		cli_errmsg("cli_rmdirs: Can't remove temporary directory %s: %s\n", dirname, strerror(errno));

+		cli_errmsg("cli_rmdirs: Can't remove temporary directory %s: %s\n", dirname, cli_strerror(errno, err, sizeof(err)));

 		closedir(dd);

 		return -1;

 	    }

@@ -437,4 +437,5 @@ typedef int (*cli_ftw_cb)(struct stat *stat_buf, char *filename, const char *pat

  */

 int cli_ftw(char *base, int flags, int maxdepth, cli_ftw_cb callback, struct cli_ftw_cbdata *data);

+const char *cli_strerror(int errnum, char* buf, size_t len);

 #endif

@@ -76,7 +76,9 @@

 # ifndef HAVE_CTIME_R

 static pthread_mutex_t cli_ctime_mutex = PTHREAD_MUTEX_INITIALIZER;

 # endif

-

+#ifndef HAVE_STRERROR_R

+static pthread_mutex_t cli_strerror_mutex = PTHREAD_MUTEX_INITIALIZER;

+#endif

 #endif

 uint8_t cli_debug_flag = 0;

@@ -296,10 +298,11 @@ int cli_readn(int fd, void *buff, unsigned int count)

                         return (count - todo);

                 }

                 if (retval < 0) {

+			char err[128];

 			if (errno == EINTR) {

 				continue;

 			}

-			cli_errmsg("cli_readn: read error: %s\n", strerror(errno));

+			cli_errmsg("cli_readn: read error: %s\n", cli_strerror(errno, err, sizeof(err)));

                         return -1;

                 }

                 todo -= retval;

@@ -326,10 +329,11 @@ int cli_writen(int fd, const void *buff, unsigned int count)

         do {

                 retval = write(fd, current, todo);

                 if (retval < 0) {

+			char err[128];

 			if (errno == EINTR) {

 				continue;

 			}

-			cli_errmsg("cli_writen: write error: %s\n", strerror(errno));

+			cli_errmsg("cli_writen: write error: %s\n", cli_strerror(errno, err, sizeof(err)));

                         return -1;

                 }

                 todo -= retval;

@@ -679,3 +683,25 @@ static int cli_ftw_dir(const char *dirname, int flags, int maxdepth, cli_ftw_cb

     }

     return ret;

 }

+

+/* strerror_r is not available everywhere, (and when it is there are two variants,

+ * the XSI, and the GNU one, so provide a wrapper to make sure correct one is

+ * used */

+const char* cli_strerror(int errnum, char *buf, size_t len)

+{

+#ifdef HAVE_STRERROR_R

+    if (strerror_r(errnum, buf, len) == -1)

+	return "strerror_r failed";

+    return buf;

+#else

+    {

+	char *err;

+	pthread_mutex_lock(&cli_strerror_mutex);

+	err = strerror(errnum);

+	strncpy(buf, err, len);

+	pthread_mutex_unlock(&cli_strerror_mutex);

+	return buf;

+    }

+#endif

+}

+

@@ -399,7 +399,8 @@ cli_pdf(const char *dir, int desc, cli_ctx *ctx, off_t offset)

 		snprintf(fullname, sizeof(fullname), "%s/pdf%02u", dir, files);

 		fout = open(fullname, O_RDWR|O_CREAT|O_EXCL|O_TRUNC|O_BINARY, 0600);

 		if(fout < 0) {

-			cli_errmsg("cli_pdf: can't create temporary file %s: %s\n", fullname, strerror(errno));

+			char err[128];

+			cli_errmsg("cli_pdf: can't create temporary file %s: %s\n", fullname, cli_strerror(errno, err, sizeof(err)));

 			rc = CL_ETMPFILE;

 			break;

 		}

@@ -161,7 +161,8 @@ static int cli_scandir(const char *dirname, cli_ctx *ctx, cli_file_t container)

 				if(container == CL_TYPE_MAIL) {

 				    fd = open(fname, O_RDONLY|O_BINARY);

 				    if(fd == -1) {

-					    cli_warnmsg("Cannot open file %s: %s, mode: %x\n", fname, strerror(errno), statbuf.st_mode);

+					    char err[128];

+					    cli_warnmsg("Cannot open file %s: %s, mode: %x\n", fname, cli_strerror(errno, err, sizeof(err)), statbuf.st_mode);

 					    free(fname);

 					    continue;

 				    }

@@ -185,10 +185,11 @@ cli_untar(const char *dir, int desc, unsigned int posix, cli_ctx *ctx)

 			fout = open(fullname, O_RDWR|O_CREAT|O_EXCL|O_TRUNC|O_BINARY, 0600);

 			if(fout < 0) {

-				cli_errmsg("cli_untar: Can't create temporary file %s: %s\n", fullname, strerror(errno));

+				char err[128];

+				cli_errmsg("cli_untar: Can't create temporary file %s: %s\n", fullname, cli_strerror(errno, err, sizeof(err)));

 				return CL_ETMPFILE;

 			}

-			

+

 			cli_dbgmsg("cli_untar: extracting to %s\n", fullname);

 			in_block = 1;

@@ -53,7 +53,7 @@ host_triplet = @host@

 target_triplet = @target@

 bin_PROGRAMS = sigtool$(EXEEXT)

 subdir = sigtool

-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in COPYING

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/argz.m4 $(top_srcdir)/m4/fdpassing.m4 \

@@ -115,11 +115,7 @@ static void conn_teardown(void)

 #define NONEXISTENT "/nonexistent\vfilename"

-#ifdef HAVE_STRERROR_R

 #define NONEXISTENT_REPLY NONEXISTENT": lstat() failed: No such file or directory. ERROR"

-#else

-#define NONEXISTENT_REPLY NONEXISTENT": lstat() failed: 2. ERROR"

-#endif

 #define ACCDENIED BUILDDIR"/accdenied"

 #define ACCDENIED_REPLY ACCDENIED": Access denied. ERROR"