simplemail-cvs — Changes in the CVS

[Simplemail-cvs] simplemail imap.c,1.79,1.80

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail/simplemail
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31602

Modified Files:
	imap.c 
Log Message:
Fixed memory leak.


Index: imap.c
===================================================================
RCS file: /cvsroot/simplemail/simplemail/imap.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- imap.c	6 Dec 2013 21:14:48 -0000	1.79
+++ imap.c	24 Dec 2013 09:16:22 -0000	1.80
@@ -1776,6 +1776,7 @@
 					pm->done(pm);
 					progmon_delete(pm);
 				}
+				free(local_mail_array);
 			} else folders_unlock();
 		} else folders_unlock();
 	}

[Simplemail-cvs] simplemail/gtk subthreads.c,1.41,1.42

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail/simplemail/gtk
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31577/gtk

Modified Files:
	subthreads.c 
Log Message:
Free the cond and the mutex.


Index: subthreads.c
===================================================================
RCS file: /cvsroot/simplemail/simplemail/gtk/subthreads.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- subthreads.c	24 Dec 2013 09:15:21 -0000	1.41
+++ subthreads.c	24 Dec 2013 09:16:07 -0000	1.42
@@ -342,6 +342,8 @@
 	g_cond_wait(data.sync_cond, data.sync_mutex);
 	g_mutex_unlock(data.sync_mutex);
 
+	g_cond_free(data.sync_cond);
+	g_mutex_free(data.sync_mutex);
 	if (rc) *rc = data.rc;
 
 	return 0;

[Simplemail-cvs] simplemail/tests makefile,1.38,1.39

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail/simplemail/tests
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31529/tests

Modified Files:
	makefile 
Log Message:
Added G_SLICE=always-malloc to keep valgrind more happy.


Index: makefile
===================================================================
RCS file: /cvsroot/simplemail/simplemail/tests/makefile,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- makefile	24 Dec 2013 09:12:13 -0000	1.38
+++ makefile	24 Dec 2013 09:15:51 -0000	1.39
@@ -129,9 +129,9 @@
 	$(if $(findstring imap,$(1)), -$(DOVECOT) stop)
 	$(if $(findstring imap,$(1)), $(DOVECOT))
 ifdef USE_VALGRIND_XML
-	valgrind $(VALGRIND_OPTS) --xml=yes --xml-file=$$@.xml ./$$<
+	G_SLICE=always-malloc valgrind $(VALGRIND_OPTS) --xml=yes --xml-file=$$@.xml ./$$<
 else
-	valgrind $(VALGRIND_OPTS) ./$$<
+	G_SLICE=always-malloc valgrind $(VALGRIND_OPTS) ./$$<
 endif
 	$(if $(findstring imap,$(1)), $(DOVECOT) stop)
 endef

[Simplemail-cvs] simplemail progmon.c,1.4,1.5

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail/simplemail
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31505

Modified Files:
	progmon.c 
Log Message:
Fixed memory leaks.


Index: progmon.c
===================================================================
RCS file: /cvsroot/simplemail/simplemail/progmon.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- progmon.c	21 Dec 2011 13:07:26 -0000	1.4
+++ progmon.c	24 Dec 2013 09:15:36 -0000	1.5
@@ -194,6 +194,12 @@
  */
 void progmon_delete(struct progmon *pm)
 {
+	struct progmon_default *pmd = (struct progmon_default*)pm;
+	if (pmd)
+	{
+		free(pmd->working_on);
+		free(pmd->name);
+	}
 	free(pm);
 }
 

[Simplemail-cvs] simplemail/gtk subthreads.c,1.40,1.41

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail/simplemail/gtk
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31481/gtk

Modified Files:
	subthreads.c 
Log Message:
Cleanup the threads one by one by aborting and joining them.


