--- /dev/null
+Return-Path: <m.walters@qmul.ac.uk>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id B5038431FB6\r
+ for <notmuch@notmuchmail.org>; Sun, 18 Nov 2012 09:24:50 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+ tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+ NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id Q+jWC5sKd53e for <notmuch@notmuchmail.org>;\r
+ Sun, 18 Nov 2012 09:24:50 -0800 (PST)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 0929D431FAF\r
+ for <notmuch@notmuchmail.org>; Sun, 18 Nov 2012 09:24:50 -0800 (PST)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+ by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1Ta8bw-0002od-3D; Sun, 18 Nov 2012 17:24:48 +0000\r
+Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost)\r
+ by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1Ta8bv-0003lN-O6; Sun, 18 Nov 2012 17:24:47 +0000\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Peter Wang <novalazy@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 16/18] insert: add --create-folder option\r
+In-Reply-To: <1343223767-9812-16-git-send-email-novalazy@gmail.com>\r
+References: <1343223767-9812-1-git-send-email-novalazy@gmail.com>\r
+ <1343223767-9812-16-git-send-email-novalazy@gmail.com>\r
+User-Agent: Notmuch/0.14+81~g9730584 (http://notmuchmail.org) Emacs/23.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Sun, 18 Nov 2012 17:24:46 +0000\r
+Message-ID: <87lidyq0wx.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 93.97.24.31\r
+X-QM-SPAM-Info: Sender has good ham record. :)\r
+X-QM-Body-MD5: f571e8dfa76fd17203e32a90cd027b42 (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+ determine if it is\r
+ spam. We require at least 5.0 points to mark a message as spam.\r
+ This message scored -1.8 points.\r
+ Summary of the scoring: \r
+ * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+ * medium trust\r
+ * [138.37.6.40 listed in list.dnswl.org]\r
+ * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+ provider * (markwalters1009[at]gmail.com)\r
+ * 0.5 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 18 Nov 2012 17:24:50 -0000\r
+\r
+\r
+Hi\r
+\r
+On Wed, 25 Jul 2012, Peter Wang <novalazy@gmail.com> wrote:\r
+> Support an option to create a new folder in the maildir.\r
+> ---\r
+> notmuch-insert.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++\r
+> 1 files changed, 71 insertions(+), 0 deletions(-)\r
+>\r
+> diff --git a/notmuch-insert.c b/notmuch-insert.c\r
+> index a69dfe6..380c520 100644\r
+> --- a/notmuch-insert.c\r
+> +++ b/notmuch-insert.c\r
+> @@ -48,6 +48,70 @@ check_folder_name (const char *folder)\r
+> }\r
+> }\r
+> \r
+> +static int\r
+> +mkdir_parents (void *ctx, const char *path, int mode)\r
+> +{\r
+> + struct stat st;\r
+> + char *pathcopy;\r
+> + char *start;\r
+> + char *end;\r
+> + int ret;\r
+> +\r
+> + /* First check the common case: directory already exists. */\r
+> + if (stat (path, &st) == 0) {\r
+> + return (S_ISDIR (st.st_mode)) ? 0 : -1;\r
+> + }\r
+> +\r
+> + pathcopy = talloc_strdup (ctx, path);\r
+> + ret = 0;\r
+> +\r
+> + for (start = pathcopy; *start != '\0'; start = end + 1) {\r
+> + end = strchr (start + 1, '/');\r
+> + if (!end) {\r
+> + ret = mkdir (path, mode);\r
+> + break;\r
+> + }\r
+> + *end = '\0';\r
+> + ret = mkdir (pathcopy, mode);\r
+> + if (ret != 0 && errno != EEXIST) {\r
+> + break;\r
+> + }\r
+> + *end = '/';\r
+> + }\r
+I am a little confused by this: why is there a +1 in the start = end + 1\r
+line and in the end = strchr line? I believe it doesn't matter but it\r
+makes me wonder if I am missing something.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+\r
+\r
+> +\r
+> + talloc_free (pathcopy);\r
+> +\r
+> + return ret;\r
+> +}\r
+> +\r
+> +static notmuch_bool_t\r
+> +maildir_create (void *ctx, const char *dir)\r
+> +{\r
+> + const int mode = 0755;\r
+> + char *subdir;\r
+> + char *end;\r
+> +\r
+> + /* Create 'cur' directory, including parent directories. */\r
+> + subdir = talloc_asprintf (ctx, "%s/cur", dir);\r
+> + if (mkdir_parents (ctx, subdir, mode) != 0)\r
+> + return FALSE;\r
+> +\r
+> + end = subdir + strlen (subdir);\r
+> +\r
+> + /* Create 'new' directory. */\r
+> + strcpy (end - 3, "new");\r
+> + if (mkdir (subdir, mode) != 0 && errno != EEXIST)\r
+> + return FALSE;\r
+> +\r
+> + /* Create 'tmp' directory. */\r
+> + strcpy (end - 3, "tmp");\r
+> + if (mkdir (subdir, mode) != 0 && errno != EEXIST)\r
+> + return FALSE;\r
+> +\r
+> + talloc_free (subdir);\r
+> + return TRUE;\r
+> +}\r
+> +\r
+> static notmuch_bool_t\r
+> safe_gethostname (char *hostname, size_t hostname_size)\r
+> {\r
+> @@ -253,6 +317,7 @@ notmuch_insert_command (void *ctx, int argc, char *argv[])\r
+> const char **new_tags;\r
+> size_t new_tags_length;\r
+> const char *folder = NULL;\r
+> + notmuch_bool_t create_folder = FALSE;\r
+> tag_operation_t *tag_ops;\r
+> int tag_ops_count = 0;\r
+> char *maildir;\r
+> @@ -262,6 +327,7 @@ notmuch_insert_command (void *ctx, int argc, char *argv[])\r
+> \r
+> notmuch_opt_desc_t options[] = {\r
+> { NOTMUCH_OPT_STRING, &folder, "folder", 0, 0 },\r
+> + { NOTMUCH_OPT_BOOLEAN, &create_folder, "create-folder", 0, 0 },\r
+> { NOTMUCH_OPT_END, 0, 0, 0, 0 }\r
+> };\r
+> \r
+> @@ -328,6 +394,11 @@ notmuch_insert_command (void *ctx, int argc, char *argv[])\r
+> return 1;\r
+> }\r
+> maildir = talloc_asprintf (ctx, "%s/%s", db_path, folder);\r
+> + if (create_folder && ! maildir_create (ctx, maildir)) {\r
+> + fprintf (stderr, "Error: creating maildir %s: %s\n",\r
+> + maildir, strerror (errno));\r
+> + return 1;\r
+> + }\r
+> } else {\r
+> maildir = talloc_asprintf (ctx, "%s", db_path);\r
+> }\r
+> -- \r
+> 1.7.4.4\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff