exmdb: split HX_dirname+mkdir logic from cu_cid_writeout

References: GXL-411

Author: jengelh

exch/exmdb/common_util.cpp

@@ -2992,14 +2992,9 @@ static errno_t cu_cid_writeout(const char *maildir, std::string_view data,
 		maildir = exmdb_server::get_dir();
 	path = maildir + "/cid/"s + hval.str();
 	cid  = hval.str();
-	std::unique_ptr<char[], stdlib_delete> extradir(HX_dirname(path.c_str()));
-	if (extradir == nullptr) {
-		mlog(LV_ERR, "E-5318: ENOMEM");
-		return ENOMEM;
-	}
-	auto ret = HX_mkdir(extradir.get(), FMODE_PRIVATE | S_IXUSR | S_IXGRP);
+	auto ret = gx_mkbasedir(path.c_str(), FMODE_PRIVATE);
 	if (ret < 0) {
-		mlog(LV_ERR, "E-2009: mkdir %s: %s", extradir.get(), strerror(-ret));
+		mlog(LV_ERR, "E-2009: mkbasedir for %s: %s", path.c_str(), strerror(-ret));
 		return -ret;
 	}
 

include/gromox/fileio.h

@@ -97,5 +97,6 @@ extern GX_EXPORT std::string base64_encode(const std::string_view &);
 extern GX_EXPORT std::string base64_decode(const std::string_view &);
 extern GX_EXPORT std::string sss_obf_reverse(const std::string_view &);
 extern GX_EXPORT int haproxy_intervene(int fd, unsigned int level, struct sockaddr_storage *);
+extern GX_EXPORT int gx_mkbasedir(const char *file, unsigned int mode);
 
 }

lib/rfbl.cpp

@@ -1800,6 +1800,25 @@ int ece2nerrno(ec_error_t e)
 	}
 }
 
+/**
+ * Given a file path, create all directories leading up to it.
+ * @mode: desired mode of directory (+x is always auto-added)
+ */
+int gx_mkbasedir(const char *file, unsigned int mode)
+{
+	std::unique_ptr<char[], stdlib_delete> base(HX_dirname(file));
+	if (base == nullptr)
+		return ENOMEM;
+	if (mode & (S_IRUSR | S_IWUSR))
+		mode |= S_IXUSR;
+	if (mode & (S_IRGRP | S_IWGRP))
+		mode |= S_IXGRP;
+	if (mode & (S_IROTH | S_IWOTH))
+		mode |= S_IXOTH;
+	auto ret = HX_mkdir(base.get(), mode);
+	return ret < 0 ? -ret : 0;
+}
+
 }
 
 int XARRAY::append(MITEM &&ptr, unsigned int tag) try