Implemented code generation and interpretation for the commands introduced by...

Implemented code generation and interpretation for the commands introduced by the imapflags extension.

src/lib-sieve/plugins/imapflags/cmd-addflag.c

@@ -11,6 +11,11 @@
 
 static bool cmd_addflag_generate
 	(struct sieve_generator *generator,	struct sieve_command_context *ctx);
+	
+static bool cmd_addflag_opcode_execute
+	(const struct sieve_opcode *opcode,	struct sieve_interpreter *interp, 
+		struct sieve_binary *sbin, sieve_size_t *address);
+
 
 /* Addflag command 
  *
@@ -36,8 +41,8 @@ const struct sieve_opcode addflag_opcode = {
 	SIEVE_OPCODE_CUSTOM,
 	&imapflags_extension,
 	EXT_IMAPFLAGS_OPCODE_ADDFLAG,
-	NULL,
-	NULL
+	sieve_opcode_string_dump,
+	cmd_addflag_opcode_execute
 };
 
 
@@ -56,4 +61,26 @@ static bool cmd_addflag_generate
 	return TRUE;
 }
 
+/*
+ * Execution
+ */
+
+static bool cmd_addflag_opcode_execute
+(const struct sieve_opcode *opcode ATTR_UNUSED,
+	struct sieve_interpreter *interp ATTR_UNUSED, 
+	struct sieve_binary *sbin, sieve_size_t *address)
+{
+	string_t *redirect;
+
+	t_push();
 
+	if ( !sieve_opr_string_read(sbin, address, &redirect) ) {
+		t_pop();
+		return FALSE;
+	}
+
+	printf(">> ADDFLAG \"%s\"\n", str_c(redirect));
+
+	t_pop();
+	return TRUE;
+}

src/lib-sieve/plugins/imapflags/cmd-removeflag.c

@@ -13,14 +13,9 @@
 static bool cmd_removeflag_generate
 	(struct sieve_generator *generator,	struct sieve_command_context *ctx);
 
-static bool cmd_removeflag_opcode_dump
-	(const struct sieve_opcode *opcode ATTR_UNUSED,
-		struct sieve_interpreter *interp ATTR_UNUSED, struct sieve_binary *sbin, 
-		sieve_size_t *address);
 static bool cmd_removeflag_opcode_execute
-	(const struct sieve_opcode *opcode ATTR_UNUSED,
-		struct sieve_interpreter *interp ATTR_UNUSED, struct sieve_binary *sbin, 
-		sieve_size_t *address);
+	(const struct sieve_opcode *opcode,	struct sieve_interpreter *interp, 
+		struct sieve_binary *sbin, sieve_size_t *address);
 
 /* Removeflag command 
  *
@@ -46,7 +41,7 @@ const struct sieve_opcode removeflag_opcode = {
 	SIEVE_OPCODE_CUSTOM,
 	&imapflags_extension,
 	EXT_IMAPFLAGS_OPCODE_REMOVEFLAG,
-	cmd_removeflag_opcode_dump, 
+	sieve_opcode_string_dump, 
 	cmd_removeflag_opcode_execute 
 };
 
@@ -66,22 +61,7 @@ static bool cmd_removeflag_generate
 
 	return TRUE;
 }
-
-/* 
- * Code dump
- */
  
-static bool cmd_removeflag_opcode_dump
-(const struct sieve_opcode *opcode ATTR_UNUSED,
-	struct sieve_interpreter *interp ATTR_UNUSED, 
-	struct sieve_binary *sbin, sieve_size_t *address)
-{
-	printf("REMOVEFLAG\n");
-
-	return 
-		sieve_opr_string_dump(sbin, address);
-}
-
 /*
  * Execution
  */

src/lib-sieve/plugins/imapflags/cmd-setflag.c

@@ -12,6 +12,10 @@
 static bool cmd_setflag_generate
 	(struct sieve_generator *generator,	struct sieve_command_context *ctx);
 