Index: subthreads.c
===================================================================
RCS file: /cvsroot/simplemail/simplemail/gtk/subthreads.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- subthreads.c	24 Dec 2013 09:15:06 -0000	1.40
+++ subthreads.c	24 Dec 2013 09:15:21 -0000	1.41
@@ -101,14 +101,22 @@
 {
 	struct thread_s *t;
 
-	g_mutex_lock(thread_list_mutex);
-	t = (struct thread_s*)list_first(&thread_list);
-	while (t)
+	while (1)
 	{
-		thread_abort(t);
-		t = (struct thread_s*)node_next(&t->node);
+		g_mutex_lock(thread_list_mutex);
+		if ((t = (struct thread_s*)list_first(&thread_list)))
+		{
+			GThread *gt;
+			gt = t->thread;
+			thread_abort(t);
+			g_mutex_unlock(thread_list_mutex);
+			g_thread_join(gt);
+		} else
+		{
+			g_mutex_unlock(thread_list_mutex);
+			break;
+		}
 	}
-	g_mutex_unlock(thread_list_mutex);
 
 	g_main_loop_unref(main_thread.main_loop);
 	g_main_context_unref(main_thread.context);

[Simplemail-cvs] simplemail/gtk subthreads.c,1.39,1.40

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail/simplemail/gtk
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31433/gtk

Modified Files:
	subthreads.c 
Log Message:
No longer uses the tad pointer after the function call.

The memory pointed by tad will be already trashed after the function decides that the
parent task shall continue.


Index: subthreads.c
===================================================================
RCS file: /cvsroot/simplemail/simplemail/gtk/subthreads.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- subthreads.c	24 Dec 2013 09:14:35 -0000	1.39
+++ subthreads.c	24 Dec 2013 09:15:06 -0000	1.40
@@ -181,19 +181,20 @@
 static gpointer thread_add_entry(gpointer udata)
 {
 	struct thread_add_data *tad = (struct thread_add_data*)udata;
+	struct thread_s *t = tad->thread;
 
 	/* TODO: Catch errors and inform parent task */
-	tad->thread->context = g_main_context_new();
-	tad->thread->main_loop = g_main_loop_new(tad->thread->context, FALSE);
+	t->context = g_main_context_new();
+	t->main_loop = g_main_loop_new(t->context, FALSE);
 
 	tad->entry(tad->eudata);
 
 	g_mutex_lock(thread_list_mutex);
-	node_remove(&tad->thread->node);
+	node_remove(&t->node);
 	g_mutex_unlock(thread_list_mutex);
 
-	g_main_loop_unref(tad->thread->main_loop);
-	g_main_context_unref(tad->thread->context);
+	g_main_loop_unref(t->main_loop);
+	g_main_context_unref(t->context);
 	return NULL;
 }
 

[Simplemail-cvs] simplemail/tests imap2_unittest.c,1.11,1.12

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail/simplemail/tests
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31349/tests

Modified Files:
	imap2_unittest.c 
Log Message:
Added various function stubs.


Index: imap2_unittest.c
===================================================================
RCS file: /cvsroot/simplemail/simplemail/tests/imap2_unittest.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- imap2_unittest.c	24 Dec 2013 09:10:17 -0000	1.11
+++ imap2_unittest.c	24 Dec 2013 09:14:51 -0000	1.12
@@ -71,6 +71,22 @@
 	printf("%s\n", text);
 }
 
+void main_refresh_folders(void)
+{
+}
+
+void search_refresh_folders(void)
+{
+}
+
+void config_refresh_folders(void)
+{
+}
+
+void filter_update_folder_list(void)
+{
+}
+
 /*************************************************************/
 
 void *test_imap_timer_callback(void *data)

[Simplemail-cvs] simplemail/gtk subthreads.c,1.38,1.39

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail/simplemail/gtk
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31321/gtk

Modified Files:
	subthreads.c 
Log Message:
Implemented thread_call_parent_function_sync() in a proper/better way.


Index: subthreads.c
===================================================================
RCS file: /cvsroot/simplemail/simplemail/gtk/subthreads.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- subthreads.c	24 Dec 2013 09:14:18 -0000	1.38
+++ subthreads.c	24 Dec 2013 09:14:35 -0000	1.39
@@ -571,22 +571,18 @@
 
 int thread_call_parent_function_sync(int *success, void *function, int argcount, ...)
 {
-	struct ipc_message msg;
+	uintptr_t rc;
+	int s;
+
 	va_list argptr;
 
 	va_start(argptr,argcount);
-	memset(&msg,0,sizeof(msg));
-	msg.async = 0;
-	msg.function = function;
-	msg.argcount = argcount;
-	if (argcount--) msg.arg1 = va_arg(argptr, void *);
-	if (argcount--) msg.arg2 = va_arg(argptr, void *);
-	if (argcount--) msg.arg3 = va_arg(argptr, void *);
-	if (argcount--) msg.arg4 = va_arg(argptr, void *);
-	write(sockets[1],&msg,sizeof(msg));
+	s = thread_call_function_sync_v(&main_thread, &rc, function, argcount, argptr);
 	va_end(argptr);
-	read(sockets[1],&msg,sizeof(msg));
-	return msg.rc;
+	if (success)
+		*success = s;
+
+	return rc;
 }
 
 /***************************************************************************************/

[Simplemail-cvs] simplemail/gtk subthreads.c,1.37,1.38

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail/simplemail/gtk
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31231/gtk

Modified Files:
	subthreads.c 
Log Message:
Function thread_call_function_sync_v() now also may forward the return value.


Index: subthreads.c
===================================================================
RCS file: /cvsroot/simplemail/simplemail/gtk/subthreads.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- subthreads.c	24 Dec 2013 09:13:56 -0000	1.37
+++ subthreads.c	24 Dec 2013 09:14:18 -0000	1.38
@@ -23,6 +23,7 @@
 #include <assert.h>
 #include <stdarg.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <unistd.h>
 #include <string.h>
 #include <sys/socket.h>
@@ -277,6 +278,8 @@
 
 	GCond *sync_cond;
 	GMutex *sync_mutex;
+
+	uintptr_t rc;
 };
 
 /* FIXME: Note that if the args are not passed in a register, but e.g., on the stack this doesn't need to
@@ -285,17 +288,19 @@
 static gboolean thread_call_function_sync_entry(gpointer user_data)
 {
 	struct thread_call_function_sync_data *data = (struct thread_call_function_sync_data*)user_data;
+	uintptr_t rc;
 
 	switch (data->argcount)
 	{
-		case	0: data->function(); break;
-		case	1: ((int (*)(void*))data->function)(data->arg[0]);break;
-		case	2: ((int (*)(void*,void*))data->function)(data->arg[0],data->arg[1]);break;
-		case	3: ((int (*)(void*,void*,void*))data->function)(data->arg[0],data->arg[1],data->arg[2]);break;
-		case	4: ((int (*)(void*,void*,void*,void*))data->function)(data->arg[0],data->arg[1],data->arg[2],data->arg[3]);break;
-		case	5: ((int (*)(void*,void*,void*,void*,void*))data->function)(data->arg[0],data->arg[1],data->arg[2],data->arg[3],data->arg[4]);break;
-		case	6: ((int (*)(void*,void*,void*,void*,void*,void*))data->function)(data->arg[0],data->arg[1],data->arg[2],data->arg[3],data->arg[4],data->arg[5]);break;
+		case	0: rc = data->function(); break;
+		case	1: rc = ((int (*)(void*))data->function)(data->arg[0]);break;
+		case	2: rc = ((int (*)(void*,void*))data->function)(data->arg[0],data->arg[1]);break;
+		case	3: rc = ((int (*)(void*,void*,void*))data->function)(data->arg[0],data->arg[1],data->arg[2]);break;
+		case	4: rc = ((int (*)(void*,void*,void*,void*))data->function)(data->arg[0],data->arg[1],data->arg[2],data->arg[3]);break;
+		case	5: rc = ((int (*)(void*,void*,void*,void*,void*))data->function)(data->arg[0],data->arg[1],data->arg[2],data->arg[3],data->arg[4]);break;
+		case	6: rc = ((int (*)(void*,void*,void*,void*,void*,void*))data->function)(data->arg[0],data->arg[1],data->arg[2],data->arg[3],data->arg[4],data->arg[5]);break;
 	}
+	data->rc = rc;
 	g_mutex_lock(data->sync_mutex);
 	g_cond_signal(data->sync_cond);
 	g_mutex_unlock(data->sync_mutex);
@@ -303,7 +308,7 @@
 	return 0;
 }
 
-static int thread_call_function_sync_v(thread_t thread, void *function, int argcount, va_list argptr)
+static int thread_call_function_sync_v(thread_t thread, uintptr_t *rc, void *function, int argcount, va_list argptr)
 {
 	struct thread_call_function_sync_data data;
 	int i;
@@ -328,6 +333,8 @@
 	g_cond_wait(data.sync_cond, data.sync_mutex);
 	g_mutex_unlock(data.sync_mutex);
 
+	if (rc) *rc = data.rc;
+
 	return 0;
 }
 
@@ -338,7 +345,7 @@
 	va_list argptr;
 
 	va_start(argptr,argcount);
-	rc = thread_call_function_sync_v(thread, function, argcount, argptr);
+	rc = thread_call_function_sync_v(thread, NULL, function, argcount, argptr);
 	va_end(argptr);
 	return rc;
 }

[Simplemail-cvs] simplemail/gtk subthreads.c,1.36,1.37

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail/simplemail/gtk
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30980/gtk

Modified Files:
	subthreads.c 
Log Message:
Added thread_call_function_sync_v() function.

This is similar to thread_call_function_sync() but accepts the arguments
as a va_list.


Index: subthreads.c
===================================================================
RCS file: /cvsroot/simplemail/simplemail/gtk/subthreads.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- subthreads.c	24 Dec 2013 09:13:40 -0000	1.36
+++ subthreads.c	24 Dec 2013 09:13:56 -0000	1.37
@@ -303,17 +303,13 @@
 	return 0;
 }
 
-int thread_call_function_sync(thread_t thread, void *function, int argcount, ...)
+static int thread_call_function_sync_v(thread_t thread, void *function, int argcount, va_list argptr)
 {
 	struct thread_call_function_sync_data data;
 	int i;
 
-	va_list argptr;
-
 	assert(argcount < THREAD_CALL_FUNCTION_SYNC_DATA_NUM_ARGS);
 
-	va_start(argptr,argcount);
-
 	data.function = (int (*)(void))function;
 	data.argcount = argcount;
 	data.sync_cond = g_cond_new();
@@ -325,8 +321,6 @@
 	for (i=0; i < argcount; i++)
 		data.arg[i] = va_arg(argptr, void *);
 
-	va_end (argptr);
-
 	g_mutex_lock(data.sync_mutex);
 
 	g_main_context_invoke(thread->context, thread_call_function_sync_entry, &data);
@@ -337,6 +331,18 @@
 	return 0;
 }
 
+int thread_call_function_sync(thread_t thread, void *function, int argcount, ...)
+{
+	int rc;
+
+	va_list argptr;
+
+	va_start(argptr,argcount);
+	rc = thread_call_function_sync_v(thread, function, argcount, argptr);
+	va_end(argptr);
+	return rc;
+}
+
 /***************************************************************************************/
 
 /* FIXME: Note that if the args are not passed in a register, but e.g., on the stack this doesn't need to

[Simplemail-cvs] simplemail/gtk subthreads.c,1.35,1.36

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail/simplemail/gtk
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30949/gtk

Modified Files:
	subthreads.c 
Log Message:
Ensure that g_main_loop_quit() is called only on context of the main loop.


Index: subthreads.c
===================================================================
RCS file: /cvsroot/simplemail/simplemail/gtk/subthreads.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- subthreads.c	24 Dec 2013 09:13:18 -0000	1.35
+++ subthreads.c	24 Dec 2013 09:13:40 -0000	1.36
@@ -245,9 +245,16 @@
 
 /***************************************************************************************/
 
