exec plugin: Change the input format so it's identical to the one used in unixsock.

[collectd.git] / src / email.c

diff --git a/src/email.c b/src/email.c
index b476755..594ef96 100644 (file)
--- a/src/email.c
+++ b/src/email.c
@@ -4,8 +4,7 @@
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
+ * Free Software Foundation; only version 2 of the License is applicable.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -44,20 +43,9 @@
 # include <pthread.h>
 #endif
 
-#if HAVE_SYS_SELECT_H
-#      include <sys/select.h>
-#endif /* HAVE_SYS_SELECT_H */
-
-#if HAVE_SYS_SOCKET_H
-#      include <sys/socket.h>
-#endif /* HAVE_SYS_SOCKET_H */
-
-/* *sigh* glibc does not define UNIX_PATH_MAX in sys/un.h ... */
-#if HAVE_LINUX_UN_H
-#      include <linux/un.h>
-#elif HAVE_SYS_UN_H
-#      include <sys/un.h>
-#endif /* HAVE_LINUX_UN_H | HAVE_SYS_UN_H */
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <sys/select.h>
 
 /* some systems (e.g. Darwin) seem to not define UNIX_PATH_MAX at all */
 #ifndef UNIX_PATH_MAX
@@ -791,7 +779,8 @@ static int email_read (void)
 {
        type_t *ptr;
 
-       double sc;
+       double score_old;
+       int score_count_old;
 
        static type_list_t *cnt;
        static type_list_t *sz;
@@ -840,13 +829,15 @@ static int email_read (void)
        /* spam score */
        pthread_mutex_lock (&score_mutex);
 
-       sc = score;
+       score_old = score;
+       score_count_old = score_count;
        score = 0.0;
        score_count = 0;
 
        pthread_mutex_unlock (&score_mutex);
 
-       email_submit ("spam_score", "", sc);
+       if (score_count_old > 0)
+               email_submit ("spam_score", "", score_old);
 
        /* spam checks */
        pthread_mutex_lock (&check_mutex);