Support an option to create a new folder in the maildir. --- notmuch-insert.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/notmuch-insert.c b/notmuch-insert.c index 81a528c..b7aef95 100644 --- a/notmuch-insert.c +++ b/notmuch-insert.c @@ -55,6 +55,91 @@ check_folder_name (const char *folder) } } +/* Make the given directory but succeed if it already exists. */ +static int +mkdir_exists_ok (const char *path, int mode) +{ + int ret; + + ret = mkdir (path, mode); + if (ret == 0 || errno == EEXIST) + return 0; + else + return ret; +} + +/* Make the given directory including its parent directory as necessary. + * Return 0 on success, -1 on error. */ +static int +mkdir_parents (char *path, int mode) +{ + struct stat st; + char *start; + char *end; + int ret; + + /* First check the common case: directory already exists. */ + if (stat (path, &st) == 0) + return (S_ISDIR (st.st_mode)) ? 0 : -1; + + for (start = path; *start != '\0'; start = end + 1) { + /* start points to the first unprocessed character. + * Find the next slash from start onwards. */ + end = strchr (start, '/'); + + /* If there are no more slashes then all the parent directories + * have been made. Now attempt to make the whole path. */ + if (end == NULL) + return mkdir_exists_ok (path, mode); + + /* Make the path up to the next slash, unless the current + * directory component is actually empty. */ + if (end > start) { + *end = '\0'; + ret = mkdir_exists_ok (path, mode); + *end = '/'; + if (ret != 0) + return ret; + } + } + + return 0; +} + +/* Create the given maildir folder, i.e. dir and its subdirectories + * 'cur', 'new', 'tmp'. */ +static notmuch_bool_t +maildir_create_folder (void *ctx, const char *dir) +{ + const int mode = 0700; + char *subdir; + char *tail; + + /* Create 'cur' directory, including parent directories. */ + subdir = talloc_asprintf (ctx, "%s/cur", dir); + if (! subdir) { + fprintf (stderr, "Out of memory.\n"); + return FALSE; + } + if (mkdir_parents (subdir, mode) != 0) + return FALSE; + + tail = subdir + strlen (subdir) - 3; + + /* Create 'new' directory. */ + strcpy (tail, "new"); + if (mkdir_exists_ok (subdir, mode) != 0) + return FALSE; + + /* Create 'tmp' directory. */ + strcpy (tail, "tmp"); + if (mkdir_exists_ok (subdir, mode) != 0) + return FALSE; + + talloc_free (subdir); + return TRUE; +} + /* Open a unique file in the Maildir 'tmp' directory. * Returns the file descriptor on success, or -1 on failure. * On success, file paths into the 'tmp' and 'new' directories are returned @@ -272,6 +357,7 @@ notmuch_insert_command (void *ctx, int argc, char *argv[]) const char **new_tags; size_t new_tags_length; const char *folder = NULL; + notmuch_bool_t create_folder = FALSE; notmuch_tag_operation_t *tag_ops; int tag_ops_count; char *maildir; @@ -280,6 +366,7 @@ notmuch_insert_command (void *ctx, int argc, char *argv[]) notmuch_opt_desc_t options[] = { { NOTMUCH_OPT_STRING, &folder, "folder", 0, 0 }, + { NOTMUCH_OPT_BOOLEAN, &create_folder, "create-folder", 0, 0 }, { NOTMUCH_OPT_END, 0, 0, 0, 0 } }; @@ -332,6 +419,11 @@ notmuch_insert_command (void *ctx, int argc, char *argv[]) fprintf (stderr, "Out of memory\n"); return 1; } + if (create_folder && ! maildir_create_folder (ctx, maildir)) { + fprintf (stderr, "Error: creating maildir %s: %s\n", + maildir, strerror (errno)); + return 1; + } if (notmuch_database_open (notmuch_config_get_database_path (config), NOTMUCH_DATABASE_MODE_READ_WRITE, ¬much)) -- 1.7.12.1