+static gboolean thread_abort_entry(gpointer udata)
+{
+	struct thread_s *t = (struct thread_s*)udata;
+	g_main_loop_quit(t->main_loop);
+	return 0;
+}
+
 void thread_abort(thread_t thread)
 {
-	g_main_loop_quit(thread->main_loop);
+	g_main_context_invoke(thread->context, thread_abort_entry, thread);
 }
 
 /***************************************************************************************/

[Simplemail-cvs] simplemail/gtk subthreads.c,1.34,1.35

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail/simplemail/gtk
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30913/gtk

Modified Files:
	subthreads.c 
Log Message:
Unref loop and context.


Index: subthreads.c
===================================================================
RCS file: /cvsroot/simplemail/simplemail/gtk/subthreads.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- subthreads.c	24 Dec 2013 09:12:59 -0000	1.34
+++ subthreads.c	24 Dec 2013 09:13:18 -0000	1.35
@@ -109,6 +109,9 @@
 	}
 	g_mutex_unlock(thread_list_mutex);
 
+	g_main_loop_unref(main_thread.main_loop);
+	g_main_context_unref(main_thread.context);
+
 	g_mutex_free(thread_list_mutex);
 
 }
@@ -188,6 +191,8 @@
 	node_remove(&tad->thread->node);
 	g_mutex_unlock(thread_list_mutex);
 
+	g_main_loop_unref(tad->thread->main_loop);
+	g_main_context_unref(tad->thread->context);
 	return NULL;
 }
 

[Simplemail-cvs] simplemail/gtk subthreads.c,1.33,1.34

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail/simplemail/gtk
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30865/gtk

Modified Files:
	subthreads.c 
Log Message:
Abort all available threads when cleaning up.


Index: subthreads.c
===================================================================
RCS file: /cvsroot/simplemail/simplemail/gtk/subthreads.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- subthreads.c	24 Dec 2013 09:12:43 -0000	1.33
+++ subthreads.c	24 Dec 2013 09:12:59 -0000	1.34
@@ -98,7 +98,19 @@
 
 void cleanup_threads(void)
 {
+	struct thread_s *t;
+
+	g_mutex_lock(thread_list_mutex);
+	t = (struct thread_s*)list_first(&thread_list);
+	while (t)
+	{
+		thread_abort(t);
+		t = (struct thread_s*)node_next(&t->node);
+	}
+	g_mutex_unlock(thread_list_mutex);
+
 	g_mutex_free(thread_list_mutex);
+
 }
 
 /***************************************************************************************/

