merging git tree

git-svn-id: https://svn.ic-s.nl/svn/dbmail/trunk/dbmail@2069 7b491191-dbf0-0310-aff6-d879d4d69008

Author: paul

ChangeLog

@@ -1,3 +1,14 @@
+2006-04-14  Paul J Stevens <[email protected]>
+
+	* check_dbmail_mailbox.c, dbmail-mailbox.c, dbmailtypes.h:
+	search-not is now fixed.
+	* modules/dbpgsql.c:
+	fix some compiler warnings
+	* dbmail-message.c:
+	fix a memory leak.
+	* dbmail-mailbox.c:
+	fix a double free
+
 2006-04-13  Paul J Stevens <[email protected]>
 
 	* dbmail.h.in:

check_dbmail_mailbox.c

@@ -281,14 +281,13 @@ START_TEST(test_dbmail_mailbox_search)
 	dbmail_mailbox_free(mb);
 	g_strfreev(array);
 
-	printf ("all [%d], found [%d], notfound [%d]", all, found, notfound);
+	fail_unless((all - found) == notfound, "dbmail_mailbox_search failed: SEARCH NOT");
 
-	return;
 	// third case
 	idx=0;
 	sorted = 0;
 	mb = dbmail_mailbox_new(get_mailbox_id());
-	args = g_strdup("1 BODY [email protected]");
+	args = g_strdup("UID 1,* BODY [email protected]");
 	array = g_strsplit(args," ",0);
 	g_free(args);
 
@@ -847,17 +846,17 @@ Suite *dbmail_mailbox_suite(void)
 	TCase *tc_mailbox = tcase_create("Mailbox");
 	suite_add_tcase(s, tc_mailbox);
 	tcase_add_checked_fixture(tc_mailbox, setup, teardown);
-//	tcase_add_test(tc_mailbox, test_dbmail_mailbox_get_set);
-//	tcase_add_test(tc_mailbox, test_dbmail_mailbox_new);
-//	tcase_add_test(tc_mailbox, test_dbmail_mailbox_free);
-//	tcase_add_test(tc_mailbox, test_dbmail_mailbox_open);
-//	tcase_add_test(tc_mailbox, test_dbmail_mailbox_dump);
-//	tcase_add_test(tc_mailbox, test_dbmail_mailbox_build_imap_search);
-//	tcase_add_test(tc_mailbox, test_dbmail_mailbox_sort);
+	tcase_add_test(tc_mailbox, test_dbmail_mailbox_get_set);
+	tcase_add_test(tc_mailbox, test_dbmail_mailbox_new);
+	tcase_add_test(tc_mailbox, test_dbmail_mailbox_free);
+	tcase_add_test(tc_mailbox, test_dbmail_mailbox_open);
+	tcase_add_test(tc_mailbox, test_dbmail_mailbox_dump);
+	tcase_add_test(tc_mailbox, test_dbmail_mailbox_build_imap_search);
+	tcase_add_test(tc_mailbox, test_dbmail_mailbox_sort);
 	tcase_add_test(tc_mailbox, test_dbmail_mailbox_search);
-//	tcase_add_test(tc_mailbox, test_dbmail_mailbox_search_parsed_1);
-//	tcase_add_test(tc_mailbox, test_dbmail_mailbox_search_parsed_2);
-//	tcase_add_test(tc_mailbox, test_dbmail_mailbox_orderedsubject);
+	tcase_add_test(tc_mailbox, test_dbmail_mailbox_search_parsed_1);
+	tcase_add_test(tc_mailbox, test_dbmail_mailbox_search_parsed_2);
+	tcase_add_test(tc_mailbox, test_dbmail_mailbox_orderedsubject);
 //	tcase_add_test(tc_mailbox, test_dbmail_mailbox_fetch_build);
 //	tcase_add_test(tc_mailbox, test_dbmail_mailbox_fetch);
 	return s;

dbmail-mailbox.c

@@ -38,16 +38,16 @@ struct DbmailMailbox * dbmail_mailbox_new(u64_t id)
 	struct DbmailMailbox *self = g_new0(struct DbmailMailbox, 1);
 	assert(self);
 	dbmail_mailbox_set_id(self,id);
-	
+	dbmail_mailbox_set_uid(self, FALSE);
+	self->search = NULL;
+	self->set = NULL;
+	self->fi = NULL;
+
 	if (dbmail_mailbox_open(self)) {
 		dbmail_mailbox_free(self);
 		return NULL;
 	}
 
-	dbmail_mailbox_set_uid(self, FALSE);
-	self->search = NULL;
-	self->set = NULL;
-	self->fi = NULL;
 	return self;
 }
 
