From: Peter Wang <novalazy@gmail.com>
To: notmuch@notmuchmail.org
Subject: [PATCH v3 03/20] insert: copy stdin to Maildir tmp file
Date: Sun, 20 Jan 2013 11:49:47 +1100 [thread overview]
Message-ID: <1358643004-14522-4-git-send-email-novalazy@gmail.com> (raw)
In-Reply-To: <1358643004-14522-1-git-send-email-novalazy@gmail.com>
Read the new message from standard input into the Maildir tmp file.
---
notmuch-insert.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 47 insertions(+), 4 deletions(-)
diff --git a/notmuch-insert.c b/notmuch-insert.c
index 7d100ae..38e815f 100644
--- a/notmuch-insert.c
+++ b/notmuch-insert.c
@@ -94,6 +94,47 @@ maildir_open_tmp_file (void *ctx, const char *dir,
return fd;
}
+/* Copy the contents of standard input (fdin) into fdout. */
+static notmuch_bool_t
+copy_stdin (int fdin, int fdout)
+{
+ char buf[4096];
+ char *p;
+ ssize_t remain;
+ ssize_t written;
+
+ for (;;) {
+ remain = read (fdin, buf, sizeof (buf));
+ if (remain == 0)
+ break;
+ if (remain < 0) {
+ if (errno == EINTR)
+ continue;
+ fprintf (stderr, "Error: reading from standard input: %s\n",
+ strerror (errno));
+ return FALSE;
+ }
+
+ p = buf;
+ do {
+ written = write (fdout, p, remain);
+ if (written == 0)
+ return FALSE;
+ if (written < 0) {
+ if (errno == EINTR)
+ continue;
+ fprintf (stderr, "Error: writing to temporary file: %s",
+ strerror (errno));
+ return FALSE;
+ }
+ p += written;
+ remain -= written;
+ } while (remain > 0);
+ }
+
+ return TRUE;
+}
+
static notmuch_bool_t
insert_message (void *ctx, notmuch_database_t *notmuch, int fdin,
const char *dir)
@@ -101,16 +142,18 @@ insert_message (void *ctx, notmuch_database_t *notmuch, int fdin,
char *tmppath;
char *newpath;
int fdout;
+ notmuch_bool_t ret;
fdout = maildir_open_tmp_file (ctx, dir, &tmppath, &newpath);
if (fdout < 0) {
return FALSE;
}
-
- /* For now we just delete the tmp file immediately. */
+ ret = copy_stdin (fdin, fdout);
close (fdout);
- unlink (tmppath);
- return FALSE;
+ if (!ret) {
+ unlink (tmppath);
+ }
+ return ret;
}
int
--
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 ` [PATCH v3 02/20] insert: open Maildir tmp file Peter Wang
2013-01-20 0:49 ` Peter Wang [this message]
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-4-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).