From eb775e8a8ecd7612058675ce6b0e034633681d66 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Tue, 7 Oct 2014 23:12:20 +0200
Subject: [PATCH] lib-sieve-tool: Simplified seekable stream callback for raw
mail. No longer needed to create the temp directory.
---
src/lib-sieve-tool/mail-raw.c | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/src/lib-sieve-tool/mail-raw.c b/src/lib-sieve-tool/mail-raw.c
index 50a39ab86..60eea9f7b 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 "mkdir-parents.h"
#include "abspath.h"
#include "message-address.h"
#include "mbox-from.h"
@@ -58,26 +57,12 @@ static int seekable_fd_callback
(const char **path_r, void *context)
{
struct mail_user *ruser = (struct mail_user *)context;
- const char *dir, *p;
string_t *path;
int fd;
path = t_str_new(128);
mail_user_set_get_temp_prefix(path, ruser->set);
fd = safe_mkstemp(path, 0600, (uid_t)-1, (gid_t)-1);
- if (fd == -1 && errno == ENOENT) {
- dir = str_c(path);
- p = strrchr(dir, '/');
- if (p != NULL) {
- dir = t_strdup_until(dir, p);
- if ( mkdir_parents(dir, 0600) < 0 ) {
- i_error("mkdir_parents(%s) failed: %m", dir);
- return -1;
- }
- fd = safe_mkstemp(path, 0600, (uid_t)-1, (gid_t)-1);
- }
- }
-
if (fd == -1) {
i_error("safe_mkstemp(%s) failed: %m", str_c(path));
return -1;
--
GitLab