diff options
| author | Radek Doulik <rodo@ximian.com> | 2004-01-06 04:50:43 +0800 |
|---|---|---|
| committer | Radek Doulik <rodo@src.gnome.org> | 2004-01-06 04:50:43 +0800 |
| commit | b6fe2d975c252ede538860591b286294c46b0b4f (patch) | |
| tree | 267b3a2f7aa87a837c45a39b38838791355106a7 | |
| parent | 135e1d6968e7205611aea943496f1fd3f5ba04fc (diff) | |
| download | gsoc2013-evolution-b6fe2d975c252ede538860591b286294c46b0b4f.tar gsoc2013-evolution-b6fe2d975c252ede538860591b286294c46b0b4f.tar.gz gsoc2013-evolution-b6fe2d975c252ede538860591b286294c46b0b4f.tar.bz2 gsoc2013-evolution-b6fe2d975c252ede538860591b286294c46b0b4f.tar.lz gsoc2013-evolution-b6fe2d975c252ede538860591b286294c46b0b4f.tar.xz gsoc2013-evolution-b6fe2d975c252ede538860591b286294c46b0b4f.tar.zst gsoc2013-evolution-b6fe2d975c252ede538860591b286294c46b0b4f.zip | |
add NULL at the end of argv for execvp (poited out by Frank Solensky,
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
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/em-junk-filter.c | 29 |
2 files changed, 23 insertions, 11 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 6d87c0fd40..56162ef0b0 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -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 diff --git a/mail/em-junk-filter.c b/mail/em-junk-filter.c index 7d6b9346e8..8c5888e7c5 100644 --- a/mail/em-junk-filter.c +++ b/mail/em-junk-filter.c @@ -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");) |