SylFilter

     SUBDIRS = filters
     INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/lib -I$(includedir)
     INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/lib -I$(includedir) -I/usr/include/qdbm
     lib_LTLIBRARIES = libsylfilter.la
     libsylfilter_la_SOURCES = \
     	filter.c \
     	filter-manager.c \
     	filter-utils.c
     	filter-utils.c \
     	filter-kvs.c \
     	filter-kvs-qdbm.c
     libsylfilterincludedir=$(includedir)/sylfilter
     libsylfilterinclude_HEADERS = \
     	filter.h \
     	filter-manager.h \
     	filter-utils.h
     	filter-utils.h \
     	filter-kvs.h \
     	filter-kvs-qdbm.h
     libsylfilter_la_LIBADD = $(GLIB_LIBS) filters/libfilters.la
     libsylfilter_la_LIBADD = $(GLIB_LIBS) -lqdbm filters/libfilters.la

     target_alias = @target_alias@
     SUBDIRS = filters
     INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/lib -I$(includedir)
     INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/lib -I$(includedir) -I/usr/include/qdbm
     lib_LTLIBRARIES = libsylfilter.la
     libsylfilter_la_SOURCES = \
     	filter.c \
     	filter-manager.c \
     	filter-utils.c
     	filter-utils.c \
     	filter-kvs.c \
     	filter-kvs-qdbm.c
     libsylfilterincludedir = $(includedir)/sylfilter
     libsylfilterinclude_HEADERS = \
     	filter.h \
     	filter-manager.h \
     	filter-utils.h
     	filter-utils.h \
     	filter-kvs.h \
     	filter-kvs-qdbm.h
     libsylfilter_la_LIBADD = $(GLIB_LIBS) filters/libfilters.la
     libsylfilter_la_LIBADD = $(GLIB_LIBS) -lqdbm filters/libfilters.la
     subdir = lib
     ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-...
     libsylfilter_la_LDFLAGS =
     libsylfilter_la_DEPENDENCIES = filters/libfilters.la
     am_libsylfilter_la_OBJECTS = filter.lo filter-manager.lo filter-utils.lo
     am_libsylfilter_la_OBJECTS = filter.lo filter-manager.lo filter-utils.lo \
     	filter-kvs.lo filter-kvs-qdbm.lo
     libsylfilter_la_OBJECTS = $(am_libsylfilter_la_OBJECTS)
     DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
     depcomp = $(SHELL) $(top_srcdir)/depcomp
     am__depfiles_maybe = depfiles
     @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/filter-manager.Plo \
     @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/filter-kvs-qdbm.Plo \
     @AMDEP_TRUE@	./$(DEPDIR)/filter-kvs.Plo \
     @AMDEP_TRUE@	./$(DEPDIR)/filter-manager.Plo \
     @AMDEP_TRUE@	./$(DEPDIR)/filter-utils.Plo ./$(DEPDIR)/filter.Plo
     COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
     	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-...
     distclean-compile:
     	-rm -f *.tab.c
     @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter-kvs-qdbm.Plo@am__quote@
     @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter-kvs.Plo@am__quote@
     @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter-manager.Plo@am__quote@
     @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter-utils.Plo@am__quote@
     @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter.Plo@am__quote@

     #include <depot.h>
     #include <stdlib.h>
     #include "filter-kvs.h"
     #include "filter-kvs-qdbm.h"
     static XFilterKVS *qdbm_open(const char *dbfile);
     static int qdbm_close(XFilterKVS *kvs);
     static int qdbm_insert(XFilterKVS *kvs, const char *key, void *value, int size);
     static int qdbm_delete(XFilterKVS *kvs, const char *key);
     static int qdbm_update(XFilterKVS *kvs, const char *key, void *value, int size);
     static int qdbm_fetch(XFilterKVS *kvs, const char *key, void *vbuf, int vsize);
     int xfilter_kvs_qdbm_set_engine(void)
+    {
     	XFilterKVSEngine engine = {
     		qdbm_open,
     		qdbm_close,
     		qdbm_insert,
     		qdbm_delete,
     		qdbm_update,
     		qdbm_fetch
     	};
     	return xfilter_kvs_set_engine(&engine);
+    }
     static XFilterKVS *qdbm_open(const char *dbfile)
