4.89 JH/17 -> 4.90 JH/01

[exim.git] / src / src / bmi_spam.c

diff --git a/src/src/bmi_spam.c b/src/src/bmi_spam.c
index bbb9a512a7901d3fdc3e909018c8cec7f64e135d..378514939f1598ab82ab901ac9b94557c159c779 100644 (file)
--- a/src/src/bmi_spam.c
+++ b/src/src/bmi_spam.c
@@ -1,9 +1,7 @@
-/* $Cambridge: exim/src/src/bmi_spam.c,v 1.2 2004/12/16 15:11:47 tom Exp $ */
-
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
- 
+
 /* Code for calling Brightmail AntiSpam.
    Copyright (c) Tom Kistner <tom@duncanthrax.net> 2004
    License: GPL */
@@ -28,7 +26,7 @@ uschar *bmi_process_message(header_line *header_list, int data_fd) {
   uschar *host_address;
   uschar *verdicts = NULL;
   int i,j;
-  
+
   err = bmiInitSystem(BMI_VERSION, (char *)bmi_config_file, &system);
   if (bmiErrorIsFatal(err) == BMI_TRUE) {
     err_loc = bmiErrorGetLocation(err);
@@ -80,7 +78,7 @@ uschar *bmi_process_message(header_line *header_list, int data_fd) {
   for(i=0;i<recipients_count;i++) {
     recipient_item *r = recipients_list + i;
     BmiOptin *optin = NULL;
-    
+
     /* create optin object if optin string is given */
     if ((r->bmi_optin != NULL) && (Ustrlen(r->bmi_optin) > 1)) {
       debug_printf("passing bmiOptin string: %s\n", r->bmi_optin);
@@ -94,12 +92,12 @@ uschar *bmi_process_message(header_line *header_list, int data_fd) {
         optin = NULL;
       };
     };
-    
+
     err = bmiAccumulateTO((char *)r->address, optin, message);
-    
+
     if (optin != NULL)
       bmiOptinFree(optin);
-    
+
     if (bmiErrorIsFatal(err) == BMI_TRUE) {
       err_loc = bmiErrorGetLocation(err);
       err_type = bmiErrorGetType(err);
@@ -120,7 +118,7 @@ uschar *bmi_process_message(header_line *header_list, int data_fd) {
     bmiFreeSystem(system);
     return NULL;
   };
-  
+
   /* Send message headers */
   while (header_list != NULL) {
     /* skip deleted headers */
@@ -150,7 +148,7 @@ uschar *bmi_process_message(header_line *header_list, int data_fd) {
     bmiFreeSystem(system);
     return NULL;
   };
-  
+
   /* Send body */
   data_file = fdopen(data_fd,"r");
   do {
@@ -178,8 +176,8 @@ uschar *bmi_process_message(header_line *header_list, int data_fd) {
     bmiFreeSystem(system);
     return NULL;
   };
-  
-  
+
+
   /* End message */
   err = bmiEndMessage(message);
   if (bmiErrorIsFatal(err) == BMI_TRUE) {
@@ -191,11 +189,11 @@ uschar *bmi_process_message(header_line *header_list, int data_fd) {
     bmiFreeSystem(system);
     return NULL;
   };
-  
+
   /* get store for the verdict string */
   verdicts = store_get(1);
   *verdicts = '\0';
-  
+
   for ( err = bmiAccessFirstVerdict(message, &verdict);
         verdict != NULL;
         err = bmiAccessNextVerdict(message, verdict, &verdict) ) {
@@ -227,7 +225,7 @@ int bmi_get_delivery_status(uschar *base64_verdict) {
   BmiErrorType err_type;
   BmiVerdict *verdict = NULL;
   int rc = 1;   /* deliver by default */
-  
+
   /* always deliver when there is no verdict */
   if (base64_verdict == NULL)
     return 1;
@@ -249,7 +247,7 @@ int bmi_get_delivery_status(uschar *base64_verdict) {
   }
   else if (bmiVerdictDestinationIsDefault(verdict) == BMI_TRUE) {
     /* deliver normally */
-    rc = 1;    
+    rc = 1;
   }
   else if (bmiVerdictAccessDestination(verdict) == NULL) {
     /* do not deliver */
@@ -259,7 +257,7 @@ int bmi_get_delivery_status(uschar *base64_verdict) {
     /* deliver to alternate location */
     rc = 1;
   };
-  
+
   bmiFreeVerdict(verdict);
   return rc;
 }
@@ -271,7 +269,7 @@ uschar *bmi_get_alt_location(uschar *base64_verdict) {
   BmiErrorType err_type;
   BmiVerdict *verdict = NULL;
   uschar *rc = NULL;
-  
+
   /* always deliver when there is no verdict */
   if (base64_verdict == NULL)
     return NULL;
@@ -285,7 +283,7 @@ uschar *bmi_get_alt_location(uschar *base64_verdict) {
                "bmi error [loc %d type %d]: bmiCreateVerdictFromStr() failed. [%s]", (int)err_loc, (int)err_type, base64_verdict);
     return NULL;
   };
-  
+
   err = bmiVerdictError(verdict);
   if (bmiErrorIsFatal(err) == BMI_TRUE) {
     /* deliver normally due to error */
@@ -293,7 +291,7 @@ uschar *bmi_get_alt_location(uschar *base64_verdict) {
   }
   else if (bmiVerdictDestinationIsDefault(verdict) == BMI_TRUE) {
     /* deliver normally */
-    rc = NULL; 
+    rc = NULL;
   }
   else if (bmiVerdictAccessDestination(verdict) == NULL) {
     /* do not deliver */
@@ -305,7 +303,7 @@ uschar *bmi_get_alt_location(uschar *base64_verdict) {
     Ustrcpy(rc, bmiVerdictAccessDestination(verdict));
     rc[strlen(bmiVerdictAccessDestination(verdict))] = '\0';
   };
-  
+
   bmiFreeVerdict(verdict);
   return rc;
 }
@@ -320,20 +318,20 @@ uschar *bmi_get_base64_verdict(uschar *bmi_local_part, uschar *bmi_domain) {
   uschar *verdict_ptr;
   uschar *verdict_buffer = NULL;
   int sep = 0;
-  
+
   /* return nothing if there are no verdicts available */
   if (bmi_verdicts == NULL)
     return NULL;
-  
+
   /* allocate room for the b64 verdict string */
   verdict_buffer = store_get(Ustrlen(bmi_verdicts)+1);
-  
+
   /* loop through verdicts */
   verdict_ptr = bmi_verdicts;
   while ((verdict_str = (const char *)string_nextinlist(&verdict_ptr, &sep,
                                           verdict_buffer,
                                           Ustrlen(bmi_verdicts)+1)) != NULL) {
-    
+
     /* create verdict from base64 string */
     err = bmiCreateVerdictFromStr(verdict_str, &verdict);
     if (bmiErrorIsFatal(err) == BMI_TRUE) {
@@ -343,14 +341,14 @@ uschar *bmi_get_base64_verdict(uschar *bmi_local_part, uschar *bmi_domain) {
                  "bmi error [loc %d type %d]: bmiCreateVerdictFromStr() failed. [%s]", (int)err_loc, (int)err_type, verdict_str);
       return NULL;
     };
-    
+
     /* loop through rcpts for this verdict */
     for ( recipient = bmiVerdictAccessFirstRecipient(verdict);
           recipient != NULL;
           recipient = bmiVerdictAccessNextRecipient(verdict, recipient)) {
       uschar *rcpt_local_part;
       uschar *rcpt_domain;
-      
+
       /* compare address against our subject */
       rcpt_local_part = (unsigned char *)bmiRecipientAccessAddress(recipient);
       rcpt_domain = Ustrchr(rcpt_local_part,'@');
@@ -367,12 +365,12 @@ uschar *bmi_get_base64_verdict(uschar *bmi_local_part, uschar *bmi_domain) {
         /* found verdict */
         bmiFreeVerdict(verdict);
         return (uschar *)verdict_str;
-      };   
+      };
     };
-  
+
     bmiFreeVerdict(verdict);
   };
-  
+
   return NULL;
 }
 
@@ -383,7 +381,7 @@ uschar *bmi_get_base64_tracker_verdict(uschar *base64_verdict) {
   BmiErrorType err_type;
   BmiVerdict *verdict = NULL;
   uschar *rc = NULL;
-  
+
   /* always deliver when there is no verdict */
   if (base64_verdict == NULL)
     return NULL;
@@ -397,7 +395,7 @@ uschar *bmi_get_base64_tracker_verdict(uschar *base64_verdict) {
                "bmi error [loc %d type %d]: bmiCreateVerdictFromStr() failed. [%s]", (int)err_loc, (int)err_type, base64_verdict);
     return NULL;
   };
-  
+
   /* create old tracker string from verdict */
   err = bmiCreateOldStrFromVerdict(verdict, &rc);
   if (bmiErrorIsFatal(err) == BMI_TRUE) {
@@ -407,7 +405,7 @@ uschar *bmi_get_base64_tracker_verdict(uschar *base64_verdict) {
                "bmi error [loc %d type %d]: bmiCreateOldStrFromVerdict() failed. [%s]", (int)err_loc, (int)err_type, base64_verdict);
     return NULL;
   };
-  
+
   bmiFreeVerdict(verdict);
   return rc;
 }
@@ -423,12 +421,12 @@ int bmi_check_rule(uschar *base64_verdict, uschar *option_list) {
   uschar *rule_ptr;
   uschar rule_buffer[32];
   int sep = 0;
-  
-  
+
+
   /* no verdict -> no rule fired */
   if (base64_verdict == NULL)
     return 0;
-  
+
   /* create verdict from base64 string */
   err = bmiCreateVerdictFromStr(CS base64_verdict, &verdict);
   if (bmiErrorIsFatal(err) == BMI_TRUE) {
@@ -438,22 +436,22 @@ int bmi_check_rule(uschar *base64_verdict, uschar *option_list) {
                "bmi error [loc %d type %d]: bmiCreateVerdictFromStr() failed. [%s]", (int)err_loc, (int)err_type, base64_verdict);
     return 0;
   };
-  
+
   err = bmiVerdictError(verdict);
   if (bmiErrorIsFatal(err) == BMI_TRUE) {
     /* error -> no rule fired */
     bmiFreeVerdict(verdict);
     return 0;
   }
-  
+
   /* loop through numbers */
   rule_ptr = option_list;
   while ((rule_num = string_nextinlist(&rule_ptr, &sep,
                                        rule_buffer, 32)) != NULL) {
     int rule_int = -1;
-    
+
     /* try to translate to int */
-    sscanf(rule_num, "%d", &rule_int);
+    (void)sscanf(rule_num, "%d", &rule_int);
     if (rule_int > 0) {
       debug_printf("checking rule #%d\n", rule_int);
       /* check if rule fired on the message */