[Simplemail-cvs] simplemail/gtk subthreads.c,1.32,1.33

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail/simplemail/gtk
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30841/gtk

Modified Files:
	subthreads.c 
Log Message:
Remove the thread from the thread list if it ends.


Index: subthreads.c
===================================================================
RCS file: /cvsroot/simplemail/simplemail/gtk/subthreads.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- subthreads.c	24 Dec 2013 09:12:28 -0000	1.32
+++ subthreads.c	24 Dec 2013 09:12:43 -0000	1.33
@@ -171,6 +171,11 @@
 	tad->thread->main_loop = g_main_loop_new(tad->thread->context, FALSE);
 
 	tad->entry(tad->eudata);
+
+	g_mutex_lock(thread_list_mutex);
+	node_remove(&tad->thread->node);
+	g_mutex_unlock(thread_list_mutex);
+
 	return NULL;
 }
 

[Simplemail-cvs] simplemail/gtk subthreads.c,1.31,1.32

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail/simplemail/gtk
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30807/gtk

Modified Files:
	subthreads.c 
Log Message:
Fixed some memory leaks.


Index: subthreads.c
===================================================================
RCS file: /cvsroot/simplemail/simplemail/gtk/subthreads.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- subthreads.c	24 Dec 2013 08:58:25 -0000	1.31
+++ subthreads.c	24 Dec 2013 09:12:28 -0000	1.32
@@ -327,6 +327,7 @@
 		case	5: ((int (*)(void*,void*,void*,void*,void*))data->function)(data->arg[0],data->arg[1],data->arg[2],data->arg[3],data->arg[4]);break;
 		case	6: ((int (*)(void*,void*,void*,void*,void*,void*))data->function)(data->arg[0],data->arg[1],data->arg[2],data->arg[3],data->arg[4],data->arg[5]);break;
 	}
+	free(data);
 	return 0;
 }
 
@@ -590,6 +591,7 @@
 
 	if (data->argcount)
 		free(data->arg[0]);
+	free(data);
 
 	return 0;
 }

[Simplemail-cvs] simplemail/tests makefile,1.37,1.38

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail/simplemail/tests
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30784/tests

Modified Files:
	makefile 
Log Message:
The run, memlekas, and helgrind targets now depend on dovecot for imap unit tests.


Index: makefile
===================================================================
RCS file: /cvsroot/simplemail/simplemail/tests/makefile,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- makefile	24 Dec 2013 09:11:57 -0000	1.37
+++ makefile	24 Dec 2013 09:12:13 -0000	1.38
@@ -111,7 +111,7 @@
 
 # run template
 define run.tmpl
-run-$(1): $(1)
+run-$(1): $(1) $(if $(findstring imap,$(1)), dovecot)
 	$(if $(findstring imap,$(1)), -$(DOVECOT) stop)
 	$(if $(findstring imap,$(1)), $(DOVECOT))
 	./$$<
@@ -125,7 +125,7 @@
 
 # memleaks template
 define memleak.tmpl
-memleaks-$(1): $(1)
+memleaks-$(1): $(1) $(if $(findstring imap,$(1)), dovecot)
 	$(if $(findstring imap,$(1)), -$(DOVECOT) stop)
 	$(if $(findstring imap,$(1)), $(DOVECOT))
 ifdef USE_VALGRIND_XML
@@ -147,7 +147,7 @@
 
 # helgrind template
 define helgrind.tmpl
-helgrind-$(1): $(1)
+helgrind-$(1): $(1) $(if $(findstring imap,$(1)), dovecot)
 	$(if $(findstring imap,$(1)), -$(DOVECOT) stop)
 	$(if $(findstring imap,$(1)), $(DOVECOT))
 ifdef USE_VALGRIND_XML

[Simplemail-cvs] simplemail/tests makefile,1.36,1.37

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail/simplemail/tests
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30743/tests

Modified Files:
	makefile 
Log Message:
Start the imap server automatically when running an imap test.


Index: makefile
===================================================================
RCS file: /cvsroot/simplemail/simplemail/tests/makefile,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- makefile	24 Dec 2013 09:11:41 -0000	1.36
+++ makefile	24 Dec 2013 09:11:57 -0000	1.37
@@ -112,7 +112,10 @@
 # run template
 define run.tmpl
 run-$(1): $(1)
+	$(if $(findstring imap,$(1)), -$(DOVECOT) stop)
+	$(if $(findstring imap,$(1)), $(DOVECOT))
 	./$$<
+	$(if $(findstring imap,$(1)), $(DOVECOT) stop)
 endef
 
 # "instanciate" run targets
