From: Peter Wang Date: Sun, 25 Nov 2012 01:16:31 +0000 (+1100) Subject: [PATCH v2 05/20] insert: copy stdin to Maildir tmp file X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=70e664f738b0a220522f00d3f2846ed751a78c36;p=notmuch-archives.git [PATCH v2 05/20] insert: copy stdin to Maildir tmp file --- diff --git a/d7/861c0810608ff4b9ddd99a19e5ff98b50b744e b/d7/861c0810608ff4b9ddd99a19e5ff98b50b744e new file mode 100644 index 000000000..f8ac42186 --- /dev/null +++ b/d7/861c0810608ff4b9ddd99a19e5ff98b50b744e @@ -0,0 +1,145 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 0D324431FAF + for ; Sat, 24 Nov 2012 17:17:35 -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 8WXfhL7oIgKz for ; + Sat, 24 Nov 2012 17:17:33 -0800 (PST) +Received: from mail-pa0-f53.google.com (mail-pa0-f53.google.com + [209.85.220.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id AC5EF431FAE + for ; Sat, 24 Nov 2012 17:17:33 -0800 (PST) +Received: by mail-pa0-f53.google.com with SMTP id hz1so3911431pad.26 + for ; Sat, 24 Nov 2012 17:17:33 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; + bh=lxIudV5S+FSlgaCBq0m3vsV/SJuMlY/rNRgJfmWBVhE=; + b=n1Lzc6huswj+RMfIu43d/b8ElRVuheZGMANULjmlK5lZZjcXIS4CRiT7wqyEFcIp+k + AkgpbSAU8Eot5lHpCe7HuvID39JNd9kbVXGjvGmuFZhM9MWRKpFoRqKugesYO1+MuqGC + wog1jvkBJXeGxNrVz1Do2ZKZIaeOYtL2fFhI+hFJrwDoEj7BOEGRHCpg7/6vWTNFGW5y + Yl9+6sVM2zveS6EfKOandUAwM0ybNaeGQSXMMU9tyJYHq11cmn+okS52WAf0aZuWJB8D + N7NcYV4iJbrWq5bmfMMZSX5q0nV9pjK9D5u1vzhLztzFuZ3Fnw4WDV7z8Nl4aeoSeehD + xOsg== +Received: by 10.68.232.200 with SMTP id tq8mr26399660pbc.52.1353806252961; + Sat, 24 Nov 2012 17:17:32 -0800 (PST) +Received: from localhost (215.42.233.220.static.exetel.com.au. + [220.233.42.215]) + by mx.google.com with ESMTPS id ix9sm6232405pbc.7.2012.11.24.17.17.30 + (version=TLSv1/SSLv3 cipher=OTHER); + Sat, 24 Nov 2012 17:17:32 -0800 (PST) +From: Peter Wang +To: notmuch@notmuchmail.org +Subject: [PATCH v2 05/20] insert: copy stdin to Maildir tmp file +Date: Sun, 25 Nov 2012 12:16:31 +1100 +Message-Id: <1353806206-29133-6-git-send-email-novalazy@gmail.com> +X-Mailer: git-send-email 1.7.12.1 +In-Reply-To: <1353806206-29133-1-git-send-email-novalazy@gmail.com> +References: <1353806206-29133-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, 25 Nov 2012 01:17:35 -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 371fb47..88e8533 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 fdin into fdout. */ ++static notmuch_bool_t ++copy_fd_data (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_fd_data (fdin, fdout); + close (fdout); +- unlink (tmppath); +- return FALSE; ++ if (!ret) { ++ unlink (tmppath); ++ } ++ return ret; + } + + int +-- +1.7.12.1 +