+    {
     	DEPOT *depot;
     	depot = dpopen(dbfile, DP_OREADER|DP_OWRITER|DP_OCREAT, 0);
     	if (!depot)
     		return NULL;
     	return xfilter_kvs_new(dbfile, (void *)depot);
+    }
     static int qdbm_close(XFilterKVS *kvs)
+    {
     	if (!dpclose((DEPOT *)xfilter_kvs_get_handle(kvs)))
     		return -1;
     	return 0;
+    }
     static int qdbm_insert(XFilterKVS *kvs, const char *key, void *value, int size)
+    {
     	DEPOT *depot;
     	depot = (DEPOT *)xfilter_kvs_get_handle(kvs);
     	if (!dpput(depot, key, -1, (const char *)value, size, DP_DKEEP))
     		return -1;
     	return 0;
+    }
     static int qdbm_delete(XFilterKVS *kvs, const char *key)
+    {
     	DEPOT *depot;
     	depot = (DEPOT *)xfilter_kvs_get_handle(kvs);
     	if (!dpout(depot, key, -1))
     		return -1;
     	return 0;
+    }
     static int qdbm_update(XFilterKVS *kvs, const char *key, void *value, int size)
+    {
     	DEPOT *depot;
     	depot = (DEPOT *)xfilter_kvs_get_handle(kvs);
     	if (!dpput(depot, key, -1, (const char *)value, size, DP_DOVER))
     		return -1;
     	return 0;
+    }
     static int qdbm_fetch(XFilterKVS *kvs, const char *key, void *vbuf, int vsize)
+    {
     	DEPOT *depot;
     	int size;
     	depot = (DEPOT *)xfilter_kvs_get_handle(kvs);
     	size = dpgetwb(depot, key, -1, 0, vsize, (char *)vbuf);
     	if (size < 0)
     		return -1;
     	return size;
+    }

b/lib/filter-kvs-qdbm.h
	1	#ifndef __FILTER_KVS_QDBM__
	2	#define __FILTER_KVS_QDBM__
	3
	4	int xfilter_kvs_qdbm_set_engine(void);
	5
	6	#endif /* __FILTER_KVS_QDBM__ */

     #include <glib.h>
     #include "filter-kvs.h"
     struct _XFilterKVS
+    {
     	char *dbfile;
     	void *dbhandle;
     };
     static XFilterKVSEngine ke;
     int xfilter_kvs_set_engine(XFilterKVSEngine *engine)
+    {
     	g_return_val_if_fail(engine != NULL, -1);
     	ke = *engine;
     	return 0;
+    }
     XFilterKVS *xfilter_kvs_new(const char *dbfile, void *dbhandle)
+    {
     	XFilterKVS *kvs;
     	kvs = g_new(XFilterKVS, 1);
     	kvs->dbfile = g_strdup(dbfile);
     	kvs->dbhandle = dbhandle;
     	return kvs;
+    }
     const char *xfilter_kvs_get_file(XFilterKVS *kvs)
+    {
     	g_return_val_if_fail(kvs != NULL, NULL);
     	return kvs->dbfile;
+    }
     void *xfilter_kvs_get_handle(XFilterKVS *kvs)
+    {
     	g_return_val_if_fail(kvs != NULL, NULL);
     	return kvs->dbhandle;
+    }
     XFilterKVS *xfilter_kvs_open(const char *dbfile)
+    {
     	g_return_val_if_fail(ke.open != NULL, NULL);
     	return ke.open(dbfile);
+    }
     int xfilter_kvs_close(XFilterKVS *kvs)
+    {
     	g_return_val_if_fail(kvs != NULL, -1);
     	return ke.close(kvs);
+    }
     int xfilter_kvs_insert(XFilterKVS *kvs, const char *key, void *value, int size)
+    {
     	g_return_val_if_fail(kvs != NULL, -1);
     	return ke.insert(kvs, key, value, size);
+    }
     int xfilter_kvs_delete(XFilterKVS *kvs, const char *key)