@@ -123,11 +126,14 @@
 # memleaks template
 define memleak.tmpl
 memleaks-$(1): $(1)
+	$(if $(findstring imap,$(1)), -$(DOVECOT) stop)
+	$(if $(findstring imap,$(1)), $(DOVECOT))
 ifdef USE_VALGRIND_XML
 	valgrind $(VALGRIND_OPTS) --xml=yes --xml-file=$$@.xml ./$$<
 else
 	valgrind $(VALGRIND_OPTS) ./$$<
 endif
+	$(if $(findstring imap,$(1)), $(DOVECOT) stop)
 endef
 
 # "instanciate" memleak targets
@@ -142,11 +148,14 @@
 # helgrind template
 define helgrind.tmpl
 helgrind-$(1): $(1)
+	$(if $(findstring imap,$(1)), -$(DOVECOT) stop)
+	$(if $(findstring imap,$(1)), $(DOVECOT))
 ifdef USE_VALGRIND_XML
 	valgrind --tool=helgrind --xml=yes --xml-file=$$@.xml ./$$<
 else
 	valgrind --tool=helgrind ./$$<
 endif
+	$(if $(findstring imap,$(1)), $(DOVECOT) stop)
 endef
 
 # "instanciate" memleak targets

[Simplemail-cvs] simplemail/tests makefile,1.35,1.36

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail/simplemail/tests
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30719/tests

Modified Files:
	makefile 
Log Message:
Moved the various test targets at the bottom of the file.


Index: makefile
===================================================================
RCS file: /cvsroot/simplemail/simplemail/tests/makefile,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- makefile	24 Dec 2013 09:11:09 -0000	1.35
+++ makefile	24 Dec 2013 09:11:41 -0000	1.36
@@ -55,55 +55,6 @@
 lib$(SIMPLEMAIL_LIB).a: $(OBJS)
 	ar rcs $@ $(OBJS)
 
-# Define memleak targets
-MEMLEAKS_TARGETS = $(foreach testexe,$(TESTEXES),memleaks-$(testexe))
-
-# run template
-define run.tmpl
-run-$(1): $(1)
-	./$$<
-endef
-
-# "instanciate" run targets
-$(foreach testexe,$(TESTEXES), \
- $(eval $(call run.tmpl,$(testexe))) \
-)
-
-# memleaks template
-define memleak.tmpl
-memleaks-$(1): $(1)
-ifdef USE_VALGRIND_XML
-	valgrind $(VALGRIND_OPTS) --xml=yes --xml-file=$$@.xml ./$$<
-else
-	valgrind $(VALGRIND_OPTS) ./$$<
-endif
-endef
-
-# "instanciate" memleak targets
-$(foreach testexe,$(TESTEXES), \
- $(eval $(call memleak.tmpl,$(testexe))) \
-)
-
-.PHONY: memleaks
-memleaks: $(MEMLEAKS_TARGETS)
-
-
-# helgrind template
-define helgrind.tmpl
-helgrind-$(1): $(1)
-ifdef USE_VALGRIND_XML
-	valgrind --tool=helgrind --xml=yes --xml-file=$$@.xml ./$$<
-else
-	valgrind --tool=helgrind ./$$<
-endif
-endef
-
-# "instanciate" memleak targets
-$(foreach testexe,$(TESTEXES), \
- $(eval $(call helgrind.tmpl,$(testexe))) \
-)
-
-
 .PHONY: clean
 clean:
 	-rm -Rf test-objs $(TESTEXES) $(addsuffix .o,$(TESTEXES))
@@ -154,3 +105,51 @@
 	sleep 2
 	./imap2_unittest
 	$(DOVECOT) stop
+
+# Define memleak targets
+MEMLEAKS_TARGETS = $(foreach testexe,$(TESTEXES),memleaks-$(testexe))
+
+# run template
+define run.tmpl
+run-$(1): $(1)
+	./$$<
+endef
+
+# "instanciate" run targets
+$(foreach testexe,$(TESTEXES), \
+ $(eval $(call run.tmpl,$(testexe))) \
+)
+
+# memleaks template
+define memleak.tmpl
+memleaks-$(1): $(1)
+ifdef USE_VALGRIND_XML
+	valgrind $(VALGRIND_OPTS) --xml=yes --xml-file=$$@.xml ./$$<
+else
+	valgrind $(VALGRIND_OPTS) ./$$<
+endif
+endef
+
+# "instanciate" memleak targets
+$(foreach testexe,$(TESTEXES), \
+ $(eval $(call memleak.tmpl,$(testexe))) \
+)
+
+.PHONY: memleaks
+memleaks: $(MEMLEAKS_TARGETS)
+
+
+# helgrind template
+define helgrind.tmpl
+helgrind-$(1): $(1)
+ifdef USE_VALGRIND_XML
+	valgrind --tool=helgrind --xml=yes --xml-file=$$@.xml ./$$<
+else
+	valgrind --tool=helgrind ./$$<
+endif
+endef
+
+# "instanciate" memleak targets
+$(foreach testexe,$(TESTEXES), \
+ $(eval $(call helgrind.tmpl,$(testexe))) \
+)

