From 5b68f6e43d7d8d07cbb8825c9520c20eaeac64b6 Mon Sep 17 00:00:00 2001 From: Philip Hazel Date: Mon, 1 Aug 2005 13:51:05 +0000 Subject: Use fseek() instead of fread() to skip the body file header line, so that the code will run in Cygwin. --- src/src/spool_mbox.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/src/spool_mbox.c b/src/src/spool_mbox.c index dd5d73b7a..af9a46b84 100644 --- a/src/src/spool_mbox.c +++ b/src/src/spool_mbox.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/spool_mbox.c,v 1.8 2005/07/01 10:49:02 ph10 Exp $ */ +/* $Cambridge: exim/src/src/spool_mbox.c,v 1.9 2005/08/01 13:51:05 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -134,10 +134,22 @@ FILE *spool_mbox(unsigned long *mbox_file_size) { break; }; - (void)fread(data_buffer, 1, 18, data_file); + /* The code used to use this line, but it doesn't work in Cygwin. + * + * (void)fread(data_buffer, 1, 18, data_file); + * + * What's happening is that spool_mbox used to use an fread to jump over the + * file header. That fails under Cygwin because the header is locked, but + * doing an fseek succeeds. We have to output the leading newline + * explicitly, because the one in the file is parted of the locked area. + */ + + (void)fwrite("\n", 1, 1, mbox_file); + (void)fseek(data_file, SPOOL_DATA_START_OFFSET, SEEK_SET); do { j = fread(data_buffer, 1, sizeof(data_buffer), data_file); + if (j > 0) { i = fwrite(data_buffer, 1, j, mbox_file); if (i != j) { -- cgit v1.2.3