Finished i;ascii-numeric comparator and fixed a segfault bug in the process.

README

@@ -50,7 +50,7 @@ Extensions and their implementation status:
 
   Other RFCs/drafts:
     subaddress: full
-    comparator-i;ascii-numeric: full, but fails to handle leading zeros
+    comparator-i;ascii-numeric: full
     relational: full 
     regex: full, but suboptimal
     vacation: validation, generation and interpretation; no execution

src/lib-sieve/cmd-if.c

@@ -165,7 +165,7 @@ static bool cmd_if_generate
 		 * anyway. 
 		 */
 		if ( !sieve_command_block_exits_unconditionally(ctx) ) {
-			sieve_operation_emit_code(sbin, SIEVE_OPCODE_JMP);
+			sieve_operation_emit_code(sbin, &sieve_jmp_opcode);
 			ctx_data->exit_jump = sieve_binary_emit_offset(sbin, 0);
 			ctx_data->jump_generated = TRUE;
 		}

src/lib-sieve/plugins/comparator-i-ascii-numeric/ext-cmp-i-ascii-numeric.c

@@ -3,7 +3,7 @@
  *
  * Author: Stephan Bosch
  * Specification: RFC 2244
- * Implementation: full, but fails to handle leading zeros.
+ * Implementation: full
  * Status: experimental, largely untested
  * 
  */
@@ -97,35 +97,40 @@ static bool ext_cmp_i_ascii_numeric_interpreter_load
 
 static int cmp_i_ascii_numeric_compare
 	(const struct sieve_comparator *cmp ATTR_UNUSED, 
-		const char *val1, size_t val1_size, const char *val2, size_t val2_size)
-{
-	unsigned int i = 0;
-	int result = 0;
-	const char *nval1 = (const char *) val1, *nval2 = (const char *) val2;
-
-	while ( i < val1_size && i < val2_size ) {	
-		if ( isdigit(nval1[i]) )  {
-			if ( isdigit(nval2[i]) ) {
-				if ( result == 0 && nval1[i] != nval2[i] ) { 
-					if ( nval1[i] > nval2[i] )
-						result = 1;
-					else
-						result = 0;
-				}
-			} else {
-				return 1;
-			}
-		} else {
-			if ( isdigit(nval2[i]) ) {
-				return -1;
-			} else {
-				return result;
-			}
-		}
-				
-		i++;
+		const char *val, size_t val_size, const char *key, size_t key_size)
+{	
+	const char *vend = val + val_size;
+	const char *kend = key + key_size;
+	const char *vp = val;
+	const char *kp = key;
+	
+	/* Ignore leading zeros */
+
+	while ( *vp == '0' && vp < vend )  
+		vp++;
+
+	while ( *kp == '0' && kp < kend )  
+		kp++;
+
+	while ( vp < vend && kp < kend ) {
+		if ( !isdigit(*vp) || !isdigit(*kp) ) 
+			break;
+
+		if ( *vp != *kp ) 
+			break;
+
+		vp++;
+		kp++;	
 	}
+
+	if ( vp == vend || !isdigit(*vp) ) {
+		if ( kp == kend || !isdigit(*kp) ) 
+			return 0;
+		else	
+			return -1;
+	} else if ( kp == kend || !isdigit(*kp) )  
+		return 1;
 		
-	return result;
+	return (*vp > *kp);
 }
 

src/lib-sieve/plugins/relational/relational.sieve

-require ["comparator-i;ascii-numeric", "relational"];
+require ["comparator-i;ascii-numeric", "relational", "fileinto"];
 
 if header :value "eq" :comparator "i;ascii-numeric" "x-spam-score" "2" {
-	discard;
-	stop;
+	fileinto "INBOX.fail";
+} else {
+	fileinto "INBOX.succeed";
 }
 
 if header :value "lt" :comparator "i;ascii-numeric" "x-spam-score" "2" {
-	discard;
-	stop;
+	fileinto "INBOX.fail";
+} else {
+	fileinto "INBOX.succeed";
 }
 
 if header :value "lt" :comparator "i;ascii-numeric" "x-spam-score" "2" {
-	discard;
-	stop;
+	fileinto "INBOX.fail";
+} else {
+    fileinto "INBOX.succeed";
+}
+
+if header :value "le" :comparator "i;ascii-numeric" "x-spam-score" "300" {
+    fileinto "INBOX.succeed";
+} else {
+    fileinto "INBOX.fail";
+}
+
+if header :value "le" :comparator "i;ascii-numeric" "x-spam-score" "302" {
+    fileinto "INBOX.succeed";
+} else {
+    fileinto "INBOX.fail";
+}
+
+if header :value "le" :comparator "i;ascii-numeric" "x-spam-score" "00302" {
+    fileinto "INBOX.succeed";
+} else {
+    fileinto "INBOX.fail";
 }
 
 if header :count "ne" :comparator "i;ascii-numeric" "to" "2" {
-	discard;
-	stop;
+	fileinto "INBOX.fail";
+} else {
+    fileinto "INBOX.succeed";
 }
 
 if header :count "ge" :comparator "i;ascii-numeric" "to" "2" {
-	discard;
-	stop;
+	fileinto "INBOX.succeed";
+} else {
+    fileinto "INBOX.fail";
+}
+
+if header :count "ge" :comparator "i;ascii-numeric" "to" "002" {
+    fileinto "INBOX.succeed";
+} else {
+    fileinto "INBOX.fail";
 }
 
 keep;

src/lib-sieve/tst-allof.c

@@ -56,7 +56,7 @@ static bool tst_allof_generate
 	
 	if ( jump_true ) {
 		/* All tests succeeded, jump to case TRUE */
-		sieve_generator_emit_opcode(generator, SIEVE_OPCODE_JMP);
+		sieve_generator_emit_opcode(generator, &sieve_jmp_opcode);
 		sieve_jumplist_add(jumps, sieve_binary_emit_offset(sbin, 0));
 		
 		/* All false exits jump here */

src/lib-sieve/tst-anyof.c

@@ -54,7 +54,7 @@ static bool tst_anyof_generate
 	
 	if ( !jump_true ) {
 		/* All tests failed, jump to case FALSE */
-		sieve_operation_emit_code(sbin, SIEVE_OPCODE_JMP);
+		sieve_operation_emit_code(sbin, &sieve_jmp_opcode);
 		sieve_jumplist_add(jumps, sieve_binary_emit_offset(sbin, 0));
 		
 		/* All true exits jump here */