+static bool cmd_setflag_opcode_execute
+	(const struct sieve_opcode *opcode,	struct sieve_interpreter *interp, 
+		struct sieve_binary *sbin, sieve_size_t *address);
+
 /* Setflag command 
  *
  * Syntax: 
@@ -36,8 +40,8 @@ const struct sieve_opcode setflag_opcode = {
 	SIEVE_OPCODE_CUSTOM,
 	&imapflags_extension,
 	EXT_IMAPFLAGS_OPCODE_SETFLAG,
-	NULL,
-	NULL
+	sieve_opcode_string_dump,
+	cmd_setflag_opcode_execute
 };
 
 /* Code generation */
@@ -55,4 +59,28 @@ static bool cmd_setflag_generate
 	return TRUE;
 }
 
+/*
+ * Execution
+ */
+
+static bool cmd_setflag_opcode_execute
+(const struct sieve_opcode *opcode ATTR_UNUSED,
+	struct sieve_interpreter *interp ATTR_UNUSED, 
+	struct sieve_binary *sbin, sieve_size_t *address)
+{
+	string_t *redirect;
+
+	t_push();
+
+	if ( !sieve_opr_string_read(sbin, address, &redirect) ) {
+		t_pop();
+		return FALSE;
+	}
+
+	printf(">> SETFLAG \"%s\"\n", str_c(redirect));
+
+	t_pop();
+	return TRUE;
+}
+
 

src/lib-sieve/plugins/imapflags/ext-imapflags-common.c

@@ -32,7 +32,7 @@ bool ext_imapflags_command_validate
 			cmd->command->identifier, sieve_ast_argument_name(arg));
 		return FALSE; 
 	}
-	//sieve_validator_argument_activate(validator, arg);
+	sieve_validator_argument_activate(validator, arg);
 
 	arg2 = sieve_ast_argument_next(arg);
 	
@@ -70,7 +70,7 @@ bool ext_imapflags_command_validate
 			return FALSE;
 		}
 
-		//sieve_validator_argument_activate(validator, arg2);
+		sieve_validator_argument_activate(validator, arg2);
 	}	
 	return TRUE;
 }

src/lib-sieve/plugins/imapflags/ext-imapflags.c

@@ -41,7 +41,7 @@ extern const struct sieve_opcode addflag_opcode;
 extern const struct sieve_opcode removeflag_opcode;
 
 const struct sieve_opcode *imapflags_opcodes[] = 
-	{ &setflag_opcode, &addflag_opcode };
+	{ &setflag_opcode, &addflag_opcode, &removeflag_opcode };
 const struct sieve_extension imapflags_extension = { 
 	"imapflags", 
 	ext_imapflags_load,

src/lib-sieve/plugins/imapflags/imapflags.sieve

 require "imapflags";
 require "fileinto";
 
+setflag "\\Seen";
+addflag "$DSNRequired";
+removeflag "$DSNRequired";
+
 if header :contains "from" "boss@frobnitzm.example.edu" {
 	setflag "\\Flagged";
 	fileinto "INBOX.From Boss";

src/lib-sieve/sieve-code.c

@@ -695,6 +695,8 @@ static bool opc_jmp_dump(
 	return TRUE;
 }	
 			
+/* Code dump for trivial opcodes */
+
 bool sieve_opcode_trivial_dump
 (const struct sieve_opcode *opcode,
 	struct sieve_interpreter *interp ATTR_UNUSED, 
@@ -705,6 +707,18 @@ bool sieve_opcode_trivial_dump
 	return TRUE;
 }
 
+bool sieve_opcode_string_dump
+(const struct sieve_opcode *opcode,
+	struct sieve_interpreter *interp ATTR_UNUSED, 
+	struct sieve_binary *sbin, sieve_size_t *address)
+{
+	printf("%s\n", opcode->mnemonic);
+
+	return 
+		sieve_opr_string_dump(sbin, address);
+}
+
+
 /* Code execution for core commands */
 
 static bool opc_jmp_execute

src/lib-sieve/sieve-code.h

@@ -154,6 +154,9 @@ const struct sieve_opcode *sieve_operation_read
 bool sieve_opcode_trivial_dump
 	(const struct sieve_opcode *opcode, struct sieve_interpreter *interp, 
 		struct sieve_binary *sbin, sieve_size_t *address);
+bool sieve_opcode_string_dump
+	(const struct sieve_opcode *opcode, struct sieve_interpreter *interp, 
+		struct sieve_binary *sbin, sieve_size_t *address);
 
 /* Core operands */