+    {
     	g_return_val_if_fail(kvs != NULL, -1);
     	return ke.delete(kvs, key);
+    }
     int xfilter_kvs_update(XFilterKVS *kvs, const char *key, void *value, int size)
+    {
     	g_return_val_if_fail(kvs != NULL, -1);
     	return ke.update(kvs, key, value, size);
+    }
     int xfilter_kvs_fetch(XFilterKVS *kvs, const char *key, void *vbuf, int vsize)
+    {
     	g_return_val_if_fail(kvs != NULL, -1);
     	return ke.fetch(kvs, key, vbuf, vsize);
+    }
     int xfilter_kvs_fetch_int(XFilterKVS *kvs, const char *key)
+    {
     	int ival = 0;
     	int size;
     	char vbuf[4];
     	g_return_val_if_fail(kvs != NULL, -1);
     	size = xfilter_kvs_fetch(kvs, key, vbuf, 4);
     	if (size == 4) {
     		ival = *(int *)vbuf;
     		return ival;
+    	}
     	return 0;
+    }
     int xfilter_kvs_increment(XFilterKVS *kvs, const char *key, int num)
+    {
     	int ival = 0;
     	int size;
     	char vbuf[4];
     	g_return_val_if_fail(kvs != NULL, -1);
     	size = xfilter_kvs_fetch(kvs, key, vbuf, 4);
     	if (size == 4) {
     		ival = *(int *)vbuf;
     		ival += num;
     		return xfilter_kvs_update(kvs, key, (char *)&ival, 4);
     	} else if (size <= 0) {
     		return xfilter_kvs_insert(kvs, key, (char *)&num, 4);
+    	}
     	return -1;
+    }
     int xfilter_kvs_decrement(XFilterKVS *kvs, const char *key, int num)
+    {
     	int ival = 0;
     	int size;
     	char vbuf[4];
     	g_return_val_if_fail(kvs != NULL, -1);
     	size = xfilter_kvs_fetch(kvs, key, vbuf, 4);
     	if (size == 4) {
     		ival = *(int *)vbuf;
     		ival -= num;
     		if (ival <= 0)
     			return xfilter_kvs_delete(kvs, key);
     		else
     			return xfilter_kvs_update(kvs, key, (char *)&ival, 4);
+    	}
     	return -1;
+    }

     /* filter-kvs.h */
     #ifndef __FILTER_KVS_H__
     #define __FILTER_KVS_H__
     typedef struct _XFilterKVS	XFilterKVS;
     typedef struct _XFilterKVSEngine
+    {
     	XFilterKVS * (*open)	(const char *dbfile);
     	int (*close)		(XFilterKVS *kvs);
     	int (*insert)		(XFilterKVS *kvs, const char *key, void *value,
     				 int size);
     	int (*delete)		(XFilterKVS *kvs, const char *key);
     	int (*update)		(XFilterKVS *kvs, const char *key, void *value,
     				 int size);
     	int (*fetch)		(XFilterKVS *kvs, const char *key, void *vbuf, int vsize);
     } XFilterKVSEngine;
     int xfilter_kvs_set_engine	(XFilterKVSEngine *engine);
     XFilterKVS *xfilter_kvs_new	(const char *dbfile, void *dbhandle);
     const char *xfilter_kvs_get_file(XFilterKVS *kvs);
     void *xfilter_kvs_get_handle	(XFilterKVS *kvs);
     XFilterKVS *xfilter_kvs_open	(const char *dbfile);
     int xfilter_kvs_close		(XFilterKVS *kvs);
     int xfilter_kvs_insert		(XFilterKVS *kvs, const char *key, void *value,
     				 int size);
     int xfilter_kvs_delete		(XFilterKVS *kvs, const char *key);
     int xfilter_kvs_update		(XFilterKVS *kvs, const char *key, void *value,
     				 int size);
     int xfilter_kvs_fetch		(XFilterKVS *kvs, const char *key, void *vbuf, int vsize);
     int xfilter_kvs_fetch_int	(XFilterKVS *kvs, const char *key);
     int xfilter_kvs_increment	(XFilterKVS *kvs, const char *key, int num);
     int xfilter_kvs_decrement	(XFilterKVS *kvs, const char *key, int num);
     #endif /* __FILTER_KVS_H__ */

     #include <glib.h>
     #include "filter.h"
     #include "filter-kvs.h"
     #include "bayes-filter.h"
     static XFilterKVS *bayes_kvs;
     static GHashTable *xfilter_bayes_word_freq(const char *text)
