callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add NULL at the end of argv for execvp (poited out by Frank Solensky,

Browse Source 
2004-01-05  Radek Doulik  <rodo@ximian.com>

	* em-junk-filter.c: add NULL at the end of argv for execvp (poited
	out by Frank Solensky, thanks)

svn path=/trunk/; revision=24059
This commit is contained in:
Radek Doulik
2004-01-05 20:50:43 +00:00
committed by Radek Doulik
parent 135e1d6968
commit b6fe2d975c
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mail/ChangeLog
View File

@ -1,3 +1,8 @@
2004-01-05 Radek Doulik <rodo@ximian.com>
* em-junk-filter.c: add NULL at the end of argv for execvp (poited
out by Frank Solensky, thanks)
2004-01-05 Jeffrey Stedfast <fejj@ximian.com>
* em-folder-browser.c (emfb_list_message_selected): Check that the

29
mail/em-junk-filter.c
View File

@ -166,9 +166,10 @@ pipe_to_sa (CamelMimeMessage *msg, gchar *in, int argc, gchar **argv)
static int
em_junk_sa_test_spamd_running (gint port)
{
static gchar *sac_args [3] = {
static gchar *sac_args [4] = {
"/bin/sh",
"-c",
NULL,
NULL
};
int retval;
@ -186,10 +187,11 @@ static void
em_junk_sa_test_spamd ()
{
gint i, port = 7830;
static gchar *args [3] = {
static gchar *args [4] = {
"/bin/sh",
"-c",
"spamassassin --version"
"spamassassin --version",
NULL
};
if (pipe_to_sa (NULL, NULL, 3, args))
@ -213,9 +215,10 @@ em_junk_sa_test_spamd ()
/* } */
if (!em_junk_sa_use_spamc) {
static gchar *sad_args [3] = {
static gchar *sad_args [4] = {
"/bin/sh",
"-c",
NULL,
NULL
};
gint i, port = 7830;
@ -258,9 +261,10 @@ em_junk_sa_is_available ()
static gboolean
em_junk_sa_check_junk (CamelMimeMessage *msg)
{
static gchar *args [3] = {
static gchar *args [4] = {
"/bin/sh",
"-c",
NULL,
NULL
};
gint retval;
@ -293,14 +297,15 @@ em_junk_sa_check_junk (CamelMimeMessage *msg)
static void
em_junk_sa_report_junk (CamelMimeMessage *msg)
{
static gchar *args [3] = {
static gchar *args [4] = {
"/bin/sh",
"-c",
"sa-learn"
" --no-rebuild" /* do not rebuild db */
" --spam" /* report junk */
" --single" /* single message */
" --local" /* local only */
" --local", /* local only */
NULL
};
d(fprintf (stderr, "em_junk_sa_report_junk\n"));
@ -312,14 +317,15 @@ em_junk_sa_report_junk (CamelMimeMessage *msg)
static void
em_junk_sa_report_notjunk (CamelMimeMessage *msg)
{
static gchar *args [3] = {
static gchar *args [4] = {
"/bin/sh",
"-c",
"sa-learn"
" --no-rebuild" /* do not rebuild db */
" --ham" /* report notjunk */
" --single" /* single message */
" --local" /* local only */
" --local", /* local only */
NULL
};
d(fprintf (stderr, "em_junk_sa_report_notjunk\n"));
@ -331,12 +337,13 @@ em_junk_sa_report_notjunk (CamelMimeMessage *msg)
static void
em_junk_sa_commit_reports (void)
{
static gchar *args [3] = {
static gchar *args [4] = {
"/bin/sh",
"-c",
"sa-learn"
" --rebuild" /* do not rebuild db */
" --local" /* local only */
" --local", /* local only */
NULL
};
d(fprintf (stderr, "em_junk_sa_commit_reports\n");)