@@ -137,7 +137,7 @@ int dbmail_mailbox_open(struct DbmailMailbox *self)
 				__FILE__, __func__);
 		db_free_result();
 		g_string_free(q,TRUE);
-		return DM_EGENERAL;
+		return DM_SUCCESS;
 	}
 
 	if (self->ids) {
@@ -166,7 +166,7 @@ int dbmail_mailbox_open(struct DbmailMailbox *self)
 static size_t dump_message_to_stream(struct DbmailMessage *message, GMimeStream *ostream)
 {
 	size_t r = 0;
-	gchar *s;
+	gchar *s, *d;
 	GString *sender;
 	GString *date;
 	InternetAddressList *ialist;
@@ -188,7 +188,9 @@ static size_t dump_message_to_stream(struct DbmailMessage *message, GMimeStream
 		}
 		internet_address_list_destroy(ialist);
 
-		date = g_string_new(dbmail_message_get_internal_date(message));
+		d = dbmail_message_get_internal_date(message);
+		date = g_string_new(d);
+		g_free(d);
 		if (date->len < 1)
 			date = g_string_new(FROM_STANDARD_DATE);
 
@@ -1292,7 +1294,6 @@ static GTree * mailbox_search_parsed(struct DbmailMailbox *self, search_key_t *s
 		ids = g_list_next(ids);
 	}
 
-	g_list_free(ids);
 	return s->found;
 }
 
@@ -1416,7 +1417,7 @@ GTree * dbmail_mailbox_get_set(struct DbmailMailbox *self, const char *set)
 		g_tree_destroy(a);
 
 	self->set = g_tree_keys(b);
-	
+
 	trace(TRACE_DEBUG,"%s,%s: self->set contains [%d] ids between [%llu] and [%llu]", 
 			__FILE__, __func__, g_list_length(g_list_first(self->set)), lo, hi);
 
@@ -1427,12 +1428,9 @@ static gboolean _do_search(GNode *node, struct DbmailMailbox *self)
 {
 	search_key_t *s = (search_key_t *)node->data;
 
-	if (s->merged == TRUE)
+	if (s->searched)
 		return FALSE;
-
-	trace(TRACE_DEBUG,"%s,%s: type [%d]", __FILE__,  __func__, s->type);
 
-
 	switch (s->type) {
 		case IST_SET:
 			if (! dbmail_mailbox_get_set(self, (const char *)s->search))
@@ -1453,7 +1451,7 @@ static gboolean _do_search(GNode *node, struct DbmailMailbox *self)
 
 		case IST_DATA_BODY:
 			mailbox_search_parsed(self,s);
-		break;
+			break;
 
 		case IST_SUBSEARCH_NOT:
 		case IST_SUBSEARCH_AND:
@@ -1468,9 +1466,10 @@ static gboolean _do_search(GNode *node, struct DbmailMailbox *self)
 			return TRUE;
 	}
 
-	s->merged = TRUE;
-	trace(TRACE_DEBUG,"%s,%s: type [%d] depth [%d] rows [%d]\n", __FILE__,  __func__, 
-			s->type, g_node_depth(node), s->found ? g_tree_nnodes(s->found): 0);
+	s->searched = TRUE;
+	
+	trace(TRACE_DEBUG,"%s,%s: [%d] depth [%d] type [%d] rows [%d]\n", __FILE__,  __func__, 
+			(int)s, g_node_depth(node), s->type, s->found ? g_tree_nnodes(s->found): 0);
 
 	return FALSE;
 }	
@@ -1488,7 +1487,12 @@ static gboolean _merge_search(GNode *node, GTree *found)
 	GNode *x, *y;
 	GTree *z;
 
-	trace(TRACE_DEBUG,"%s,%s: node depth [%d] type [%d]", __FILE__, __func__, g_node_depth(node), s->type);
+	if (s->merged == TRUE)
+		return FALSE;
+
+	trace(TRACE_DEBUG,"%s,%s: [%d] depth [%d] type [%d]", 
+			__FILE__, __func__, 
+			(int)s, g_node_depth(node), s->type);
 	switch(s->type) {
 		case IST_SUBSEARCH_AND:
 			g_node_children_foreach(node, G_TRAVERSE_LEAVES, (GNodeForeachFunc)_merge_search, (gpointer)found);
@@ -1499,12 +1503,11 @@ static gboolean _merge_search(GNode *node, GTree *found)
 				break;
 
 			z = g_tree_new((GCompareFunc)ucmp);
-			g_tree_foreach(found, (GTraverseFunc) g_tree_copy, z);
+			g_tree_foreach(found, (GTraverseFunc)g_tree_copy, z);
 			g_node_children_foreach(node, G_TRAVERSE_LEAVES, (GNodeForeachFunc)_merge_search, (gpointer) z);
 			if (z) 
 				g_tree_merge(found, z, IST_SUBSEARCH_NOT);
 			g_tree_destroy(z);
-
 			break;
 
 		case IST_SUBSEARCH_OR:
@@ -1521,10 +1524,11 @@ static gboolean _merge_search(GNode *node, GTree *found)
 		default:
 			if (s->found && found) 
 				g_tree_merge(found, s->found, IST_SUBSEARCH_AND);
-
 			break;
 	}
 
+	s->merged = TRUE;
+
 	return FALSE;
 }
 

