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

+Thu Feb 19 11:20:58 EET 2009 (edwin)

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

+ * clamd/, etc/, libclamav/, unit_tests/: fix distcheck.

+

 Wed Feb 18 23:12:36 CET 2009 (tk)

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

  * libclamav/textdet.c: improve UTF-16 detection (bb#1209)

@@ -162,7 +162,8 @@ void sighandler_th(int sig)

     }

     /* a signal doesn't always wake poll(), for example on FreeBSD */

     if (action && syncpipe_wake_recv_w != -1)

-	write(syncpipe_wake_recv_w, "", 1);

+	if (write(syncpipe_wake_recv_w, "", 1) != 1)

+	    logg("$Failed to write to syncpipe\n");

 }

 static struct cl_engine *reload_db(struct cl_engine *engine, unsigned int dboptions, const struct optstruct *opts, int do_check, int *ret)

@@ -16,7 +16,7 @@

 #  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

 #  MA 02110-1301, USA.

-EXTRA_DIST = clamd.conf freshclam.conf

+EXTRA_DIST = clamd.conf freshclam.conf clamav-milter.conf

 CFGINST = @CFGDIR@

 install-data-local:

@@ -221,7 +221,7 @@ target_os = @target_os@

 target_vendor = @target_vendor@

 top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

-EXTRA_DIST = clamd.conf freshclam.conf

+EXTRA_DIST = clamd.conf freshclam.conf clamav-milter.conf

 CFGINST = @CFGDIR@

 all: all-am

@@ -444,7 +444,7 @@ int hashset_init(struct hashset* hs, size_t initial_capacity, uint8_t load_facto

 void hashset_destroy(struct hashset* hs)

 {

-	cli_dbgmsg(MODULE_NAME "Freeing hashset, elements: %lu, capacity: %lu\n", hs->count, hs->capacity);

+	cli_dbgmsg(MODULE_NAME "Freeing hashset, elements: %u, capacity: %u\n", hs->count, hs->capacity);

 	free(hs->keys);

 	free(hs->bitmap);

 	hs->keys = hs->bitmap = NULL;

@@ -497,7 +497,7 @@ static int hashset_grow(struct hashset *hs)

 	/* in-place growing is not possible, since the new keys

 	 * will hash to different locations. */

-	cli_dbgmsg(MODULE_NAME "Growing hashset, used: %lu, capacity: %lu\n", hs->count, hs->capacity);

+	cli_dbgmsg(MODULE_NAME "Growing hashset, used: %u, capacity: %u\n", hs->count, hs->capacity);

 	/* create a bigger hashset */

 	if((rc = hashset_init(&new_hs, hs->capacity << 1, hs->limit*100/hs->capacity)) < 0) {

 		return rc;

@@ -1206,7 +1206,7 @@ static int hash_match(const struct regex_matcher *rlist, const char *host, size_

 #define URL_MAX_LEN 1024

 #define COMPONENTS 4

-int cli_url_canon(const char *inurl, size_t len, char *urlbuff, size_t dest_len, char **host, size_t *hostlen, char **path, size_t *pathlen)

+int cli_url_canon(const char *inurl, size_t len, char *urlbuff, size_t dest_len, char **host, size_t *hostlen, const char **path, size_t *pathlen)

 {

 	char *url, *p, *last;

 	char *host_begin, *path_begin;

@@ -1285,13 +1285,13 @@ int cli_url_canon(const char *inurl, size_t len, char *urlbuff, size_t dest_len,

 		    *p = '\0';

 		    path_len = p - path_begin;

 		}

+		*path = path_begin;

 	} else {

 		path_len = 0;

-		path_begin = "";

+		*path = "";

 	}

 	str_make_lowercase(host_begin, host_len);

 	*host = host_begin;

-	*path = path_begin;

 	*hostlen = host_len;

 	*pathlen = path_len;

 	return CL_PHISH_NODECISION;

@@ -1300,7 +1300,8 @@ int cli_url_canon(const char *inurl, size_t len, char *urlbuff, size_t dest_len,

 static int url_hash_match(const struct regex_matcher *rlist, const char *inurl, size_t len)

 {

 	size_t j, k, ji, ki;

-	char *host_begin, *path_begin;

+	char *host_begin;

+	const char *path_begin;

 	const char *component;

 	size_t path_len;

 	size_t host_len;

@@ -72,7 +72,7 @@ void phish_disable(struct cl_engine* engine,const char* reason);

 /* Global, non-thread-safe functions, call only once! */

 int phishing_init(struct cl_engine* engine);

 void phishing_done(struct cl_engine* engine);

-int cli_url_canon(const char *inurl, size_t len, char *urlbuff, size_t dest_len, char **host, size_t *hostlen, char **path, size_t *pathlen);

+int cli_url_canon(const char *inurl, size_t len, char *urlbuff, size_t dest_len, char **host, size_t *hostlen, const char **path, size_t *pathlen);

 /* end of non-thread-safe functions */

@@ -1992,7 +1992,7 @@ static void cli_md5db_build(struct cli_matcher* root)

 {

 	if(root && root->md5_sizes_hs.capacity) {

 		/* TODO: use hashset directly, instead of the array when matching*/

-		cli_dbgmsg("Converting hashset to array: %lu entries\n", root->md5_sizes_hs.count);

+		cli_dbgmsg("Converting hashset to array: %u entries\n", root->md5_sizes_hs.count);

 #ifdef USE_MPOOL

 		{

@@ -226,7 +226,7 @@ static const struct rtest {

 		"http://pages.ebay.de@fake.example.com","pages.ebay.de",0},

 	{NULL,"http://key.com","https://key.com",0},

 	{NULL,"http://key.com%00fake.example.com","https://key.com",0},

-	{NULL,"http://key.com.example.com","key.com.invalid"}

+	{NULL,"http://key.com.example.com","key.com.invalid",0}

 };

 #ifdef CHECK_HAVE_LOOPS

@@ -440,7 +440,8 @@ static struct uc {

 START_TEST (test_url_canon)

 {

     char urlbuff[1024+3];

-    char *host = NULL, *path = NULL;

+    char *host = NULL;

+    const char *path = NULL;

     size_t host_len, path_len;

     struct uc *u = &uc[_i];