From db63d9381a1dcfef3b87d514f245f2daf7fbfb07 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Thu, 12 Jul 2012 23:40:52 +0200
Subject: [PATCH] Adjusted to Dovecot API changes.
---
src/lib-managesieve/managesieve-parser.c | 2 +-
src/lib-sieve-tool/mail-raw.c | 3 +--
src/lib-sieve/edit-mail.c | 8 +++-----
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/lib-managesieve/managesieve-parser.c b/src/lib-managesieve/managesieve-parser.c
index d05888a5f..d36c8640b 100644
--- a/src/lib-managesieve/managesieve-parser.c
+++ b/src/lib-managesieve/managesieve-parser.c
@@ -648,7 +648,7 @@ static ssize_t quoted_string_istream_read(struct istream_private *stream)
}
/* Allocate buffer space */
- if (!i_stream_get_buffer_space(stream, size, NULL))
+ if (!i_stream_try_alloc(stream, size, NULL))
return -2;
/* Parse quoted string content */
diff --git a/src/lib-sieve-tool/mail-raw.c b/src/lib-sieve-tool/mail-raw.c
index eec30a759..1ca0f1f10 100644
--- a/src/lib-sieve-tool/mail-raw.c
+++ b/src/lib-sieve-tool/mail-raw.c
@@ -9,7 +9,6 @@
#include "str-sanitize.h"
#include "strescape.h"
#include "safe-mkstemp.h"
-#include "close-keep-errno.h"
#include "mkdir-parents.h"
#include "abspath.h"
#include "message-address.h"
@@ -88,7 +87,7 @@ static int seekable_fd_callback
if (unlink(str_c(path)) < 0) {
/* shouldn't happen.. */
i_error("unlink(%s) failed: %m", str_c(path));
- close_keep_errno(fd);
+ i_close_fd(&fd);
return -1;
}
diff --git a/src/lib-sieve/edit-mail.c b/src/lib-sieve/edit-mail.c
index ef4c80bc5..cad2d8264 100644
--- a/src/lib-sieve/edit-mail.c
+++ b/src/lib-sieve/edit-mail.c
@@ -534,11 +534,9 @@ static inline char *_header_decode
/* hdr_data is already unfolded */
/* Decode MIME encoded-words. */
- if ( message_header_decode_utf8
- ((const unsigned char *)hdr_data, hdr_data_len, str, FALSE))
- return i_strdup(str_c(str));
-
- return i_strndup(hdr_data, hdr_data_len);
+ message_header_decode_utf8
+ ((const unsigned char *)hdr_data, hdr_data_len, str, FALSE);
+ return i_strdup(str_c(str));
}
static int edit_mail_headers_parse
--
GitLab