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

+Thu Nov 13 02:11:41 CET 2008 (acab)

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

+ * libclamav: dlinit in cl_init

+

 Thu Nov 13 01:23:39 CET 2008 (acab)

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

  * clamav-milter/clamav-milter.c: upgrade to new API

@@ -80,6 +80,7 @@ static pthread_mutex_t cli_ctime_mutex = PTHREAD_MUTEX_INITIALIZER;

 #include "md5.h"

 #include "cltypes.h"

 #include "regex/regex.h"

+#include "ltdl.h"

 #ifndef	O_BINARY

 #define	O_BINARY	0

@@ -110,6 +111,38 @@ static unsigned char name_salt[16] = { 16, 38, 97, 12, 8, 4, 72, 196, 217, 144,

     fputs(buff, stderr);				    \

     va_end(args)

+int (*cli_unrar_open)(int fd, const char *dirname, unrar_state_t *state);

+int (*cli_unrar_extract_next_prepare)(unrar_state_t *state, const char *dirname);

+int (*cli_unrar_extract_next)(unrar_state_t *state, const char *dirname);

+void (*cli_unrar_close)(unrar_state_t *state);

+int have_rar = 0;

+static int is_rar_initd = 0;

+

+static void cli_rarload(void) {

+    lt_dlhandle rhandle;

+

+    if(is_rar_initd) return;

+    is_rar_initd = 1;

+    if(lt_dlinit()) {

+        cli_warnmsg("Cannot init ltdl - unrar support unavailable\n");

+        return;

+    }

+    rhandle = lt_dlopenext("libclamunrar_iface");

+    if (!rhandle) { 

+        cli_dbgmsg("Cannot dlopen: %s - unrar support unavailable\n", lt_dlerror());

+        return;

+    }

+    if (!(cli_unrar_open = (int(*)(int, const char *, unrar_state_t *))lt_dlsym(rhandle, "unrar_open")) ||

+	!(cli_unrar_extract_next_prepare = (int(*)(unrar_state_t *, const char *))lt_dlsym(rhandle, "unrar_extract_next_prepare")) ||

+	!(cli_unrar_extract_next = (int(*)(unrar_state_t *, const char *))lt_dlsym(rhandle, "unrar_extract_next")) ||

+	!(cli_unrar_close = (void(*)(unrar_state_t *))lt_dlsym(rhandle, "unrar_close"))

+	) {

+	/* ideally we should never land here, we'd better warn so */

+        cli_warnmsg("Cannot resolve: %s (version mismatch?) - unrar support unavailable\n", lt_dlerror());

+        return;

+    }

+    have_rar = 1;

+}

 void cli_warnmsg(const char *str, ...)

 {

@@ -200,6 +233,7 @@ const char *cl_strerror(int clerror)

 int cl_init(unsigned int options)

 {

     /* put dlopen() stuff here, etc. */

+    cli_rarload();

     return CL_SUCCESS;

 }

@@ -33,6 +33,7 @@

 #include "clamav.h"

 #include "dconf.h"

+#include "libclamunrar_iface/unrar_iface.h"

 extern uint8_t cli_debug_flag, cli_leavetemps_flag;

@@ -154,6 +155,12 @@ struct cl_engine {

     mp_t *mempool;

 };

+extern int (*cli_unrar_open)(int fd, const char *dirname, unrar_state_t *state);

+extern int (*cli_unrar_extract_next_prepare)(unrar_state_t *state, const char *dirname);

+extern int (*cli_unrar_extract_next)(unrar_state_t *state, const char *dirname);

+extern void (*cli_unrar_close)(unrar_state_t *state);

+extern int have_rar;

+

 #define SCAN_ARCHIVE	    (ctx->options & CL_SCAN_ARCHIVE)

 #define SCAN_MAIL	    (ctx->options & CL_SCAN_MAIL)

 #define SCAN_OLE2	    (ctx->options & CL_SCAN_OLE2)

@@ -67,51 +67,12 @@

 #include <stddef.h>

 #endif

-#include "ltdl.h"

 #include "mpool.h"

-#include "libclamunrar_iface/unrar_iface.h"

 #ifdef CL_THREAD_SAFE

 #  include <pthread.h>

 static pthread_mutex_t cli_ref_mutex = PTHREAD_MUTEX_INITIALIZER;

-static pthread_once_t is_rar_initd = PTHREAD_ONCE_INIT;

-#else

-static int is_rar_initd = 0;

-#endif

-

-int (*cli_unrar_open)(int fd, const char *dirname, unrar_state_t *state);

-int (*cli_unrar_extract_next_prepare)(unrar_state_t *state, const char *dirname);

-int (*cli_unrar_extract_next)(unrar_state_t *state, const char *dirname);

-void (*cli_unrar_close)(unrar_state_t *state);

-int have_rar = 0;

-

-static void cli_rarload(void) {

-    lt_dlhandle rhandle;

-

-#ifndef CL_THREAD_SAFE

-    if(is_rar_initd) return;

-    is_rar_initd = 1;

 #endif

-    if(lt_dlinit()) {

-        cli_warnmsg("Cannot init ltdl - unrar support unavailable\n");

-        return;

-    }

-    rhandle = lt_dlopenext("libclamunrar_iface");

-    if (!rhandle) { 

-        cli_dbgmsg("Cannot dlopen: %s - unrar support unavailable\n", lt_dlerror());

-        return;

-    }

-    if (!(cli_unrar_open = (int(*)(int, const char *, unrar_state_t *))lt_dlsym(rhandle, "unrar_open")) ||

-	!(cli_unrar_extract_next_prepare = (int(*)(unrar_state_t *, const char *))lt_dlsym(rhandle, "unrar_extract_next_prepare")) ||

-	!(cli_unrar_extract_next = (int(*)(unrar_state_t *, const char *))lt_dlsym(rhandle, "unrar_extract_next")) ||

-	!(cli_unrar_close = (void(*)(unrar_state_t *))lt_dlsym(rhandle, "unrar_close"))

-	) {

-	/* ideally we should never land here, we'd better warn so */

-        cli_warnmsg("Cannot resolve: %s (version mismatch?) - unrar support unavailable\n", lt_dlerror());

-        return;

-    }

-    have_rar = 1;

-}

 struct cli_ignsig {

     char *dbname, *signame;

@@ -2066,12 +2027,6 @@ int cl_engine_compile(struct cl_engine *engine)

     if(!engine)

 	return CL_ENULLARG;

-#ifdef CL_THREAD_SAFE

-    pthread_once(&is_rar_initd, cli_rarload);

-#else

-    cli_rarload();

-#endif

-

     if(!engine->ftypes)

 	if((ret = cli_loadftm(NULL, engine, 0, 1, NULL)))

 	    return ret;

@@ -96,19 +96,11 @@

 #include <bzlib.h>

 #endif

-#include "libclamunrar_iface/unrar_iface.h"

-

 #if defined(HAVE_READDIR_R_3) || defined(HAVE_READDIR_R_2)

 #include <limits.h>

 #include <stddef.h>

 #endif

-extern int (*cli_unrar_open)(int fd, const char *dirname, unrar_state_t *state);

-extern int (*cli_unrar_extract_next_prepare)(unrar_state_t *state, const char *dirname);

-extern int (*cli_unrar_extract_next)(unrar_state_t *state, const char *dirname);

-extern void (*cli_unrar_close)(unrar_state_t *state);

-extern int have_rar;

-

 static int cli_scanfile(const char *filename, cli_ctx *ctx);

 static int cli_scandir(const char *dirname, cli_ctx *ctx, cli_file_t container)