dovecot/original-hg/dovecot-1.2: src/lib/istream-file.c annotate

annotate src/lib/istream-file.c @ 3239:904a268921af HEAD

Added seekable variable to struct istream.

author	Timo Sirainen <tss@iki.fi>
date	Mon, 28 Mar 2005 16:06:43 +0300
parents	06f9da4ff7a5
children	b79853b4b005

rev	line source
1741 9df02b1533b3 Removed most of the license comments from src/lib/.c. It's just fine to Timo Sirainen <tss@iki.fi>* parents: 1110 diff changeset	1 /* Copyright (c) 2002-2003 Timo Sirainen */
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	2
805 5ac361acb316 Marked all non-trivial buffer modifications with @UNSAFE tag. Several Timo Sirainen <tss@iki.fi> parents: 781 diff changeset	3 /* @UNSAFE: whole file */
5ac361acb316 Marked all non-trivial buffer modifications with @UNSAFE tag. Several Timo Sirainen <tss@iki.fi> parents: 781 diff changeset	4
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	5 #include "lib.h"
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	6 #include "istream-internal.h"
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	7 #include "network.h"
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	8
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	9 #include <time.h>
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	10 #include <unistd.h>
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	11 #include <sys/stat.h>
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	12
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	13 #define I_STREAM_MIN_SIZE 4096
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	14
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 805 diff changeset	15 struct file_istream {
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 805 diff changeset	16 struct _istream istream;
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	17
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	18 size_t max_buffer_size;
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	19 uoff_t skip_left;
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	20
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	21 unsigned int file:1;
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	22 unsigned int autoclose_fd:1;
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 805 diff changeset	23 };
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	24
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 805 diff changeset	25 static void _close(struct _iostream *stream)
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	26 {
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 805 diff changeset	27 struct file_istream fstream = (struct file_istream ) stream;
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 805 diff changeset	28 struct _istream _stream = (struct _istream ) stream;
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	29
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	30 if (fstream->autoclose_fd && _stream->fd != -1) {
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	31 if (close(_stream->fd) < 0)
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 805 diff changeset	32 i_error("file_istream.close() failed: %m");
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	33 _stream->fd = -1;
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	34 }
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	35 }
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	36
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 805 diff changeset	37 static void _destroy(struct _iostream *stream)
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	38 {
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 805 diff changeset	39 struct _istream _stream = (struct _istream ) stream;
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	40
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	41 p_free(_stream->iostream.pool, _stream->w_buffer);
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	42 }
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	43
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 805 diff changeset	44 static void _set_max_buffer_size(struct _iostream *stream, size_t max_size)
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	45 {
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 805 diff changeset	46 struct file_istream fstream = (struct file_istream ) stream;
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	47
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	48 fstream->max_buffer_size = max_size;
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	49 }
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	50
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 805 diff changeset	51 static void i_stream_grow_buffer(struct _istream *stream, size_t bytes)
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	52 {
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 805 diff changeset	53 struct file_istream fstream = (struct file_istream ) stream;
941 4d6b69558add Added old_size parameter to p_realloc() - we rarely need it and this way Timo Sirainen <tss@iki.fi> parents: 918 diff changeset	54 size_t old_size;
4d6b69558add Added old_size parameter to p_realloc() - we rarely need it and this way Timo Sirainen <tss@iki.fi> parents: 918 diff changeset	55
4d6b69558add Added old_size parameter to p_realloc() - we rarely need it and this way Timo Sirainen <tss@iki.fi> parents: 918 diff changeset	56 old_size = stream->buffer_size;
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	57
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	58 stream->buffer_size = stream->pos + bytes;
941 4d6b69558add Added old_size parameter to p_realloc() - we rarely need it and this way Timo Sirainen <tss@iki.fi> parents: 918 diff changeset	59 if (stream->buffer_size <= I_STREAM_MIN_SIZE)
4d6b69558add Added old_size parameter to p_realloc() - we rarely need it and this way Timo Sirainen <tss@iki.fi> parents: 918 diff changeset	60 stream->buffer_size = I_STREAM_MIN_SIZE;
3234 06f9da4ff7a5 Added pool_get_exp_grown_size(). Use it for buffers, istreams and ostreams Timo Sirainen <tss@iki.fi> parents: 2463 diff changeset	61 else {
06f9da4ff7a5 Added pool_get_exp_grown_size(). Use it for buffers, istreams and ostreams Timo Sirainen <tss@iki.fi> parents: 2463 diff changeset	62 stream->buffer_size =
06f9da4ff7a5 Added pool_get_exp_grown_size(). Use it for buffers, istreams and ostreams Timo Sirainen <tss@iki.fi> parents: 2463 diff changeset	63 pool_get_exp_grown_size(stream->iostream.pool,
06f9da4ff7a5 Added pool_get_exp_grown_size(). Use it for buffers, istreams and ostreams Timo Sirainen <tss@iki.fi> parents: 2463 diff changeset	64 old_size, stream->buffer_size);
06f9da4ff7a5 Added pool_get_exp_grown_size(). Use it for buffers, istreams and ostreams Timo Sirainen <tss@iki.fi> parents: 2463 diff changeset	65 }
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	66
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	67 if (fstream->max_buffer_size > 0 &&
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	68 stream->buffer_size > fstream->max_buffer_size)
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	69 stream->buffer_size = fstream->max_buffer_size;
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	70
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	71 stream->buffer = stream->w_buffer =
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	72 p_realloc(stream->iostream.pool, stream->w_buffer,
941 4d6b69558add Added old_size parameter to p_realloc() - we rarely need it and this way Timo Sirainen <tss@iki.fi> parents: 918 diff changeset	73 old_size, stream->buffer_size);
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	74 }
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	75
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 805 diff changeset	76 static void i_stream_compress(struct _istream *stream)
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	77 {
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	78 memmove(stream->w_buffer, stream->w_buffer + stream->skip,
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	79 stream->pos - stream->skip);
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	80 stream->pos -= stream->skip;
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	81
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	82 stream->skip = 0;
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	83 }
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	84
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 805 diff changeset	85 static ssize_t _read(struct _istream *stream)
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	86 {
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 805 diff changeset	87 struct file_istream fstream = (struct file_istream ) stream;
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	88 size_t size;
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	89 ssize_t ret;
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	90
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	91 if (stream->istream.closed)
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	92 return -1;
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	93
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	94 stream->istream.stream_errno = 0;
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	95
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	96 if (stream->pos == stream->buffer_size) {
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	97 if (stream->skip > 0) {
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	98 /* remove the unused bytes from beginning of buffer */
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	99 i_stream_compress(stream);
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	100 } else if (fstream->max_buffer_size == 0 \|\|
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	101 stream->buffer_size < fstream->max_buffer_size) {
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	102 /* buffer is full - grow it */
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	103 i_stream_grow_buffer(stream, I_STREAM_MIN_SIZE);
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	104 }
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	105
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	106 if (stream->pos == stream->buffer_size)
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	107 return -2; /* buffer full */
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	108 }
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	109
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	110 size = stream->buffer_size - stream->pos;
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	111
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	112 ret = -1;
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	113
2421 d141e1bfdd63 We never do blocking reads/writes to network anymore. Changed imap and pop3 Timo Sirainen <tss@iki.fi> parents: 2160 diff changeset	114 if (fstream->file) {
2463 46765dafc6e7 _read() never returns 0 for files. Timo Sirainen <tss@iki.fi> parents: 2431 diff changeset	115 do {
46765dafc6e7 _read() never returns 0 for files. Timo Sirainen <tss@iki.fi> parents: 2431 diff changeset	116 ret = pread(stream->fd, stream->w_buffer + stream->pos,
46765dafc6e7 _read() never returns 0 for files. Timo Sirainen <tss@iki.fi> parents: 2431 diff changeset	117 size, stream->istream.v_offset +
46765dafc6e7 _read() never returns 0 for files. Timo Sirainen <tss@iki.fi> parents: 2431 diff changeset	118 (stream->pos - stream->skip));
46765dafc6e7 _read() never returns 0 for files. Timo Sirainen <tss@iki.fi> parents: 2431 diff changeset	119 } while (ret < 0 && errno == EINTR);
2421 d141e1bfdd63 We never do blocking reads/writes to network anymore. Changed imap and pop3 Timo Sirainen <tss@iki.fi> parents: 2160 diff changeset	120 } else {
d141e1bfdd63 We never do blocking reads/writes to network anymore. Changed imap and pop3 Timo Sirainen <tss@iki.fi> parents: 2160 diff changeset	121 ret = read(stream->fd, stream->w_buffer + stream->pos, size);
d141e1bfdd63 We never do blocking reads/writes to network anymore. Changed imap and pop3 Timo Sirainen <tss@iki.fi> parents: 2160 diff changeset	122 }
d141e1bfdd63 We never do blocking reads/writes to network anymore. Changed imap and pop3 Timo Sirainen <tss@iki.fi> parents: 2160 diff changeset	123 if (ret == 0) {
d141e1bfdd63 We never do blocking reads/writes to network anymore. Changed imap and pop3 Timo Sirainen <tss@iki.fi> parents: 2160 diff changeset	124 /* EOF */
2431 8e9d8cb1e674 Removed istream.disconnected, it's too much of a special case and the only Timo Sirainen <tss@iki.fi> parents: 2421 diff changeset	125 stream->istream.eof = TRUE;
2421 d141e1bfdd63 We never do blocking reads/writes to network anymore. Changed imap and pop3 Timo Sirainen <tss@iki.fi> parents: 2160 diff changeset	126 return -1;
d141e1bfdd63 We never do blocking reads/writes to network anymore. Changed imap and pop3 Timo Sirainen <tss@iki.fi> parents: 2160 diff changeset	127 }
d141e1bfdd63 We never do blocking reads/writes to network anymore. Changed imap and pop3 Timo Sirainen <tss@iki.fi> parents: 2160 diff changeset	128
d141e1bfdd63 We never do blocking reads/writes to network anymore. Changed imap and pop3 Timo Sirainen <tss@iki.fi> parents: 2160 diff changeset	129 if (ret < 0) {
d141e1bfdd63 We never do blocking reads/writes to network anymore. Changed imap and pop3 Timo Sirainen <tss@iki.fi> parents: 2160 diff changeset	130 if (errno == EINTR \|\| errno == EAGAIN)
d141e1bfdd63 We never do blocking reads/writes to network anymore. Changed imap and pop3 Timo Sirainen <tss@iki.fi> parents: 2160 diff changeset	131 ret = 0;
d141e1bfdd63 We never do blocking reads/writes to network anymore. Changed imap and pop3 Timo Sirainen <tss@iki.fi> parents: 2160 diff changeset	132 else {
2431 8e9d8cb1e674 Removed istream.disconnected, it's too much of a special case and the only Timo Sirainen <tss@iki.fi> parents: 2421 diff changeset	133 stream->istream.eof = TRUE;
2421 d141e1bfdd63 We never do blocking reads/writes to network anymore. Changed imap and pop3 Timo Sirainen <tss@iki.fi> parents: 2160 diff changeset	134 stream->istream.stream_errno = errno;
d141e1bfdd63 We never do blocking reads/writes to network anymore. Changed imap and pop3 Timo Sirainen <tss@iki.fi> parents: 2160 diff changeset	135 return -1;
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	136 }
2421 d141e1bfdd63 We never do blocking reads/writes to network anymore. Changed imap and pop3 Timo Sirainen <tss@iki.fi> parents: 2160 diff changeset	137 }
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	138
2421 d141e1bfdd63 We never do blocking reads/writes to network anymore. Changed imap and pop3 Timo Sirainen <tss@iki.fi> parents: 2160 diff changeset	139 if (ret > 0 && fstream->skip_left > 0) {
d141e1bfdd63 We never do blocking reads/writes to network anymore. Changed imap and pop3 Timo Sirainen <tss@iki.fi> parents: 2160 diff changeset	140 i_assert(!fstream->file);
d141e1bfdd63 We never do blocking reads/writes to network anymore. Changed imap and pop3 Timo Sirainen <tss@iki.fi> parents: 2160 diff changeset	141 i_assert(stream->skip == stream->pos);
1870 c972ea085643 istream rewrite. instead of directly setting any limits to stream, you now Timo Sirainen <tss@iki.fi> parents: 1861 diff changeset	142
2421 d141e1bfdd63 We never do blocking reads/writes to network anymore. Changed imap and pop3 Timo Sirainen <tss@iki.fi> parents: 2160 diff changeset	143 if (fstream->skip_left >= (size_t)ret) {
d141e1bfdd63 We never do blocking reads/writes to network anymore. Changed imap and pop3 Timo Sirainen <tss@iki.fi> parents: 2160 diff changeset	144 fstream->skip_left -= ret;
d141e1bfdd63 We never do blocking reads/writes to network anymore. Changed imap and pop3 Timo Sirainen <tss@iki.fi> parents: 2160 diff changeset	145 ret = 0;
d141e1bfdd63 We never do blocking reads/writes to network anymore. Changed imap and pop3 Timo Sirainen <tss@iki.fi> parents: 2160 diff changeset	146 } else {
d141e1bfdd63 We never do blocking reads/writes to network anymore. Changed imap and pop3 Timo Sirainen <tss@iki.fi> parents: 2160 diff changeset	147 ret -= fstream->skip_left;
d141e1bfdd63 We never do blocking reads/writes to network anymore. Changed imap and pop3 Timo Sirainen <tss@iki.fi> parents: 2160 diff changeset	148 stream->pos += fstream->skip_left;
d141e1bfdd63 We never do blocking reads/writes to network anymore. Changed imap and pop3 Timo Sirainen <tss@iki.fi> parents: 2160 diff changeset	149 stream->skip += fstream->skip_left;
d141e1bfdd63 We never do blocking reads/writes to network anymore. Changed imap and pop3 Timo Sirainen <tss@iki.fi> parents: 2160 diff changeset	150 fstream->skip_left = 0;
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	151 }
2421 d141e1bfdd63 We never do blocking reads/writes to network anymore. Changed imap and pop3 Timo Sirainen <tss@iki.fi> parents: 2160 diff changeset	152 }
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	153
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	154 stream->pos += ret;
2463 46765dafc6e7 _read() never returns 0 for files. Timo Sirainen <tss@iki.fi> parents: 2431 diff changeset	155 i_assert(ret != 0 \|\| !fstream->file);
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	156 return ret;
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	157 }
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	158
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 805 diff changeset	159 static void _seek(struct _istream *stream, uoff_t v_offset)
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	160 {
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 805 diff changeset	161 struct file_istream fstream = (struct file_istream ) stream;
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	162
3239 904a268921af Added seekable variable to struct istream. Timo Sirainen <tss@iki.fi> parents: 3234 diff changeset	163 if (!stream->istream.seekable) {
1870 c972ea085643 istream rewrite. instead of directly setting any limits to stream, you now Timo Sirainen <tss@iki.fi> parents: 1861 diff changeset	164 if (v_offset < stream->istream.v_offset) {
c972ea085643 istream rewrite. instead of directly setting any limits to stream, you now Timo Sirainen <tss@iki.fi> parents: 1861 diff changeset	165 stream->istream.stream_errno = ESPIPE;
c972ea085643 istream rewrite. instead of directly setting any limits to stream, you now Timo Sirainen <tss@iki.fi> parents: 1861 diff changeset	166 return;
c972ea085643 istream rewrite. instead of directly setting any limits to stream, you now Timo Sirainen <tss@iki.fi> parents: 1861 diff changeset	167 }
c972ea085643 istream rewrite. instead of directly setting any limits to stream, you now Timo Sirainen <tss@iki.fi> parents: 1861 diff changeset	168 fstream->skip_left += v_offset - stream->istream.v_offset;
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	169 }
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	170
1847 920307c42b17 Changed to use pread() with files. Timo Sirainen <tss@iki.fi> parents: 1741 diff changeset	171 stream->istream.stream_errno = 0;
920307c42b17 Changed to use pread() with files. Timo Sirainen <tss@iki.fi> parents: 1741 diff changeset	172 stream->istream.v_offset = v_offset;
920307c42b17 Changed to use pread() with files. Timo Sirainen <tss@iki.fi> parents: 1741 diff changeset	173 stream->skip = stream->pos = 0;
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	174 }
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	175
1870 c972ea085643 istream rewrite. instead of directly setting any limits to stream, you now Timo Sirainen <tss@iki.fi> parents: 1861 diff changeset	176 static uoff_t _get_size(struct _istream *stream)
c972ea085643 istream rewrite. instead of directly setting any limits to stream, you now Timo Sirainen <tss@iki.fi> parents: 1861 diff changeset	177 {
c972ea085643 istream rewrite. instead of directly setting any limits to stream, you now Timo Sirainen <tss@iki.fi> parents: 1861 diff changeset	178 struct file_istream fstream = (struct file_istream ) stream;
c972ea085643 istream rewrite. instead of directly setting any limits to stream, you now Timo Sirainen <tss@iki.fi> parents: 1861 diff changeset	179 struct stat st;
c972ea085643 istream rewrite. instead of directly setting any limits to stream, you now Timo Sirainen <tss@iki.fi> parents: 1861 diff changeset	180
c972ea085643 istream rewrite. instead of directly setting any limits to stream, you now Timo Sirainen <tss@iki.fi> parents: 1861 diff changeset	181 if (fstream->file && fstat(stream->fd, &st) == 0 && S_ISREG(st.st_mode))
c972ea085643 istream rewrite. instead of directly setting any limits to stream, you now Timo Sirainen <tss@iki.fi> parents: 1861 diff changeset	182 return (uoff_t)st.st_size;
c972ea085643 istream rewrite. instead of directly setting any limits to stream, you now Timo Sirainen <tss@iki.fi> parents: 1861 diff changeset	183 else
c972ea085643 istream rewrite. instead of directly setting any limits to stream, you now Timo Sirainen <tss@iki.fi> parents: 1861 diff changeset	184 return (uoff_t)-1;
c972ea085643 istream rewrite. instead of directly setting any limits to stream, you now Timo Sirainen <tss@iki.fi> parents: 1861 diff changeset	185 }
c972ea085643 istream rewrite. instead of directly setting any limits to stream, you now Timo Sirainen <tss@iki.fi> parents: 1861 diff changeset	186
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 805 diff changeset	187 struct istream *i_stream_create_file(int fd, pool_t pool,
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 805 diff changeset	188 size_t max_buffer_size, int autoclose_fd)
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	189 {
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 805 diff changeset	190 struct file_istream *fstream;
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	191 struct stat st;
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	192
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 805 diff changeset	193 fstream = p_new(pool, struct file_istream, 1);
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	194 fstream->max_buffer_size = max_buffer_size;
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	195 fstream->autoclose_fd = autoclose_fd;
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	196
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	197 fstream->istream.iostream.close = _close;
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	198 fstream->istream.iostream.destroy = _destroy;
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	199 fstream->istream.iostream.set_max_buffer_size = _set_max_buffer_size;
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	200
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	201 fstream->istream.read = _read;
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	202 fstream->istream.seek = _seek;
1870 c972ea085643 istream rewrite. instead of directly setting any limits to stream, you now Timo Sirainen <tss@iki.fi> parents: 1861 diff changeset	203 fstream->istream.get_size = _get_size;
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	204
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	205 /* get size of fd if it's a file */
3239 904a268921af Added seekable variable to struct istream. Timo Sirainen <tss@iki.fi> parents: 3234 diff changeset	206 if (fstat(fd, &st) == 0 && S_ISREG(st.st_mode)) {
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	207 fstream->file = TRUE;
3239 904a268921af Added seekable variable to struct istream. Timo Sirainen <tss@iki.fi> parents: 3234 diff changeset	208 fstream->istream.istream.seekable = TRUE;
904a268921af Added seekable variable to struct istream. Timo Sirainen <tss@iki.fi> parents: 3234 diff changeset	209 }
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	210
1870 c972ea085643 istream rewrite. instead of directly setting any limits to stream, you now Timo Sirainen <tss@iki.fi> parents: 1861 diff changeset	211 return _i_stream_create(&fstream->istream, pool, fd, 0);
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: diff changeset	212 }

Mercurial > dovecot > original-hg > dovecot-1.2

annotate src/lib/istream-file.c @ 3239:904a268921af HEAD