+    {
     	GHashTable *table;
-...
     	return table;
+    }
     static void test_walk_func(gpointer key, gpointer val, gpointer data)
+    {
     	int n;
     	if ((n = xfilter_kvs_fetch_int(bayes_kvs, (gchar *)key)) < 0)
     		g_warning("database fetch error");
     	g_print("%s: (this: %d) (db: %d)\n", (gchar *)key, GPOINTER_TO_INT(val), n);
+    }
     static XFilterStatus xfilter_bayes_func(XFilter *filter, const XMessageData *data)
+    {
     	const char *type;
-...
     	if (!type || g_strncasecmp(type, "text/", 5) != 0)
     		return XF_UNSUPPORTED_TYPE;
     	if (!bayes_kvs) {
     		bayes_kvs = xfilter_kvs_open("filter.db");
     		if (!bayes_kvs) {
     			g_warning("Cannot open database: filter.db");
     			return XF_ERROR;
+    		}
+    	}
     	g_print("bayes-guessing message\n");
     	table = xfilter_bayes_word_freq(xfilter_message_data_get_content(data));
     	g_hash_table_foreach(table, test_walk_func, NULL);
     	g_hash_table_destroy(table);
     	xfilter_kvs_close(bayes_kvs);
     	bayes_kvs = NULL;
     	return XF_NOJUNK;
+    }
-...
+    }
     static void walk_func(gpointer key, gpointer val, gpointer data)
     static void learn_walk_func(gpointer key, gpointer val, gpointer data)
+    {
     	g_print("%s: %d\n", (gchar *)key, GPOINTER_TO_INT(val));
     	if (xfilter_kvs_increment(bayes_kvs, (gchar *)key, GPOINTER_TO_INT(val)) < 0)
     		g_warning("database update error");
+    }
     static XFilterStatus xfilter_bayes_learn_func(XFilter *filter, const XMessageData *data, XMessageData **retdata)
-...
     	if (!type || g_strncasecmp(type, "text/", 5) != 0)
     		return XF_UNSUPPORTED_TYPE;
     	if (!bayes_kvs) {
     		bayes_kvs = xfilter_kvs_open("filter.db");
     		if (!bayes_kvs) {
     			g_warning("Cannot open database: filter.db");
     			return XF_ERROR;
+    		}
+    	}
     	g_print("learning message\n");
     	table = xfilter_bayes_word_freq(xfilter_message_data_get_content(data));
     	g_hash_table_foreach(table, walk_func, NULL);
     	g_hash_table_foreach(table, learn_walk_func, NULL);
     	g_hash_table_destroy(table);
     	xfilter_kvs_close(bayes_kvs);
     	bayes_kvs = NULL;
     	return XF_NONE;
+    }

b/lib/filters/wordsep-filter.c
78	78	{
79	79	gchar s[7] = {0};
80	80	g_unichar_to_utf8(wc, s);
81		g_print("%s: utype=%d word_len=%d\n", s, utype, word_len);
	81	//g_print("%s: utype=%d word_len=%d\n", s, utype, word_len);
82	82	}
83	83
84	84	if (p > bp) {

     #include "filter.h"
     #include "filter-manager.h"
     #include "filter-utils.h"
     #include "filter-kvs.h"
     #define USE_QDBM 1
     #ifdef USE_QDBM
     #  include "filter-kvs-qdbm.h"
     #endif
     #include "textcontent-filter.h"
     #include "blacklist-filter.h"
     #include "whitelist-filter.h"
-...
     	xfilter_init();
     #ifdef USE_QDBM
     	xfilter_kvs_qdbm_set_engine();
     #endif
     	// set message files
     	if (argc > 1)
     		rfc822_file = argv[1];

Revision 761f2955