dovecot-2.2-pigeonhole: Merged changes from Pigeonhole v0.2 tree.
pigeonhole at rename-it.nl
pigeonhole at rename-it.nl
Tue Jul 31 02:24:36 EEST 2012
details: http://hg.rename-it.nl/dovecot-2.2-pigeonhole/rev/bea6fcece21e
changeset: 1642:bea6fcece21e
user: Stephan Bosch <stephan at rename-it.nl>
date: Tue Jul 31 01:24:28 2012 +0200
description:
Merged changes from Pigeonhole v0.2 tree.
diffstat:
doc/example-config/conf.d/20-managesieve.conf | 8 +-
src/lib-sieve/Makefile.am | 4 +-
src/lib-sieve/plugins/editheader/cmd-addheader.c | 3 +-
src/lib-sieve/rfc2822.h | 4 +-
src/lib-sieve/sieve-binary-dumper.c | 7 +-
src/lib-sieve/sieve-binary-dumper.h | 6 +-
src/lib-sieve/sieve-error.c | 64 ++++++++++++------------
src/lib-sieve/sieve-result.h | 3 +-
src/lib-sieve/sieve-runtime-trace.c | 6 +-
src/lib-sieve/sieve-runtime-trace.h | 20 ++++---
src/lib-sievestorage/sieve-storage.c | 2 +-
src/testsuite/testsuite-log.c | 8 +-
12 files changed, 70 insertions(+), 65 deletions(-)
diffs (truncated from 554 to 300 lines):
diff -r a1668b71e657 -r bea6fcece21e doc/example-config/conf.d/20-managesieve.conf
--- a/doc/example-config/conf.d/20-managesieve.conf Fri Jul 13 10:06:46 2012 +0200
+++ b/doc/example-config/conf.d/20-managesieve.conf Tue Jul 31 01:24:28 2012 +0200
@@ -7,7 +7,7 @@
# Service definitions
-service managesieve-login {
+#service managesieve-login {
#inet_listener sieve {
# port = 4190
#}
@@ -26,12 +26,12 @@
# If you set service_count=0, you probably need to grow this.
#vsz_limit = 64M
-}
+#}
-service managesieve {
+#service managesieve {
# Max. number of ManageSieve processes (connections)
#process_count = 1024
-}
+#}
# Service configuration
diff -r a1668b71e657 -r bea6fcece21e src/lib-sieve/Makefile.am
--- a/src/lib-sieve/Makefile.am Fri Jul 13 10:06:46 2012 +0200
+++ b/src/lib-sieve/Makefile.am Tue Jul 31 01:24:28 2012 +0200
@@ -70,8 +70,8 @@
$(extdir)/vnd.dovecot/duplicate/libsieve_ext_duplicate.la \
$(unfinished_plugins)
-libdovecot_sieve_la_DEPENDENCIES = $(plugins)
-libdovecot_sieve_la_LIBADD = $(plugins)
+libdovecot_sieve_la_DEPENDENCIES = $(plugins) $(LIBDOVECOT_LDA_DEPS)
+libdovecot_sieve_la_LIBADD = $(plugins) $(LIBDOVECOT_LDA)
libdovecot_sieve_la_SOURCES = \
rfc2822.c \
diff -r a1668b71e657 -r bea6fcece21e src/lib-sieve/plugins/editheader/cmd-addheader.c
--- a/src/lib-sieve/plugins/editheader/cmd-addheader.c Fri Jul 13 10:06:46 2012 +0200
+++ b/src/lib-sieve/plugins/editheader/cmd-addheader.c Tue Jul 31 01:24:28 2012 +0200
@@ -304,7 +304,6 @@
str_sanitize(str_c(field_name), 80), str_sanitize(str_c(value), 80));
edmail = sieve_message_edit(renv->msgctx);
- edit_mail_header_add(edmail, str_c(field_name), str_c(value), last);
-
+ edit_mail_header_add(edmail, rfc2822_header_field_name_sanitize(str_c(field_name)), str_c(value), last);
return SIEVE_EXEC_OK;
}
diff -r a1668b71e657 -r bea6fcece21e src/lib-sieve/rfc2822.h
--- a/src/lib-sieve/rfc2822.h Fri Jul 13 10:06:46 2012 +0200
+++ b/src/lib-sieve/rfc2822.h Tue Jul 31 01:24:28 2012 +0200
@@ -38,8 +38,8 @@
}
void rfc2822_header_printf
- (string_t *header, const char *name, const char *fmt, ...);
+ (string_t *header, const char *name, const char *fmt, ...) ATTR_FORMAT(3, 4);
void rfc2822_header_utf8_printf
- (string_t *header, const char *name, const char *fmt, ...);
+ (string_t *header, const char *name, const char *fmt, ...) ATTR_FORMAT(3, 4);
#endif /* __RFC2822_H */
diff -r a1668b71e657 -r bea6fcece21e src/lib-sieve/sieve-binary-dumper.c
--- a/src/lib-sieve/sieve-binary-dumper.c Fri Jul 13 10:06:46 2012 +0200
+++ b/src/lib-sieve/sieve-binary-dumper.c Tue Jul 31 01:24:28 2012 +0200
@@ -222,10 +222,11 @@
size_t offset;
data = (const char *) buffer_get_data(blockbuf, &data_size);
-
+
+ // FIXME: calculate offset more nicely.
sieve_binary_dump_sectionf
- (denv, "Block %d (%"PRIuSIZE_T" bytes, file offset %08llx)", i,
- data_size, sblock->offset + 8 /* header size (yuck) */);
+ (denv, "Block %d (%"PRIuSIZE_T" bytes, file offset %08llx)", i,
+ data_size, (unsigned long long int) sblock->offset + 8);
line = t_str_new(128);
offset = 0;
diff -r a1668b71e657 -r bea6fcece21e src/lib-sieve/sieve-binary-dumper.h
--- a/src/lib-sieve/sieve-binary-dumper.h Fri Jul 13 10:06:46 2012 +0200
+++ b/src/lib-sieve/sieve-binary-dumper.h Tue Jul 31 01:24:28 2012 +0200
@@ -25,9 +25,11 @@
*/
void sieve_binary_dumpf
- (const struct sieve_dumptime_env *denv, const char *fmt, ...);
+ (const struct sieve_dumptime_env *denv, const char *fmt, ...)
+ ATTR_FORMAT(2, 3);
void sieve_binary_dump_sectionf
- (const struct sieve_dumptime_env *denv, const char *fmt, ...);
+ (const struct sieve_dumptime_env *denv, const char *fmt, ...)
+ ATTR_FORMAT(2, 3);
/*
* Dumping the binary
diff -r a1668b71e657 -r bea6fcece21e src/lib-sieve/sieve-error.c
--- a/src/lib-sieve/sieve-error.c Fri Jul 13 10:06:46 2012 +0200
+++ b/src/lib-sieve/sieve-error.c Tue Jul 31 01:24:28 2012 +0200
@@ -602,7 +602,7 @@
typedef void (*master_log_func_t)(const char *fmt, ...) ATTR_FORMAT(1, 2);
-static void sieve_master_vlog
+static void ATTR_FORMAT(4, 0) sieve_master_vlog
(struct sieve_error_handler *_ehandler, master_log_func_t log_func,
const char *location, const char *fmt, va_list args)
{
@@ -624,7 +624,7 @@
log_func("%s", str_c(str));
}
-static void sieve_master_verror
+static void ATTR_FORMAT(4, 0) sieve_master_verror
(struct sieve_error_handler *ehandler,
unsigned int flags ATTR_UNUSED, const char *location, const char *fmt,
va_list args)
@@ -632,7 +632,7 @@
sieve_master_vlog(ehandler, i_error, location, fmt, args);
}
-static void sieve_master_vwarning
+static void ATTR_FORMAT(4, 0) sieve_master_vwarning
(struct sieve_error_handler *ehandler ATTR_UNUSED,
unsigned int flags ATTR_UNUSED, const char *location, const char *fmt,
va_list args)
@@ -640,7 +640,7 @@
sieve_master_vlog(ehandler, i_warning, location, fmt, args);
}
-static void sieve_master_vinfo
+static void ATTR_FORMAT(4, 0) sieve_master_vinfo
(struct sieve_error_handler *ehandler ATTR_UNUSED,
unsigned int flags ATTR_UNUSED, const char *location, const char *fmt,
va_list args)
@@ -648,7 +648,7 @@
sieve_master_vlog(ehandler, i_info, location, fmt, args);
}
-static void sieve_master_vdebug
+static void ATTR_FORMAT(4, 0) sieve_master_vdebug
(struct sieve_error_handler *ehandler ATTR_UNUSED,
unsigned int flags ATTR_UNUSED, const char *location, const char *fmt,
va_list args)
@@ -685,7 +685,7 @@
* - Output errors directly to stderror
*/
-static void sieve_stderr_vmessage
+static void ATTR_FORMAT(4, 0) sieve_stderr_vmessage
(struct sieve_error_handler *ehandler ATTR_UNUSED, const char *prefix,
const char *location, const char *fmt, va_list args)
{
@@ -695,28 +695,28 @@
fprintf(stderr, "%s: %s: %s.\n", location, prefix, t_strdup_vprintf(fmt, args));
}
-static void sieve_stderr_verror
+static void ATTR_FORMAT(4, 0) sieve_stderr_verror
(struct sieve_error_handler *ehandler, unsigned int flags ATTR_UNUSED,
const char *location, const char *fmt, va_list args)
{
sieve_stderr_vmessage(ehandler, "error", location, fmt, args);
}
-static void sieve_stderr_vwarning
+static void ATTR_FORMAT(4, 0) sieve_stderr_vwarning
(struct sieve_error_handler *ehandler, unsigned int flags ATTR_UNUSED,
const char *location, const char *fmt, va_list args)
{
sieve_stderr_vmessage(ehandler, "warning", location, fmt, args);
}
-static void sieve_stderr_vinfo
+static void ATTR_FORMAT(4, 0) sieve_stderr_vinfo
(struct sieve_error_handler *ehandler, unsigned int flags ATTR_UNUSED,
const char *location, const char *fmt, va_list args)
{
sieve_stderr_vmessage(ehandler, "info", location, fmt, args);
}
-static void sieve_stderr_vdebug
+static void ATTR_FORMAT(4, 0) sieve_stderr_vdebug
(struct sieve_error_handler *ehandler, unsigned int flags ATTR_UNUSED,
const char *location, const char *fmt, va_list args)
{
@@ -757,7 +757,7 @@
bool crlf;
};
-static void sieve_strbuf_vmessage
+static void ATTR_FORMAT(4, 0) sieve_strbuf_vmessage
(struct sieve_error_handler *ehandler, const char *prefix,
const char *location, const char *fmt, va_list args)
{
@@ -775,28 +775,28 @@
str_append(handler->errors, ".\r\n");
}
-static void sieve_strbuf_verror
+static void ATTR_FORMAT(4, 0) sieve_strbuf_verror
(struct sieve_error_handler *ehandler, unsigned int flags ATTR_UNUSED,
const char *location, const char *fmt, va_list args)
{
sieve_strbuf_vmessage(ehandler, "error", location, fmt, args);
}
-static void sieve_strbuf_vwarning
+static void ATTR_FORMAT(4, 0) sieve_strbuf_vwarning
(struct sieve_error_handler *ehandler, unsigned int flags ATTR_UNUSED,
const char *location, const char *fmt, va_list args)
{
sieve_strbuf_vmessage(ehandler, "warning", location, fmt, args);
}
-static void sieve_strbuf_vinfo
+static void ATTR_FORMAT(4, 0) sieve_strbuf_vinfo
(struct sieve_error_handler *ehandler, unsigned int flags ATTR_UNUSED,
const char *location, const char *fmt, va_list args)
{
sieve_strbuf_vmessage(ehandler, "info", location, fmt, args);
}
-static void sieve_strbuf_vdebug
+static void ATTR_FORMAT(4, 0) sieve_strbuf_vdebug
(struct sieve_error_handler *ehandler, unsigned int flags ATTR_UNUSED,
const char *location, const char *fmt, va_list args)
{
@@ -841,7 +841,7 @@
struct ostream *stream;
};
-static void sieve_logfile_vprintf
+static void ATTR_FORMAT(4, 0) sieve_logfile_vprintf
(struct sieve_logfile_ehandler *ehandler, const char *location,
const char *prefix, const char *fmt, va_list args)
{
@@ -877,7 +877,7 @@
}
}
-inline static void sieve_logfile_printf
+inline static void ATTR_FORMAT(4, 5) sieve_logfile_printf
(struct sieve_logfile_ehandler *ehandler, const char *location,
const char *prefix, const char *fmt, ...)
{
@@ -985,7 +985,7 @@
}
}
-static void sieve_logfile_verror
+static void ATTR_FORMAT(4, 0) sieve_logfile_verror
(struct sieve_error_handler *ehandler, unsigned int flags ATTR_UNUSED,
const char *location, const char *fmt, va_list args)
{
@@ -997,7 +997,7 @@
sieve_logfile_vprintf(handler, location, "error", fmt, args);
}
-static void sieve_logfile_vwarning
+static void ATTR_FORMAT(4, 0) sieve_logfile_vwarning
(struct sieve_error_handler *ehandler, unsigned int flags ATTR_UNUSED,
const char *location, const char *fmt, va_list args)
{
@@ -1009,7 +1009,7 @@
sieve_logfile_vprintf(handler, location, "warning", fmt, args);
}
-static void sieve_logfile_vinfo
+static void ATTR_FORMAT(4, 0) sieve_logfile_vinfo
(struct sieve_error_handler *ehandler, unsigned int flags ATTR_UNUSED,
const char *location, const char *fmt, va_list args)
{
@@ -1021,7 +1021,7 @@
sieve_logfile_vprintf(handler, location, "info", fmt, args);
}
-static void sieve_logfile_vdebug
+static void ATTR_FORMAT(4, 0) sieve_logfile_vdebug
(struct sieve_error_handler *ehandler, unsigned int flags ATTR_UNUSED,
const char *location, const char *fmt, va_list args)
{
@@ -1093,9 +1093,9 @@
const char *prefix;
};
-static const char *_prefix_message
+static const char *ATTR_FORMAT(3, 0) _prefix_message
(struct sieve_prefix_ehandler *ehandler,
- const char *location, const char *fmt, va_list args)
+ const char *location, const char *fmt, va_list args)
{
string_t *str = t_str_new(256);
More information about the dovecot-cvs
mailing list