[PATCH 16/18] insert: add --create-folder option

diff --git a/31/d5b3e0372f92a5b440a80b90206ebedf614243 b/31/d5b3e0372f92a5b440a80b90206ebedf614243
new file mode 100644 (file)
index 0000000..8ba3df8
--- /dev/null
+++ b/31/d5b3e0372f92a5b440a80b90206ebedf614243
@@ -0,0 +1,173 @@
+Return-Path: <novalazy@gmail.com>\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 9721E431FB6\r
+       for <notmuch@notmuchmail.org>; Wed, 25 Jul 2012 06:44:50 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] 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 58KsLlYWi8tb for <notmuch@notmuchmail.org>;\r
+       Wed, 25 Jul 2012 06:44:49 -0700 (PDT)\r
+Received: from mail-gg0-f181.google.com (mail-gg0-f181.google.com\r
+       [209.85.161.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id ACCE5431FAE\r
+       for <notmuch@notmuchmail.org>; Wed, 25 Jul 2012 06:44:49 -0700 (PDT)\r
+Received: by ggnv5 with SMTP id v5so884306ggn.26\r
+       for <notmuch@notmuchmail.org>; Wed, 25 Jul 2012 06:44:49 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       bh=7rnN/E5XAtJQxCnn8sc23jdqIk71FhaHAWCuDX+2vAs=;\r
+       b=igq4KXvhdTjsQCA2yR/YRcfmfYggplcVgv3zoQnueDfYHPJEjS3lmNyZEPHhfGZ7OP\r
+       0fzjFZW5zCOTfOiqecvpPDBJGjMPo1xhawn0aV7JppvSQTFLd7yq3c0gwqeBLJ9OX0bK\r
+       /tvkST9nJ9QZHUJKqwntQof+maHjLA0IWi3kuQF984QbPubzP85vPkOPeV1E9HFECiSx\r
+       tZ692xu3tbhUV//VGMO2dXDDZU0oy+lFugoAoJqspT36+f85dcqNrcrGYG9arFNR2vjv\r
+       OAfIdwMapReLzAQ0OBE2DAqGNQy+H+ytfbiaMEFyOF2/lNnkm5yr9Acja5mf63dm4NAK\r
+       SfWw==\r
+Received: by 10.66.73.70 with SMTP id j6mr12832814pav.5.1343223888780;\r
+       Wed, 25 Jul 2012 06:44:48 -0700 (PDT)\r
+Received: from localhost (215.42.233.220.static.exetel.com.au.\r
+       [220.233.42.215]) by mx.google.com with ESMTPS id\r
+       qd10sm14414282pbb.38.2012.07.25.06.44.46\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Wed, 25 Jul 2012 06:44:47 -0700 (PDT)\r
+From: Peter Wang <novalazy@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 16/18] insert: add --create-folder option\r
+Date: Wed, 25 Jul 2012 23:42:45 +1000\r
+Message-Id: <1343223767-9812-16-git-send-email-novalazy@gmail.com>\r
+X-Mailer: git-send-email 1.7.4.4\r
+In-Reply-To: <1343223767-9812-1-git-send-email-novalazy@gmail.com>\r
+References: <1343223767-9812-1-git-send-email-novalazy@gmail.com>\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: Wed, 25 Jul 2012 13:44:50 -0000\r
+\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
++\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