From: Peter Wang Date: Sun, 25 Nov 2012 01:16:39 +0000 (+1100) Subject: [PATCH v2 13/20] insert: add --create-folder option X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=6222e9a3e83a365eed610ccdf8320188767238cc;p=notmuch-archives.git [PATCH v2 13/20] insert: add --create-folder option --- diff --git a/ad/bc465cf984d93d63ccc46a13b4c03b1b1688a8 b/ad/bc465cf984d93d63ccc46a13b4c03b1b1688a8 new file mode 100644 index 000000000..f8e8ffe61 --- /dev/null +++ b/ad/bc465cf984d93d63ccc46a13b4c03b1b1688a8 @@ -0,0 +1,194 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id CD93F431FAF + for ; Sat, 24 Nov 2012 17:18:19 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.799 +X-Spam-Level: +X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id 55G8P7IW1bWR for ; + Sat, 24 Nov 2012 17:18:18 -0800 (PST) +Received: from mail-pa0-f53.google.com (mail-pa0-f53.google.com + [209.85.220.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id A82FD431FAE + for ; Sat, 24 Nov 2012 17:18:18 -0800 (PST) +Received: by mail-pa0-f53.google.com with SMTP id hz1so3911431pad.26 + for ; Sat, 24 Nov 2012 17:18:18 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; + bh=xn5U2n/VUXiTHcThk3h/4CVQiEsyI/PGZWaFXJa0Eaw=; + b=KVRQpQkWj0ShcjtmeWQPz1KQK+vyf4exBK1+AJurUmaK1GBal6PoiCZV1F3z71B+Sq + clOWmOB1XmdN5YerYnY90PK23aREg3jWXVGgQO+Mvt+QkLwrATqBPFW5hPT7TzgxzXM6 + M1Z1MkuoD1DZILTNZ8UmPsE3QkH4j37ACB8ZChX8n7z5QyZE4osCEfmBHF5ofeGZNyYz + PmMedYVnHhDw4Eos80p57XMriyGhfBtcxkoZb9fns2+ygz/JDjTTJGV9VIyN4ygLs3Hb + 8Frfgw6rsSYRjV0FLHY6KxqYIeNsp/1jaxZPFhsT/CY/J2g+JQZWkF8/SXXpMhnLfuSR + lvFw== +Received: by 10.68.218.97 with SMTP id pf1mr26282231pbc.96.1353806298424; + Sat, 24 Nov 2012 17:18:18 -0800 (PST) +Received: from localhost (215.42.233.220.static.exetel.com.au. + [220.233.42.215]) + by mx.google.com with ESMTPS id gu5sm6232468pbc.10.2012.11.24.17.18.15 + (version=TLSv1/SSLv3 cipher=OTHER); + Sat, 24 Nov 2012 17:18:17 -0800 (PST) +From: Peter Wang +To: notmuch@notmuchmail.org +Subject: [PATCH v2 13/20] insert: add --create-folder option +Date: Sun, 25 Nov 2012 12:16:39 +1100 +Message-Id: <1353806206-29133-14-git-send-email-novalazy@gmail.com> +X-Mailer: git-send-email 1.7.12.1 +In-Reply-To: <1353806206-29133-1-git-send-email-novalazy@gmail.com> +References: <1353806206-29133-1-git-send-email-novalazy@gmail.com> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sun, 25 Nov 2012 01:18:19 -0000 + +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 +