Added -c option to sieve-test to force compile.

README

@@ -41,7 +41,7 @@ Otherwise, the dump is printed to stdout.
 -- 
 
 sieve-test [-r <recipient address>][-s <envelope sender>]
-           [-m <mailbox>][-d <dump filename>] <scriptfile> <mailfile>
+           [-m <mailbox>][-d <dump filename>][-c] <scriptfile> <mailfile>
 
 Reads mail message from the specified mailfile and executes the specified sieve 
 script to produce a verdict. This prints an execution dump with the instructions 
@@ -54,6 +54,7 @@ Options:
 	-m	the mailbox where the keep action should store
 	-d	causes a dump of the generated code to be written to the specified
 		file. Using - as filename causes the dump to be written to stdout
+	-c  force compilation (ignore any existing binary)
 
 --
 

src/sieve-bin/sieve-test.c

@@ -22,7 +22,7 @@ static void print_help(void)
 {
 	printf(
 "Usage: sieve-test [-r <recipient address>][-s <envelope sender>]\n"
-"                  [-m <mailbox>][-d <dump filename>] <scriptfile> <mailfile>\n"
+"                  [-m <mailbox>][-d <dump filename>][-c] <scriptfile> <mailfile>\n"
 	);
 }
 
@@ -37,6 +37,7 @@ int main(int argc, char **argv)
 	struct sieve_message_data msgdata;
 	struct sieve_script_env scriptenv;
 	struct sieve_error_handler *ehandler;
+	bool force_compile = FALSE;
 
 	bin_init();
 
@@ -67,6 +68,9 @@ int main(int argc, char **argv)
 			if (i == argc)
 				i_fatal("Missing -d argument");
 			dumpfile = argv[i];
+		} else if (strcmp(argv[i], "-c") == 0) {
+            /* force compile */
+			force_compile = TRUE;
 		} else if ( scriptfile == NULL ) {
 			scriptfile = argv[i];
 		} else if ( mailfile == NULL ) {
@@ -91,8 +95,12 @@ int main(int argc, char **argv)
 	mfd = bin_open_mail_file(mailfile);
 	
 	/* Compile sieve script */
-	sbin = bin_open_sieve_script(scriptfile);
-	
+	if ( force_compile ) {
+		sbin = bin_compile_sieve_script(scriptfile);
+	} else {
+		sbin = bin_open_sieve_script(scriptfile);
+	}
+
 	/* Dump script */
 	bin_dump_sieve_binary_to(sbin, dumpfile);