From: Jani Nikula <jani@nikula.org>
To: notmuch@notmuchmail.org
Subject: [PATCH 08/11] cli/insert: rehash file writing functions
Date: Mon, 22 Sep 2014 11:54:59 +0200 [thread overview]
Message-ID: <db771a008661ab5205dc4749206bc7515950f9e3.1411379395.git.jani@nikula.org> (raw)
In-Reply-To: <cover.1411379395.git.jani@nikula.org>
In-Reply-To: <cover.1411379395.git.jani@nikula.org>
Make the function calls make more sense as independent building blocks
of the big picture, with clear inputs and outputs. Split up
write_message into two. Improve function documentation. Cleanup and
clarify the error paths.
---
notmuch-insert.c | 127 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 75 insertions(+), 52 deletions(-)
diff --git a/notmuch-insert.c b/notmuch-insert.c
index a1d564c..5ef6e66 100644
--- a/notmuch-insert.c
+++ b/notmuch-insert.c
@@ -204,47 +204,37 @@ tempfilename (const void *ctx)
return filename;
}
-/* 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'
- * directories are returned via tmppath and newpath,
- * and the path of the 'new' directory itself in newdir. */
+/*
+ * Create a unique temporary file in maildir/tmp, return fd and full
+ * path to file in *path_out, or -1 on errors (in which case *path_out
+ * is not touched).
+ */
static int
-maildir_open_tmp_file (void *ctx, const char *dir,
- char **tmppath, char **newpath, char **newdir)
+maildir_mktemp (const void *ctx, const char *maildir, char **path_out)
{
- char *filename;
- int fd = -1;
+ char *filename, *path;
+ int fd;
do {
filename = tempfilename (ctx);
if (! filename)
return -1;
- *tmppath = talloc_asprintf (ctx, "%s/tmp/%s", dir, filename);
- if (! *tmppath) {
- fprintf (stderr, "Out of memory\n");
+ path = talloc_asprintf (ctx, "%s/tmp/%s", maildir, filename);
+ if (! path) {
+ fprintf (stderr, "Error: %s\n", strerror (ENOMEM));
return -1;
}
- fd = open (*tmppath, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600);
+ fd = open (path, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600);
} while (fd == -1 && errno == EEXIST);
if (fd == -1) {
- fprintf (stderr, "Error: opening %s: %s\n", *tmppath, strerror (errno));
+ fprintf (stderr, "Error: open '%s': %s\n", path, strerror (errno));
return -1;
}
- *newdir = talloc_asprintf (ctx, "%s/new", dir);
- *newpath = talloc_asprintf (ctx, "%s/new/%s", dir, filename);
- if (! *newdir || ! *newpath) {
- fprintf (stderr, "Out of memory\n");
- close (fd);
- unlink (*tmppath);
- return -1;
- }
-
- talloc_free (filename);
+ *path_out = path;
return fd;
}
@@ -293,53 +283,85 @@ copy_fd (int fdout, int fdin)
return (!interrupted && !empty);
}
-static notmuch_bool_t
-write_message (void *ctx, int fdin, const char *dir, char **newpath)
+/*
+ * Write fdin to a new temp file in maildir/tmp, return full path to
+ * the file, or NULL on errors.
+ */
+static char *
+maildir_write_tmp (const void *ctx, int fdin, const char *maildir)
{
- char *tmppath;
- char *newdir;
- char *cleanup_path;
+ char *path;
int fdout;
- fdout = maildir_open_tmp_file (ctx, dir, &tmppath, newpath, &newdir);
+ fdout = maildir_mktemp (ctx, maildir, &path);
if (fdout < 0)
- return FALSE;
-
- cleanup_path = tmppath;
+ return NULL;
if (! copy_fd (fdout, fdin))
goto FAIL;
- if (fsync (fdout) != 0) {
- fprintf (stderr, "Error: fsync failed: %s\n", strerror (errno));
+ if (fsync (fdout)) {
+ fprintf (stderr, "Error: fsync '%s': %s\n", path, strerror (errno));
goto FAIL;
}
close (fdout);
- fdout = -1;
-
- /* Atomically move the new message file from the Maildir 'tmp' directory
- * to the 'new' directory. We follow the Dovecot recommendation to
- * simply use rename() instead of link() and unlink().
- * See also: http://wiki.dovecot.org/MailboxFormat/Maildir#Mail_delivery
- */
- if (rename (tmppath, *newpath) != 0) {
- fprintf (stderr, "Error: rename() failed: %s\n", strerror (errno));
+
+ return path;
+
+FAIL:
+ close (fdout);
+ unlink (path);
+
+ return NULL;
+}
+
+/*
+ * Write fdin to a new file in maildir/new, using an intermediate temp
+ * file in maildir/tmp, return full path to the new file, or NULL on
+ * errors.
+ */
+static char *
+maildir_write_new (const void *ctx, int fdin, const char *maildir)
+{
+ char *cleanpath, *tmppath, *newpath, *newdir;
+
+ tmppath = maildir_write_tmp (ctx, fdin, maildir);
+ if (! tmppath)
+ return NULL;
+ cleanpath = tmppath;
+
+ newpath = talloc_strdup (ctx, tmppath);
+ if (! newpath) {
+ fprintf (stderr, "Error: %s\n", strerror (ENOMEM));
goto FAIL;
}
- cleanup_path = *newpath;
+ /* sanity checks needed? */
+ memcpy (newpath + strlen (maildir) + 1, "new", 3);
+
+ if (rename (tmppath, newpath)) {
+ fprintf (stderr, "Error: rename '%s' '%s': %s\n",
+ tmppath, newpath, strerror (errno));
+ goto FAIL;
+ }
+ cleanpath = newpath;
+
+ newdir = talloc_asprintf (ctx, "%s/%s", maildir, "new");
+ if (! newdir) {
+ fprintf (stderr, "Error: %s\n", strerror (ENOMEM));
+ goto FAIL;
+ }
if (! sync_dir (newdir))
goto FAIL;
- return TRUE;
+ return newpath;
+
+FAIL:
+ unlink (cleanpath);
- FAIL:
- if (fdout >= 0)
- close (fdout);
- unlink (cleanup_path);
- return FALSE;
+ return NULL;
}
/* Add the specified message file to the notmuch database, applying tags.
@@ -477,7 +499,8 @@ notmuch_insert_command (notmuch_config_t *config, int argc, char *argv[])
return EXIT_FAILURE;
/* Write the message to the Maildir new directory. */
- if (! write_message (config, STDIN_FILENO, maildir, &newpath)) {
+ newpath = maildir_write_new (config, STDIN_FILENO, maildir);
+ if (! newpath) {
notmuch_database_destroy (notmuch);
return EXIT_FAILURE;
}
--
1.7.2.5
next prev parent reply other threads:[~2014-09-22 9:55 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-22 9:54 [PATCH 00/11] notmuch insert updates Jani Nikula
2014-09-22 9:54 ` [PATCH 01/11] lib: actually return failures from notmuch_message_tags_to_maildir_flags Jani Nikula
2014-09-22 9:54 ` [PATCH 02/11] cli/insert: rename check_folder_name to is_valid_folder_name Jani Nikula
2014-09-22 9:54 ` [PATCH 03/11] cli/insert: move add_file_to_database to a better place Jani Nikula
2014-09-22 9:54 ` [PATCH 04/11] cli/insert: rename file copy function Jani Nikula
2014-09-22 9:54 ` [PATCH 05/11] cli/insert: clean up sync_dir Jani Nikula
2014-09-22 9:54 ` [PATCH 06/11] cli/insert: use a single recursive mkdir function Jani Nikula
2014-09-22 9:54 ` [PATCH 07/11] cli/insert: abstract temporary filename generation Jani Nikula
2014-09-22 9:54 ` Jani Nikula [this message]
2014-09-22 9:55 ` [PATCH 09/11] cli/insert: add fail path to add_file_to_database Jani Nikula
2014-09-26 20:09 ` David Bremner
2014-09-22 9:55 ` [PATCH 10/11] cli/insert: require succesful message indexing for success status Jani Nikula
2014-09-22 9:55 ` [PATCH 11/11] cli/insert: add post-insert hook Jani Nikula
2014-09-25 8:13 ` [PATCH 00/11] notmuch insert updates David Bremner
2014-09-25 19:54 ` Tomi Ollila
2014-09-26 6:48 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=db771a008661ab5205dc4749206bc7515950f9e3.1411379395.git.jani@nikula.org \
--to=jani@nikula.org \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).