diff options
author | Alain Magloire <alainm@gnu.org> | 2001-10-24 02:17:28 +0000 |
---|---|---|
committer | Alain Magloire <alainm@gnu.org> | 2001-10-24 02:17:28 +0000 |
commit | b845fd2c1d962390dbe0ae9241a2322dc29ce0f7 (patch) | |
tree | 3a4d6df296334adf5611978a41b07854ed39d320 /mailbox2 | |
parent | e9091575bd3e0f00baba74a1e9aa1d2afdd3e32b (diff) | |
download | mailutils-b845fd2c1d962390dbe0ae9241a2322dc29ce0f7.tar.gz mailutils-b845fd2c1d962390dbe0ae9241a2322dc29ce0f7.tar.bz2 |
* mailbox/body.c: body_lines () nd body_size () were not
properly overriden given the wrong size and line number, fixed.
* mailbox/mbx_imap.c (mailbox_imap_close): Not to send another SELECT
but rather just close the mailbox if not selected.
(imap_scan0): If there is no messages in the mailbox no need to
send the FETCH 1:*.
* mailbox/message.c (message_is_modified): Protect against null
pointer.
* TODO: Some stuff todo 8).
Diffstat (limited to 'mailbox2')
-rw-r--r-- | mailbox2/include/mailutils/sys/pop3.h | 5 | ||||
-rw-r--r-- | mailbox2/pop3/pop3_readline.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/mailbox2/include/mailutils/sys/pop3.h b/mailbox2/include/mailutils/sys/pop3.h index 7a1f752f4..7011f570b 100644 --- a/mailbox2/include/mailutils/sys/pop3.h +++ b/mailbox2/include/mailutils/sys/pop3.h @@ -78,16 +78,18 @@ struct work_buf char *ptr; char *nl; size_t len; + off_t offset; /* To synchronise with the buffering. */ }; /* Structure to hold things general to POP3 mailbox, like its state, etc ... */ struct _pop3 { - /* Working I/O buffers. */ + /* Working I/O buffer. */ /* io.buf: Working io buffer. */ /* io.ptr: Points to the end of the buffer, the non consume chars. */ /* io.nl: Points to the '\n' char in the string. */ /* io.len: Len of io_buf. */ + /* io.offset; full the stream_t implementation. */ struct work_buf io; /* Holds the first line response of the last command, i.e the ACK. */ @@ -102,7 +104,6 @@ struct _pop3 enum pop3_state state; stream_t carrier; /* TCP Connection. */ - off_t offset; /* To synchronise with the buffering. */ mu_debug_t debug; /* Send the debug info. */ }; diff --git a/mailbox2/pop3/pop3_readline.c b/mailbox2/pop3/pop3_readline.c index f4d87682f..97dc84194 100644 --- a/mailbox2/pop3/pop3_readline.c +++ b/mailbox2/pop3/pop3_readline.c @@ -50,10 +50,10 @@ pop3_getline (pop3_t pop3) } status = stream_readline (pop3->carrier, pop3->io.buf + total, - pop3->io.len - total, pop3->offset, &n); + pop3->io.len - total, pop3->io.offset, &n); if (status != 0) return status; - pop3->offset += n; + pop3->io.offset += n; /* The server went away: It maybe a timeout and some pop server does not send the -ERR. Consider this like an error. */ |