@@ -1,3 +1,8 @@

+Tue Nov  4 13:11:24 EET 2008 (edwin)

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

+ * contrib/clamdtop/TODO, contrib/clamdtop/clamdtop.c: fix bar

+ calculation: releasable is part of free mention mempool in TODO

+

 Tue Nov  4 12:56:46 EET 2008 (edwin)

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

  * libclamav/matcher-ac.c (cli_ac_addsig): need to use mpool allocated memory for ->str

@@ -3,3 +3,4 @@ write a manpage

 consider writing a GUI using Tk 8.5 (version 8.5 has much nicer widgets than 8.4)

 integrate into toplevel clamav, and build if ncurses is available (optional)

 figure out minimum version of ncurses required, I used 5.5 during development.

+show mempool statistics too.

@@ -35,6 +35,7 @@

 #include <sys/socket.h>

 #include <sys/un.h>

 #include <sys/time.h>

+#include <assert.h>

 enum colors {

 	header_color=1,

@@ -237,6 +238,7 @@ static void show_bar(WINDOW *win, size_t i, unsigned live, unsigned idle,

 	unsigned dim   = idle*(len - start - 2) / max;

 	unsigned rem = len - activ - dim - start-2;

+	assert(activ + 2 < len && activ+dim + 2 < len && activ+dim+rem + 2 < len && "Invalid values");

 	mvwaddch(win, i, start, '[' | A_BOLD);

 	wattron(win, A_BOLD | COLOR_PAIR(activ_color));

 	for(i=0;i<activ;i++)

@@ -349,7 +351,7 @@ static void output_memstats(const char* line)

 		biggest_mem = totalmem;

 		blink = 1;

 	}

-	show_bar(mem_window, 3, totalmem, ltotalf + lmmapu + lreleasable,

+	show_bar(mem_window, 3, totalmem, lmmapu + lreleasable,

 			biggest_mem, blink);

 	wrefresh(mem_window);

 }