2005-11-25 [paul] 1.9.100cvs35

[claws.git] / src / plugins / clamav / clamav_plugin.c

diff --git a/src/plugins/clamav/clamav_plugin.c b/src/plugins/clamav/clamav_plugin.c
index 4116bb12602d7a06b3ffd12c3e46cc3beb1b7f2d..d1d38943c3be9c93d544a4b728f1a6afe0c6df70 100644 (file)
--- a/src/plugins/clamav/clamav_plugin.c
+++ b/src/plugins/clamav/clamav_plugin.c
@@ -14,7 +14,7 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -24,11 +24,11 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <clamav.h>
 
 #include "common/sylpheed.h"
 #include "common/version.h"
-#include "intl.h"
 #include "plugin.h"
 #include "utils.h"
 #include "hooks.h"
@@ -60,11 +60,12 @@ static PrefParam param[] = {
        {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
 };
 
+static struct cl_node *cl_database;
 struct scan_parameters {
        gboolean is_infected;
 
-       struct cl_node *root;
        struct cl_limits limits;
+       struct cl_node *root;
        gboolean scan_archive;
 };
 
@@ -92,7 +93,7 @@ static gboolean scan_func(GNode *node, gpointer data)
                                debug_print("Error: %s\n", cl_strerror(ret));
                }
 
-               unlink(outfile);
+               g_unlink(outfile);
        }
 
        return params->is_infected;
@@ -104,7 +105,6 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data)
        MsgInfo *msginfo = mail_filtering_data->msginfo;
        MimeInfo *mimeinfo;
 
-       int ret, no = 0;
        struct scan_parameters params;
 
        if (!config.clamav_enable)
@@ -118,24 +118,17 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data)
                message_callback(_("ClamAV: scanning message..."));
 
        params.is_infected = FALSE;
-       params.root = NULL;
+       params.root = cl_database;
 
        params.limits.maxfiles = 1000; /* max files */
        params.limits.maxfilesize = config.clamav_max_size * 1048576; /* maximum archived file size */
        params.limits.maxreclevel = 8; /* maximum recursion level */
+       params.limits.maxratio = 200; /* maximal compression ratio */
+       params.limits.archivememlim = 0; /* disable memory limit for bzip2 scanner */
 
        if (config.clamav_enable_arc)
                params.scan_archive = TRUE;
 
-       if ((ret = cl_loaddbdir(cl_retdbdir(), &params.root, &no))) {
-               debug_print("cl_loaddbdir: %s\n", cl_strerror(ret));
-               return FALSE;
-       }
-
-       debug_print("Database loaded (containing in total %d signatures)\n", no);
-
-       cl_buildtrie(params.root);
-
        g_node_traverse(mimeinfo->node, G_PRE_ORDER, G_TRAVERSE_ALL, -1, scan_func, &params);
 
        if (params.is_infected) {
@@ -154,7 +147,6 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data)
                }
        }
        
-       cl_freetrie(params.root);
        procmime_mimeinfo_free_all(mimeinfo);
        
        return params.is_infected;
@@ -193,15 +185,19 @@ void clamav_set_message_callback(MessageCallback callback)
        message_callback = callback;
 }
 
+int cl_build(struct cl_node *root);
+void cl_free(struct cl_node *root);
 gint plugin_init(gchar **error)
 {
+       gchar *rcpath;
+       int no, ret;
        if ((sylpheed_get_version() > VERSION_NUMERIC)) {
-               *error = g_strdup("Your sylpheed version is newer than the version the plugin was built with");
+               *error = g_strdup("Your version of Sylpheed-Claws is newer than the version the ClamAV plugin was built with");
                return -1;
        }
 
        if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
-               *error = g_strdup("Your sylpheed version is too old");
+               *error = g_strdup("Your version of Sylpheed-Claws is too old for the ClamAV plugin");
                return -1;
        }
 
@@ -212,7 +208,23 @@ gint plugin_init(gchar **error)
        }
 
        prefs_set_default(param);
-       prefs_read_config(param, "ClamAV", COMMON_RC);
+       rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, COMMON_RC, NULL);
+       prefs_read_config(param, "ClamAV", rcpath, NULL);
+       g_free(rcpath);
+
+       clamav_gtk_init();
+
+       if ((ret = cl_loaddbdir(cl_retdbdir(), &cl_database, &no))) {
+               debug_print("cl_loaddbdir: %s\n", cl_strerror(ret));
+               return -1;
+       }
+
+       debug_print("Database loaded (containing in total %d signatures)\n", no);
+
+       if((ret = cl_build(cl_database))) {
+               debug_print("Database initialization error: %s\n", cl_strerror(ret));
+               return -1;
+       }
 
        debug_print("ClamAV plugin loaded\n");
 
@@ -224,7 +236,7 @@ void plugin_done(void)
 {
        hooks_unregister_hook(MAIL_FILTERING_HOOKLIST, hook_id);
        g_free(config.clamav_save_folder);
-       
+       cl_free(cl_database);
        debug_print("ClamAV plugin unloaded\n");
 }
 
@@ -240,14 +252,10 @@ const gchar *plugin_desc(void)
               "\n"
               "When a message attachment is found to contain a virus it can be "
               "deleted or saved in a specially designated folder.\n"
-              "\n"
-              "This plugin only contains the actual function for scanning "
-              "and deleting or moving the message. You probably want to load "
-              "the Gtk+ User Interface plugin too, otherwise you will have to "
-              "manually write the plugin configuration.\n");
+              "\n");
 }
 
 const gchar *plugin_type(void)
 {
-       return "Common";
+       return "GTK2";
 }