From: Peter Wang Date: Sun, 23 Jun 2013 04:24:03 +0000 (+1000) Subject: [PATCH v7 10/12] insert: add --create-folder option X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5accc0c4638dc167d294d143bff413a43705a0e8;p=notmuch-archives.git [PATCH v7 10/12] insert: add --create-folder option --- diff --git a/62/f3aeb071b241771170e497c7fcc9d90918970b b/62/f3aeb071b241771170e497c7fcc9d90918970b new file mode 100644 index 000000000..80656a595 --- /dev/null +++ b/62/f3aeb071b241771170e497c7fcc9d90918970b @@ -0,0 +1,203 @@ +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 A9BC1431FC0 + for ; Sat, 22 Jun 2013 21:25:38 -0700 (PDT) +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 er+1xHe7a6Dm for ; + Sat, 22 Jun 2013 21:25:33 -0700 (PDT) +Received: from mail-pb0-f44.google.com (mail-pb0-f44.google.com + [209.85.160.44]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id BC9EA429E27 + for ; Sat, 22 Jun 2013 21:24:48 -0700 (PDT) +Received: by mail-pb0-f44.google.com with SMTP id uo1so9534267pbc.31 + for ; Sat, 22 Jun 2013 21:24:48 -0700 (PDT) +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=qS2cXxe91dFezu3yAB8P4nKJrfVOwE9mUljEiB+ZXqU=; + b=EGOId9U/S3cyUq0F4HonoS6voioG47JOxShSrxRhfyYOH7ZsGBuZ/5Gce70weiCh44 + tD3PLLHugUg4WmVhE3nXqE3rqi+Ovd5dujuhIzTSuXGYtIf7E8k8qXOsg+izj1FusI1q + Pc8CgbrjRHekRWUQK8ZKGXKM+Xy4+qFJOD82ShXMVsP5Mvmr2l0tzZlEy+kXpp9bX1KT + kE8nJuZLzt0FqVuRxsvCqywLhyHLNnl8BW0sA7QZjySuddJU0ZuUKNjRQ+MjTbxMVARa + n51s8PaHWB6LUW3j6IA2WTV6RvlBsqHe1mpTpj1ZhiEtghoCwUb0sTePm4Es9I+LraM/ + 0GoQ== +X-Received: by 10.66.102.70 with SMTP id fm6mr22202082pab.78.1371961488073; + Sat, 22 Jun 2013 21:24:48 -0700 (PDT) +Received: from localhost (215.42.233.220.static.exetel.com.au. + [220.233.42.215]) by mx.google.com with ESMTPSA id + dj5sm11850307pbc.25.2013.06.22.21.24.45 for + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Sat, 22 Jun 2013 21:24:47 -0700 (PDT) +From: Peter Wang +To: notmuch@notmuchmail.org +Subject: [PATCH v7 10/12] insert: add --create-folder option +Date: Sun, 23 Jun 2013 14:24:03 +1000 +Message-Id: <1371961445-15182-11-git-send-email-novalazy@gmail.com> +X-Mailer: git-send-email 1.7.12.1 +In-Reply-To: <1371961445-15182-1-git-send-email-novalazy@gmail.com> +References: <1371961445-15182-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, 23 Jun 2013 04:25:38 -0000 + +Allow the insert command to create the maildir folder +into which the new message should be delivered. +--- + notmuch-insert.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 100 insertions(+) + +diff --git a/notmuch-insert.c b/notmuch-insert.c +index 5a4b3ea..8d0235d 100644 +--- a/notmuch-insert.c ++++ b/notmuch-insert.c +@@ -100,6 +100,99 @@ check_folder_name (const char *folder) + } + } + ++/* Make the given directory, succeeding if it already exists. */ ++static notmuch_bool_t ++make_directory (char *path, int mode) ++{ ++ notmuch_bool_t ret; ++ char *slash; ++ ++ if (mkdir (path, mode) != 0) ++ return (errno == EEXIST); ++ ++ /* Sync the parent directory for durability. */ ++ ret = TRUE; ++ slash = strrchr (path, '/'); ++ if (slash) { ++ *slash = '\0'; ++ ret = sync_dir (path); ++ *slash = '/'; ++ } ++ return ret; ++} ++ ++/* Make the given directory including its parent directories as necessary. ++ * Return TRUE on success, FALSE on error. */ ++static notmuch_bool_t ++make_directory_and_parents (char *path, int mode) ++{ ++ struct stat st; ++ char *start; ++ char *end; ++ notmuch_bool_t ret; ++ ++ /* First check the common case: directory already exists. */ ++ if (stat (path, &st) == 0) ++ return S_ISDIR (st.st_mode) ? TRUE : FALSE; ++ ++ 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 make_directory (path, mode); ++ ++ /* Make the path up to the next slash, unless the current ++ * directory component is actually empty. */ ++ if (end > start) { ++ *end = '\0'; ++ ret = make_directory (path, mode); ++ *end = '/'; ++ if (! ret) ++ return FALSE; ++ } ++ } ++ ++ return TRUE; ++} ++ ++/* 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 (! make_directory_and_parents (subdir, mode)) ++ return FALSE; ++ ++ tail = subdir + strlen (subdir) - 3; ++ ++ /* Create 'new' directory. */ ++ strcpy (tail, "new"); ++ if (! make_directory (subdir, mode)) ++ return FALSE; ++ ++ /* Create 'tmp' directory. */ ++ strcpy (tail, "tmp"); ++ if (! make_directory (subdir, mode)) ++ return FALSE; ++ ++ talloc_free (subdir); ++ return TRUE; ++} ++ + /* Open a unique file in the 'tmp' sub-directory of dir. + * Returns the file descriptor on success, or -1 on failure. + * On success, file paths for the message in the 'tmp' and 'new' +@@ -304,6 +397,7 @@ notmuch_insert_command (notmuch_config_t *config, int argc, char *argv[]) + tag_op_list_t *tag_ops; + char *query_string = NULL; + const char *folder = NULL; ++ notmuch_bool_t create_folder = FALSE; + const char *maildir; + int opt_index; + unsigned int i; +@@ -311,6 +405,7 @@ notmuch_insert_command (notmuch_config_t *config, 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 } + }; + +@@ -355,6 +450,11 @@ notmuch_insert_command (notmuch_config_t *config, int argc, char *argv[]) + fprintf (stderr, "Out of memory\n"); + return 1; + } ++ if (create_folder && ! maildir_create_folder (config, maildir)) { ++ fprintf (stderr, "Error: creating maildir %s: %s\n", ++ maildir, strerror (errno)); ++ return 1; ++ } + } + + /* Setup our handler for SIGINT. We do not set SA_RESTART so that copying +-- +1.7.12.1 +