diff --git a/src/lib-sieve/ext-fileinto.c b/src/lib-sieve/ext-fileinto.c
index bde9df5f08233c63b29086c66831060b1d8ce3a5..bf6297c0d5483d9c001d8c3ddac8afce7f94b522 100644
--- a/src/lib-sieve/ext-fileinto.c
+++ b/src/lib-sieve/ext-fileinto.c
@@ -40,17 +40,19 @@ const struct sieve_extension_def fileinto_extension;
* Extension
*/
-static bool ext_fileinto_validator_load
-(const struct sieve_extension *ext, struct sieve_validator *valdtr);
+static bool
+ext_fileinto_validator_load(const struct sieve_extension *ext,
+ struct sieve_validator *valdtr);
const struct sieve_extension_def fileinto_extension = {
.name = "fileinto",
.validator_load = ext_fileinto_validator_load,
- SIEVE_EXT_DEFINE_OPERATION(fileinto_operation)
+ SIEVE_EXT_DEFINE_OPERATION(fileinto_operation),
};
-static bool ext_fileinto_validator_load
-(const struct sieve_extension *ext, struct sieve_validator *valdtr)
+static bool
+ext_fileinto_validator_load(const struct sieve_extension *ext,
+ struct sieve_validator *valdtr)
{
/* Register new command */
sieve_validator_register_command(valdtr, ext, &fileinto_command);
@@ -65,10 +67,12 @@ static bool ext_fileinto_validator_load
* fileinto <folder: string>
*/
-static bool cmd_fileinto_validate
- (struct sieve_validator *valdtr, struct sieve_command *cmd);
-static bool cmd_fileinto_generate
- (const struct sieve_codegen_env *cgenv, struct sieve_command *ctx);
+static bool
+cmd_fileinto_validate(struct sieve_validator *valdtr,
+ struct sieve_command *cmd);
+static bool
+cmd_fileinto_generate(const struct sieve_codegen_env *cgenv,
+ struct sieve_command *ctx);
static const struct sieve_command_def fileinto_command = {
.identifier = "fileinto",
@@ -78,54 +82,55 @@ static const struct sieve_command_def fileinto_command = {
.block_allowed = FALSE,
.block_required = FALSE,
.validate = cmd_fileinto_validate,
- .generate = cmd_fileinto_generate
+ .generate = cmd_fileinto_generate,
};
/*
* Fileinto operation
*/
-static bool ext_fileinto_operation_dump
- (const struct sieve_dumptime_env *denv, sieve_size_t *address);
-static int ext_fileinto_operation_execute
- (const struct sieve_runtime_env *renv, sieve_size_t *address);
+static bool
+ext_fileinto_operation_dump(const struct sieve_dumptime_env *denv,
+ sieve_size_t *address);
+static int
+ext_fileinto_operation_execute(const struct sieve_runtime_env *renv,
+ sieve_size_t *address);
const struct sieve_operation_def fileinto_operation = {
.mnemonic = "FILEINTO",
.ext_def = &fileinto_extension,
.dump = ext_fileinto_operation_dump,
- .execute = ext_fileinto_operation_execute
+ .execute = ext_fileinto_operation_execute,
};
/*
* Validation
*/
-static bool cmd_fileinto_validate
-(struct sieve_validator *valdtr, struct sieve_command *cmd)
+static bool
+cmd_fileinto_validate(struct sieve_validator *valdtr, struct sieve_command *cmd)
{
struct sieve_ast_argument *arg = cmd->first_positional;
- if ( !sieve_validate_positional_argument
- (valdtr, cmd, arg, "folder", 1, SAAT_STRING) ) {
+ if (!sieve_validate_positional_argument(valdtr, cmd, arg, "folder",
+ 1, SAAT_STRING))
return FALSE;
- }
- if ( !sieve_validator_argument_activate(valdtr, cmd, arg, FALSE) )
+ if (!sieve_validator_argument_activate(valdtr, cmd, arg, FALSE))
return FALSE;
/* Check name validity when folder argument is not a variable */
- if ( sieve_argument_is_string_literal(arg) ) {
+ if (sieve_argument_is_string_literal(arg)) {
const char *folder = sieve_ast_argument_strc(arg), *error;
- if ( !sieve_mailbox_check_name(folder, &error) ) {
- sieve_command_validate_error(valdtr, cmd,
- "invalid folder name `%s' specified for fileinto command: %s",
+ if (!sieve_mailbox_check_name(folder, &error)) {
+ sieve_command_validate_error(
+ valdtr, cmd, "invalid folder name `%s' "
+ "specified for fileinto command: %s",
str_sanitize(folder, 256), error);
return FALSE;
}
}
-
return TRUE;
}
@@ -133,8 +138,9 @@ static bool cmd_fileinto_validate
* Code generation
*/
-static bool cmd_fileinto_generate
-(const struct sieve_codegen_env *cgenv, struct sieve_command *cmd)
+static bool
+cmd_fileinto_generate(const struct sieve_codegen_env *cgenv,
+ struct sieve_command *cmd)
{
sieve_operation_emit(cgenv->sblock, cmd->ext, &fileinto_operation);
@@ -146,13 +152,14 @@ static bool cmd_fileinto_generate
* Code dump
*/
-static bool ext_fileinto_operation_dump
-(const struct sieve_dumptime_env *denv, sieve_size_t *address)
+static bool
+ext_fileinto_operation_dump(const struct sieve_dumptime_env *denv,
+ sieve_size_t *address)
{
sieve_code_dumpf(denv, "FILEINTO");
sieve_code_descend(denv);
- if ( sieve_action_opr_optional_dump(denv, address, NULL) != 0 )
+ if (sieve_action_opr_optional_dump(denv, address, NULL) != 0)
return FALSE;
return sieve_opr_string_dump(denv, address, "folder");
@@ -162,8 +169,9 @@ static bool ext_fileinto_operation_dump
* Execution
*/
-static int ext_fileinto_operation_execute
-(const struct sieve_runtime_env *renv, sieve_size_t *address)
+static int
+ext_fileinto_operation_execute(const struct sieve_runtime_env *renv,
+ sieve_size_t *address)
{
struct sieve_side_effects_list *slist = NULL;
string_t *folder;
@@ -176,48 +184,43 @@ static int ext_fileinto_operation_execute
*/
/* Optional operands (side effects only) */
- if ( sieve_action_opr_optional_read(renv, address, NULL, &ret, &slist) != 0 )
+ if (sieve_action_opr_optional_read(renv, address, NULL,
+ &ret, &slist) != 0)
return ret;
/* Folder operand */
- if ( (ret=sieve_opr_string_read_ex
- (renv, address, "folder", FALSE, &folder, &folder_literal)) <= 0 )
+ ret = sieve_opr_string_read_ex(renv, address, "folder", FALSE,
+ &folder, &folder_literal);
+ if (ret <= 0)
return ret;
/*
* Perform operation
*/
- if ( trace ) {
+ if (trace) {
sieve_runtime_trace(renv, 0, "fileinto action");
sieve_runtime_trace_descend(renv);
}
- if ( !folder_literal && !uni_utf8_str_is_valid(str_c(folder)) ) {
- sieve_runtime_error(renv, NULL,
+ if (!folder_literal && !uni_utf8_str_is_valid(str_c(folder))) {
+ sieve_runtime_error(
+ renv, NULL,
"folder name specified for fileinto command is not utf-8: %s",
str_c(folder));
return SIEVE_EXEC_FAILURE;
}
-
- if ( trace ) {
+ if (trace) {
sieve_runtime_trace(renv, 0, "store message in mailbox `%s'",
- str_sanitize(str_c(folder), 80));
+ str_sanitize(str_c(folder), 80));
}
/* Add action to result */
- if ( sieve_act_store_add_to_result(renv, "fileinto", slist,
- str_c(folder)) < 0 )
+ if (sieve_act_store_add_to_result(renv, "fileinto", slist,
+ str_c(folder)) < 0)
return SIEVE_EXEC_FAILURE;
sieve_message_snapshot(renv->msgctx);
-
return SIEVE_EXEC_OK;
}
-
-
-
-
-
-