[Simplemail-cvs] simplemail/tests/dovecot-conf/conf.d 10-logging.conf, 1.1, 1.2

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail/simplemail/tests/dovecot-conf/conf.d
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30694/tests/dovecot-conf/conf.d

Modified Files:
	10-logging.conf 
Log Message:
Redirect logging to stderr.


Index: 10-logging.conf
===================================================================
RCS file: /cvsroot/simplemail/simplemail/tests/dovecot-conf/conf.d/10-logging.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- 10-logging.conf	24 Dec 2013 09:04:58 -0000	1.1
+++ 10-logging.conf	24 Dec 2013 09:11:26 -0000	1.2
@@ -5,6 +5,7 @@
 # Log file to use for error messages. "syslog" logs to syslog,
 # /dev/stderr logs to stderr.
 #log_path = syslog
+log_path = /dev/stderr
 
 # Log file to use for informational messages. Defaults to log_path.
 #info_log_path = 

[Simplemail-cvs] simplemail/tests makefile,1.34,1.35

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail/simplemail/tests
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30636/tests

Modified Files:
	makefile 
Log Message:
Removed NODEBUG flag.


Index: makefile
===================================================================
RCS file: /cvsroot/simplemail/simplemail/tests/makefile,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- makefile	24 Dec 2013 09:09:12 -0000	1.34
+++ makefile	24 Dec 2013 09:11:09 -0000	1.35
@@ -14,7 +14,7 @@
 
 CC = gcc
 CFLAGS=-g -I .. -I ../indep-include/ -I ../gtk $(GLIB_CFLAGS) $(GTK_CFLAGS) \
-	-DNODEBUG -Dstricmp=strcasecmp -Dstrnicmp=strncasecmp -Werror
+	-Dstricmp=strcasecmp -Dstrnicmp=strncasecmp -Werror
 VALGRIND_OPTS = --leak-check=full --track-origins=yes 
 
 SIMPLEMAIL_LIB  = simplemail

[Simplemail-cvs] simplemail/tests .cvsignore,1.9,1.10

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail/simplemail/tests
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30580/tests

Modified Files:
	.cvsignore 
Log Message:
Ignore generated resources for dovecot.


Index: .cvsignore
===================================================================
RCS file: /cvsroot/simplemail/simplemail/tests/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- .cvsignore	12 Dec 2013 21:44:29 -0000	1.9
+++ .cvsignore	24 Dec 2013 09:10:45 -0000	1.10
@@ -12,3 +12,4 @@
 memleaks-*.xml
 test-profile
 imap-profile
+dovecot-2.2.9*

[Simplemail-cvs] simplemail/tests imap2_unittest.c,1.10,1.11

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail/simplemail/tests
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30555/tests

Modified Files:
	imap2_unittest.c 
Log Message:
Adjusted imap settings.


Index: imap2_unittest.c
===================================================================
RCS file: /cvsroot/simplemail/simplemail/tests/imap2_unittest.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- imap2_unittest.c	24 Dec 2013 08:58:41 -0000	1.10
+++ imap2_unittest.c	24 Dec 2013 09:10:17 -0000	1.11
@@ -113,11 +113,11 @@
 	CU_ASSERT(ac->imap->login != NULL);
 
 	if (ac->imap->passwd) free(ac->imap->passwd);
-	ac->imap->passwd = mystrdup("zzz");
+	ac->imap->passwd = mystrdup("test");
 	CU_ASSERT(ac->imap->passwd != NULL);
 
-	ac->imap->ssl = 1;
-	ac->imap->port = 993;
+	ac->imap->ssl = 0;
+	ac->imap->port = 10143;
 
 	insert_config_account(ac);
 	account_free(ac);

[Simplemail-cvs] simplemail/tests makefile,1.33,1.34

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail/simplemail/tests
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30448/tests

Modified Files:
	makefile 
Log Message:
Added imap-testsuite makefile target.

This will start the imap server, run the unit test and stops the server again.


