From: Jani Nikula <jani@nikula.org>
To: notmuch@notmuchmail.org
Subject: [PATCH 07/11] cli/insert: abstract temporary filename generation
Date: Mon, 22 Sep 2014 11:54:58 +0200 [thread overview]
Message-ID: <550178f85df340b38eb82094a5f823c9673d83dc.1411379395.git.jani@nikula.org> (raw)
In-Reply-To: <cover.1411379395.git.jani@nikula.org>
In-Reply-To: <cover.1411379395.git.jani@nikula.org>
This will clean up the usage. There's the slight functional change of
potentially ending up doing extra gethostname and getpid calls, but
this is neglible.
---
notmuch-insert.c | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/notmuch-insert.c b/notmuch-insert.c
index cdeeb41..a1d564c 100644
--- a/notmuch-insert.c
+++ b/notmuch-insert.c
@@ -179,6 +179,31 @@ maildir_create_folder (const void *ctx, const char *maildir)
return TRUE;
}
+/*
+ * Generate a temporary file basename, no path, do not create an
+ * actual file. Return the basename, or NULL on errors.
+ */
+static char *
+tempfilename (const void *ctx)
+{
+ char *filename;
+ char hostname[256];
+ struct timeval tv;
+ pid_t pid;
+
+ /* We follow the Dovecot file name generation algorithm. */
+ pid = getpid ();
+ safe_gethostname (hostname, sizeof (hostname));
+ gettimeofday (&tv, NULL);
+
+ filename = talloc_asprintf (ctx, "%ld.M%ldP%d.%s",
+ tv.tv_sec, tv.tv_usec, pid, hostname);
+ if (! filename)
+ fprintf (stderr, "Error: %s\n", strerror (ENOMEM));
+
+ 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'
@@ -188,23 +213,13 @@ static int
maildir_open_tmp_file (void *ctx, const char *dir,
char **tmppath, char **newpath, char **newdir)
{
- pid_t pid;
- char hostname[256];
- struct timeval tv;
char *filename;
int fd = -1;
- /* We follow the Dovecot file name generation algorithm. */
- pid = getpid ();
- safe_gethostname (hostname, sizeof (hostname));
do {
- gettimeofday (&tv, NULL);
- filename = talloc_asprintf (ctx, "%ld.M%ldP%d.%s",
- tv.tv_sec, tv.tv_usec, pid, hostname);
- if (! filename) {
- fprintf (stderr, "Out of memory\n");
+ filename = tempfilename (ctx);
+ if (! filename)
return -1;
- }
*tmppath = talloc_asprintf (ctx, "%s/tmp/%s", dir, filename);
if (! *tmppath) {
--
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 ` Jani Nikula [this message]
2014-09-22 9:54 ` [PATCH 08/11] cli/insert: rehash file writing functions Jani Nikula
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=550178f85df340b38eb82094a5f823c9673d83dc.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).