Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 3bf76047 3bf7604700d714f19863ca00c757baa1ade016b9 by Sergey Poznyakoff
Options

imap4d: bugfix 

* NEWS: Version 2.99.91
* configure.ac: Likewise.
* imap4d/imap4d.h (io_getline): Change return value
* imap4d/io.c (io_getline): Abort if a read error occurs.
1 parent 79cbad0d
Inline Side-by-side
Showing 4 changed files with 10 additions and 6 deletions
1 GNU mailutils NEWS -- history of user-visible changes. 2011-03-30 1 GNU mailutils NEWS -- history of user-visible changes. 2011-06-08
2 Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 2 Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
3 Free Software Foundation, Inc. 3 Free Software Foundation, Inc.
4 See the end of file for copying conditions. 4 See the end of file for copying conditions.
...@@ -6,7 +6,7 @@ See the end of file for copying conditions. ...@@ -6,7 +6,7 @@ See the end of file for copying conditions.
6 Please send mailutils bug reports to <bug-mailutils@gnu.org>. 6 Please send mailutils bug reports to <bug-mailutils@gnu.org>.
7 7
8 8
9 Version 2.99.90 (Git) 9 Version 2.99.91 (Git)
10 10
11 This version is highly experimental. It features a rewrite from 11 This version is highly experimental. It features a rewrite from
12 scratch of the stream subsystem and other vital parts of the 12 scratch of the stream subsystem and other vital parts of the
......
...@@ -17,7 +17,7 @@ dnl You should have received a copy of the GNU General Public License along ...@@ -17,7 +17,7 @@ dnl You should have received a copy of the GNU General Public License along
17 dnl with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>. 17 dnl with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
18 18
19 AC_PREREQ(2.63) 19 AC_PREREQ(2.63)
20 AC_INIT([GNU Mailutils], [2.99.90], [bug-mailutils@gnu.org], [mailutils]) 20 AC_INIT([GNU Mailutils], [2.99.91], [bug-mailutils@gnu.org], [mailutils])
21 AC_CONFIG_SRCDIR([libmailutils/mailbox/mailbox.c]) 21 AC_CONFIG_SRCDIR([libmailutils/mailbox/mailbox.c])
22 AC_CONFIG_AUX_DIR([build-aux]) 22 AC_CONFIG_AUX_DIR([build-aux])
23 AM_INIT_AUTOMAKE([gnits 1.11 dist-bzip2 dist-xz std-options silent-rules]) 23 AM_INIT_AUTOMAKE([gnits 1.11 dist-bzip2 dist-xz std-options silent-rules])
......
...@@ -219,7 +219,7 @@ extern int io_stream_completion_response (mu_stream_t str, ...@@ -219,7 +219,7 @@ extern int io_stream_completion_response (mu_stream_t str,
219 int rc, 219 int rc,
220 const char *format, ...) 220 const char *format, ...)
221 MU_PRINTFLIKE(4,5); 221 MU_PRINTFLIKE(4,5);
222 int io_getline (char **pbuf, size_t *psize, size_t *pnbytes); 222 void io_getline (char **pbuf, size_t *psize, size_t *pnbytes);
223 void io_setio (int, int); 223 void io_setio (int, int);
224 void io_flush (void); 224 void io_flush (void);
225 int io_wait_input (int); 225 int io_wait_input (int);
......
...@@ -305,7 +305,7 @@ util_is_master () ...@@ -305,7 +305,7 @@ util_is_master ()
305 return iostream == NULL; 305 return iostream == NULL;
306 } 306 }
307 307
308 int 308 void
309 io_getline (char **pbuf, size_t *psize, size_t *pnbytes) 309 io_getline (char **pbuf, size_t *psize, size_t *pnbytes)
310 { 310 {
311 size_t len; 311 size_t len;
...@@ -323,7 +323,11 @@ io_getline (char **pbuf, size_t *psize, size_t *pnbytes) ...@@ -323,7 +323,11 @@ io_getline (char **pbuf, size_t *psize, size_t *pnbytes)
323 if (pnbytes) 323 if (pnbytes)
324 *pnbytes = len; 324 *pnbytes = len;
325 } 325 }
326 return rc; 326 else
327 {
328 mu_error (_("read error: %s"), mu_strerror (rc));
329 imap4d_bye (ERR_NO_IFILE);
330 }
327 } 331 }
328 332
329 333
......