Index: makefile
===================================================================
RCS file: /cvsroot/simplemail/simplemail/tests/makefile,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- makefile	24 Dec 2013 09:08:56 -0000	1.33
+++ makefile	24 Dec 2013 09:09:12 -0000	1.34
@@ -114,6 +114,7 @@
 DOVECOT_TGZ=$(notdir $(DOVECOT_URL))
 DOVECOT_DIR=$(DOVECOT_TGZ:%.tar.gz=%)
 DOVECOT_ABSDIR=$(shell pwd)/$(DOVECOT_DIR)
+DOVECOT=$(DOVECOT_DIR)-root/sbin/dovecot
 
 $(DOVECOT_TGZ):
 	wget -N $(DOVECOT_URL)
@@ -145,3 +146,11 @@
 
 dovecot-conf: dovecot-bin
 	cp -R $(DOVECOT_DIR)-root/share/doc/dovecot/example-config $(DOVECOT_DIR)-root/etc/dovecot
+
+.PHONY: imap-testsuite
+imap-testsuite: dovecot imap2_unittest
+	-$(DOVECOT) stop
+	$(DOVECOT)
+	sleep 2
+	./imap2_unittest
+	$(DOVECOT) stop

[Simplemail-cvs] simplemail/tests makefile,1.32,1.33

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail/simplemail/tests
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30385/tests

Modified Files:
	makefile 
Log Message:
Removed dirs target as it is no longer needed.


Index: makefile
===================================================================
RCS file: /cvsroot/simplemail/simplemail/tests/makefile,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- makefile	24 Dec 2013 09:08:40 -0000	1.32
+++ makefile	24 Dec 2013 09:08:56 -0000	1.33
@@ -46,11 +46,7 @@
 	$(CC) $@stubs.c unittest_tmpl.c -DUNITTEST_TABLE=\"$@_table.c\" -DUNITTEST_FILE=\"$<\" $(CFLAGS) -lcunit -L. -l$(SIMPLEMAIL_LIB) $(GLIB_LDFLAGS) $(GTK_LDFLAGS) -o $@
 
 .PHONY: all
-all: dirs files $(TESTEXES) memleaks
-
-.PHONY: dirs
-dirs:
-	mkdir -p test-objs/gtk
+all: files $(TESTEXES) memleaks
 
 .PHONY: files
 files: test-profile.tar.bz2

[Simplemail-cvs] simplemail/tests makefile,1.31,1.32

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail/simplemail/tests
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30354/tests

Modified Files:
	makefile 
Log Message:
Use DOVECOT_ABSDIR rather than the custom readlink variant.


Index: makefile
===================================================================
RCS file: /cvsroot/simplemail/simplemail/tests/makefile,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- makefile	24 Dec 2013 09:08:24 -0000	1.31
+++ makefile	24 Dec 2013 09:08:40 -0000	1.32
@@ -139,11 +139,11 @@
 	echo 'default_login_user = $(USER)' >>$(DOVECOT_DIR)-root/etc/dovecot/conf.d/00-default-user.conf
 	echo 'passdb {' >>$(DOVECOT_DIR)-root/etc/dovecot/conf.d/00-passwd.conf
 	echo '    driver = passwd-file' >>$(DOVECOT_DIR)-root/etc/dovecot/conf.d/00-passwd.conf
-	echo '    args = $(shell readlink -f $(DOVECOT_DIR)-root/etc/dovecot/passwd)' >>$(DOVECOT_DIR)-root/etc/dovecot/conf.d/00-passwd.conf
+	echo '    args = $(DOVECOT_ABSDIR)-root/etc/dovecot/passwd' >>$(DOVECOT_DIR)-root/etc/dovecot/conf.d/00-passwd.conf
 	echo '}' >>$(DOVECOT_DIR)-root/etc/dovecot/conf.d/00-passwd.conf
 	echo 'userdb {' >>$(DOVECOT_DIR)-root/etc/dovecot/conf.d/00-passwd.conf
 	echo '    driver = passwd-file' >>$(DOVECOT_DIR)-root/etc/dovecot/conf.d/00-passwd.conf
-	echo '    args = $(shell readlink -f $(DOVECOT_DIR)-root/etc/dovecot/passwd)' >>$(DOVECOT_DIR)-root/etc/dovecot/conf.d/00-passwd.conf
+	echo '    args = $(DOVECOT_ABSDIR)-root/etc/dovecot/passwd' >>$(DOVECOT_DIR)-root/etc/dovecot/conf.d/00-passwd.conf
 	echo '}' >>$(DOVECOT_DIR)-root/etc/dovecot/conf.d/00-passwd.conf
 	echo 'test:{plain}test::::$(DOVECOT_ABSDIR)-root/home/test::userdb_mail=maildir:~/Maildir' >$(DOVECOT_DIR)-root/etc/dovecot/passwd