dbmail-message.c

@@ -295,7 +295,7 @@ static void _set_content_from_stream(struct DbmailMessage *self, GMimeStream *st
 	GMimeStream *fstream, *bstream, *mstream;
 	GMimeFilter *filter;
 	GMimeParser *parser;
-	gchar *buf;
+	gchar *buf, *from;
 	size_t t;
 
 	/*
@@ -354,8 +354,11 @@ static void _set_content_from_stream(struct DbmailMessage *self, GMimeStream *st
 		case DBMAIL_MESSAGE:
 			trace(TRACE_DEBUG,"%s,%s: parse message",__FILE__,__func__);
 			self->content = GMIME_OBJECT(g_mime_parser_construct_message(parser));
-			if (g_mime_parser_get_scan_from(parser))
-				dbmail_message_set_internal_date(self, g_mime_parser_get_from(parser));
+			if (g_mime_parser_get_scan_from(parser)) {
+				from = g_mime_parser_get_from(parser);
+				dbmail_message_set_internal_date(self, from);
+				g_free(from);
+			}
 
 			break;
 		case DBMAIL_MESSAGE_PART:

dbmailtypes.h

@@ -319,6 +319,7 @@ typedef struct {
 	int match;
 	GTree *found;
 	gboolean reverse;
+	gboolean searched;
 	gboolean merged;
 } search_key_t;
 

modules/dbpgsql.c

@@ -183,10 +183,10 @@ static void _create_binary_table(void){
 	rows = db_num_rows(); fields = db_num_fields();
 
 	if(!bintbl){
-		bintbl = (char***)malloc(sizeof(char**) * rows);
+		bintbl = (char***)g_malloc(sizeof(char**) * rows);
 		memset(bintbl, 0, sizeof(char**) * rows);
 		for(i = 0; i < rows; i++){
-			*(bintbl + i) = (char**)malloc(sizeof(char*) * fields);
+			*(bintbl + i) = (char**)g_malloc(sizeof(char*) * fields);
 			memset(*(bintbl + i), 0, sizeof(char*) * fields);
 		}
 	}
@@ -200,10 +200,10 @@ static void _free_binary_table(void){
 		for(i = 0; i < rows; i++){
 			for(j = 0; j < fields; j++)
 				if(bintbl[i][j])
-					free(bintbl[i][j]);
-			free(bintbl[i]);
+					g_free(bintbl[i][j]);
+			g_free(bintbl[i]);
 		}
-		free(bintbl);
+		g_free(bintbl);
 		bintbl = NULL;
 	}
 
@@ -212,8 +212,8 @@ static void _set_binary_table(unsigned row, unsigned field){
 	unsigned char* tmp;
 	size_t result_size;
 	if(!bintbl[row][field]){
-		tmp = PQunescapeBytea(PQgetvalue(res, row, field), &result_size);
-		bintbl[row][field] = (char*)malloc(result_size + 1);
+		tmp = PQunescapeBytea((const unsigned char *)PQgetvalue(res, row, field), &result_size);
+		bintbl[row][field] = (char*)g_malloc(result_size + 1);
 		memcpy(bintbl[row][field], tmp, result_size);
 		PQfreemem(tmp); tmp = NULL;
 		bintbl[row][field][result_size] = '\0';
@@ -343,8 +343,8 @@ unsigned long db_escape_binary(char *to,
 	size_t to_length;
 	unsigned char *esc_to;
 
-	esc_to = PQescapeBytea(from, length, &to_length);
-	strncpy(to, esc_to, to_length);
+	esc_to = PQescapeBytea((const unsigned char *)from, length, &to_length);
+	strncpy(to, (const char *)esc_to, to_length);
 	PQfreemem(esc_to);
 	return (unsigned long)(to_length - 1);
 }