From: Timo Sirainen <tss@iki.fi>
Date: Sun, 5 Oct 2003 19:41:16 +0000 (+0300)
Subject: Strip trailing '/' from mail directory if given. Just makes it cleaner in
X-Git-Tag: 1.1.alpha1~4301
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29b6850e788f34431e1b369837b419b3ea5f14a9;p=thirdparty%2Fdovecot%2Fcore.git

Strip trailing '/' from mail directory if given. Just makes it cleaner in
log files.

--HG--
branch : HEAD
---

diff --git a/src/lib-storage/index/maildir/maildir-storage.c b/src/lib-storage/index/maildir/maildir-storage.c
index 5617791652..165e395a8d 100644
--- a/src/lib-storage/index/maildir/maildir-storage.c
+++ b/src/lib-storage/index/maildir/maildir-storage.c
@@ -33,6 +33,7 @@ maildir_create(const char *data, const char *user,
 	struct mail_storage *storage;
 	const char *root_dir, *inbox_dir, *index_dir, *control_dir;
 	const char *home, *path, *p;
+	size_t len;
 
 	inbox_dir = root_dir = index_dir = control_dir = NULL;
 
@@ -74,6 +75,11 @@ maildir_create(const char *data, const char *user,
 	if (root_dir == NULL)
 		return NULL;
 
+	/* strip trailing '/' */
+	len = strlen(root_dir);
+	if (root_dir[len-1] == '/')
+		root_dir = t_strndup(root_dir, len-1);
+
 	if (index_dir == NULL)
 		index_dir = root_dir;
 	else if (strcmp(index_dir, "MEMORY") == 0)
diff --git a/src/lib-storage/index/mbox/mbox-storage.c b/src/lib-storage/index/mbox/mbox-storage.c
index 7bb614aa2a..091d621259 100644
--- a/src/lib-storage/index/mbox/mbox-storage.c
+++ b/src/lib-storage/index/mbox/mbox-storage.c
@@ -176,6 +176,11 @@ mbox_create(const char *data, const char *user,
 		root_dir = create_root_dir();
 		if (root_dir == NULL)
 			return NULL;
+	} else {
+		/* strip trailing '/' */
+		size_t len = strlen(root_dir);
+		if (root_dir[len-1] == '/')
+			root_dir = t_strndup(root_dir, len-1);
 	}
 
 	if (inbox_file == NULL)