[PATCH 4/6] lib/open: refactor call to mkdir into function

Subject:[PATCH 4/6] lib/open: refactor call to mkdir into function

Date:Fri, 29 Jul 2022 09:19:59 -0300

To:notmuch@notmuchmail.org

Cc:spwhitton@spwhitton.name

From:David Bremner


This makes the error handling available for re-use. Using
g_mkdir_with_parents also handles the case of a pre-existing
directory. This introduces new functionality, namely creating the
parent directories, which will be useful for creating directories like
'.local/share/notmuch/default'.
---
 lib/open.cc | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/lib/open.cc b/lib/open.cc
index 30cfcf9e..85e46dc7 100644
--- a/lib/open.cc
+++ b/lib/open.cc
@@ -244,6 +244,18 @@ _choose_database_path (notmuch_database_t *notmuch,
     return NOTMUCH_STATUS_SUCCESS;
 }
 
+static notmuch_status_t
+_mkdir (const char *path, char **message)
+{
+    if (g_mkdir_with_parents (path, 0755)) {
+	IGNORE_RESULT (asprintf (message, "Error: Cannot create directory %s: %s.\n",
+				 path, strerror (errno)));
+	return NOTMUCH_STATUS_FILE_ERROR;
+    }
+    return NOTMUCH_STATUS_SUCCESS;
+}
+
+
 static notmuch_database_t *
 _alloc_notmuch (const char *database_path, const char *config_path, const char *profile)
 {
@@ -607,7 +619,6 @@ notmuch_database_create_with_config (const char *database_path,
     const char *notmuch_path = NULL;
     char *message = NULL;
     GKeyFile *key_file = NULL;
-    int err;
 
     _notmuch_init ();
 
@@ -653,15 +664,9 @@ notmuch_database_create_with_config (const char *database_path,
 	    goto DONE;
 	}
 
-	err = mkdir (notmuch_path, 0755);
-	if (err) {
-	    if (errno != EEXIST) {
-		IGNORE_RESULT (asprintf (&message, "Error: Cannot create directory %s: %s.\n",
-					 notmuch_path, strerror (errno)));
-		status = NOTMUCH_STATUS_FILE_ERROR;
-		goto DONE;
-	    }
-	}
+	status = _mkdir (notmuch_path, &message);
+	if (status)
+	    goto DONE;
     }
 
     if (! (notmuch->xapian_path = talloc_asprintf (notmuch, "%s/%s", notmuch_path, "xapian"))) {
-- 
2.35.2

_______________________________________________
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-leave@notmuchmail.org

Thread: