From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 6FC26431FDA for ; Sat, 19 Jan 2013 16:50:53 -0800 (PST) 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 NOvHwOEl2grh for ; Sat, 19 Jan 2013 16:50:52 -0800 (PST) Received: from mail-pb0-f47.google.com (mail-pb0-f47.google.com [209.85.160.47]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id F24E3429E25 for ; Sat, 19 Jan 2013 16:50:48 -0800 (PST) Received: by mail-pb0-f47.google.com with SMTP id wz17so2682537pbc.6 for ; Sat, 19 Jan 2013 16:50:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=nCiX83/rEGYX4NdG4jvMp8tfXBvbqAKwli6PX/6Euxg=; b=N6ZMPAncXzDzwvk8r/9N13hoBDZQ6m9WJmh349QvO12E+ngErmplXt6GEGJxKv2RiV b49VD7I5jDQ9gqdbgiLfnBon/nrOOJdHBjN8VXtVa1fZBLuGNAowH8MrcI3hkjqgYLvP f4sKWlM26IeimFpn/icEDZwpJdTUZlRh/mIJlrtVdIIUJxrM2nDlPhXnkqPtCmvZZV13 i6QPNvXuwbUxJCMy8L3q6kil7q0AlXDzsjbPpK5N2CDwc8/qManlfdoeM/iK2zUBqXXv LFfa7NYmm/7+0YzGj14jSDSvxmXdfSd2f/KuTk/+IRMLt91bTf3C9qrptVNXyMTe/n6/ g2yg== X-Received: by 10.66.77.99 with SMTP id r3mr36528025paw.10.1358643048098; Sat, 19 Jan 2013 16:50:48 -0800 (PST) Received: from localhost (215.42.233.220.static.exetel.com.au. [220.233.42.215]) by mx.google.com with ESMTPS id z10sm6273786pay.7.2013.01.19.16.50.45 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 19 Jan 2013 16:50:47 -0800 (PST) From: Peter Wang 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 Message-Id: <1358643004-14522-4-git-send-email-novalazy@gmail.com> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1358643004-14522-1-git-send-email-novalazy@gmail.com> References: <1358643004-14522-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, 20 Jan 2013 00:50:53 -0000 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