From: Peter Wang <novalazy@gmail.com>
To: notmuch@notmuchmail.org
Subject: [PATCH v3 02/20] insert: open Maildir tmp file
Date: Sun, 20 Jan 2013 11:49:46 +1100 [thread overview]
Message-ID: <1358643004-14522-3-git-send-email-novalazy@gmail.com> (raw)
In-Reply-To: <1358643004-14522-1-git-send-email-novalazy@gmail.com>
Open a unique file in the Maildir tmp directory.
The new message is not yet copied into the file.
---
notmuch-insert.c | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 104 insertions(+), 1 deletion(-)
diff --git a/notmuch-insert.c b/notmuch-insert.c
index c1d359c..7d100ae 100644
--- a/notmuch-insert.c
+++ b/notmuch-insert.c
@@ -20,12 +20,107 @@
#include "notmuch-client.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+/* Like gethostname but guarantees that a null-terminated hostname is
+ * returned, even if it has to make one up.
+ * Returns true unless hostname contains a slash. */
+static notmuch_bool_t
+safe_gethostname (char *hostname, size_t len)
+{
+ if (gethostname (hostname, len) == -1) {
+ strncpy (hostname, "unknown", len);
+ }
+ hostname[len - 1] = '\0';
+
+ return (strchr (hostname, '/') == NULL);
+}
+
+/* Open a unique file in the Maildir 'tmp' directory.
+ * 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. */
+static int
+maildir_open_tmp_file (void *ctx, const char *dir,
+ char **tmppath, char **newpath)
+{
+ pid_t pid;
+ char hostname[256];
+ struct timeval tv;
+ char *filename;
+ int fd = -1;
+
+ /* We follow the Dovecot file name generation algorithm. */
+ pid = getpid ();
+ if (! safe_gethostname (hostname, sizeof (hostname))) {
+ fprintf (stderr, "Error: invalid host name.\n");
+ return -1;
+ }
+ 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");
+ return -1;
+ }
+
+ *tmppath = talloc_asprintf (ctx, "%s/tmp/%s", dir, filename);
+ if (! *tmppath) {
+ fprintf (stderr, "Out of memory\n");
+ return -1;
+ }
+
+ fd = open (*tmppath, 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));
+ return -1;
+ }
+
+ *newpath = talloc_asprintf (ctx, "%s/new/%s", dir, filename);
+ if (! *newpath) {
+ fprintf (stderr, "Out of memory\n");
+ close (fd);
+ unlink (*tmppath);
+ return -1;
+ }
+
+ talloc_free (filename);
+
+ return fd;
+}
+
+static notmuch_bool_t
+insert_message (void *ctx, notmuch_database_t *notmuch, int fdin,
+ const char *dir)
+{
+ char *tmppath;
+ char *newpath;
+ int fdout;
+
+ fdout = maildir_open_tmp_file (ctx, dir, &tmppath, &newpath);
+ if (fdout < 0) {
+ return FALSE;
+ }
+
+ /* For now we just delete the tmp file immediately. */
+ close (fdout);
+ unlink (tmppath);
+ return FALSE;
+}
+
int
notmuch_insert_command (void *ctx, int argc, char *argv[])
{
notmuch_config_t *config;
notmuch_database_t *notmuch;
const char *db_path;
+ char *maildir;
+ notmuch_bool_t ret;
config = notmuch_config_open (ctx, NULL, NULL);
if (config == NULL)
@@ -33,11 +128,19 @@ notmuch_insert_command (void *ctx, int argc, char *argv[])
db_path = notmuch_config_get_database_path (config);
+ maildir = talloc_asprintf (ctx, "%s", db_path);
+ if (! maildir) {
+ fprintf (stderr, "Out of memory\n");
+ return 1;
+ }
+
if (notmuch_database_open (notmuch_config_get_database_path (config),
NOTMUCH_DATABASE_MODE_READ_WRITE, ¬much))
return 1;
+ ret = insert_message (ctx, notmuch, STDIN_FILENO, maildir);
+
notmuch_database_destroy (notmuch);
- return 1;
+ return (ret) ? 0 : 1;
}
--
1.7.12.1
next prev parent reply other threads:[~2013-01-20 0:50 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-20 0:49 [PATCH v3 00/20] insert command Peter Wang
2013-01-20 0:49 ` [PATCH v3 01/20] cli: add stub for " Peter Wang
2013-01-22 21:45 ` Jani Nikula
2013-01-23 8:04 ` Peter Wang
2013-01-23 8:26 ` Tomi Ollila
2013-01-23 9:22 ` Jani Nikula
2013-01-20 0:49 ` Peter Wang [this message]
2013-01-20 0:49 ` [PATCH v3 03/20] insert: copy stdin to Maildir tmp file Peter Wang
2013-01-20 0:49 ` [PATCH v3 04/20] insert: move file from Maildir tmp to new Peter Wang
2013-01-20 0:49 ` [PATCH v3 05/20] insert: add new message to database Peter Wang
2013-01-20 0:49 ` [PATCH v3 06/20] insert: apply default tags to new message Peter Wang
2013-01-20 0:49 ` [PATCH v3 07/20] tag-util: do not reset list in parse_tag_command_line Peter Wang
2013-01-21 18:09 ` Jani Nikula
2013-01-20 0:49 ` [PATCH v3 08/20] tag-util: move out 'tag' command-line checks Peter Wang
2013-01-21 18:05 ` Jani Nikula
2013-01-20 0:49 ` [PATCH v3 09/20] insert: parse and apply command-line tag operations Peter Wang
2013-01-20 0:49 ` [PATCH v3 10/20] insert: support --folder option Peter Wang
2013-01-20 0:49 ` [PATCH v3 11/20] insert: prevent writes outside Maildir hierarchy Peter Wang
2013-01-20 0:49 ` [PATCH v3 12/20] insert: add --create-folder option Peter Wang
2013-01-20 0:49 ` [PATCH v3 13/20] insert: fsync after writing tmp file Peter Wang
2013-01-20 0:49 ` [PATCH v3 14/20] insert: fsync new directory after rename Peter Wang
2013-01-20 0:49 ` [PATCH v3 15/20] insert: fsync parent directory after mkdir Peter Wang
2013-01-20 0:50 ` [PATCH v3 16/20] insert: trap SIGINT and clean up Peter Wang
2013-01-20 0:50 ` [PATCH v3 17/20] insert: add copyright line from notmuch-deliver Peter Wang
2013-01-20 0:50 ` [PATCH v3 18/20] man: document 'insert' command Peter Wang
2013-01-20 0:50 ` [PATCH v3 19/20] man: reference notmuch-insert.1 Peter Wang
2013-01-20 0:50 ` [PATCH v3 20/20] test: add tests for insert Peter Wang
2013-01-22 20:05 ` [PATCH v3 00/20] insert command Jani Nikula
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=1358643004-14522-3-git-send-email-novalazy@gmail.com \
--to=novalazy@gmail.com \
--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).