[SCM] GNU Mailutils branch, master, updated. release-2.2-369-g3bf7604

[Sergey Poznyakoff]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=3bf7604700d714f19863ca00c757baa1ade016b9

The branch, master has been updated
       via  3bf7604700d714f19863ca00c757baa1ade016b9 (commit)
      from  79cbad0dff9d90f4b79fc09f2c5793ed28531608 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3bf7604700d714f19863ca00c757baa1ade016b9
Author: Sergey Poznyakoff <address@hidden>
Date:   Mon Jun 20 12:10:36 2011 +0300

    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.

-----------------------------------------------------------------------

Summary of changes:
 NEWS            |    4 ++--
 configure.ac    |    2 +-
 imap4d/imap4d.h |    2 +-
 imap4d/io.c     |    8 ++++++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index d6a79c1..cb48dc0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-GNU mailutils NEWS -- history of user-visible changes. 2011-03-30
+GNU mailutils NEWS -- history of user-visible changes. 2011-06-08
 Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 Free Software Foundation, Inc.
 See the end of file for copying conditions.
@@ -6,7 +6,7 @@ See the end of file for copying conditions.
 Please send mailutils bug reports to <address@hidden>.
 
 
-Version 2.99.90 (Git)
+Version 2.99.91 (Git)
 
 This version is highly experimental.  It features a rewrite from
 scratch of the stream subsystem and other vital parts of the
diff --git a/configure.ac b/configure.ac
index cf13845..59a99af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ dnl You should have received a copy of the GNU General Public 
License along
 dnl with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.63)
-AC_INIT([GNU Mailutils], [2.99.90], address@hidden, [mailutils])
+AC_INIT([GNU Mailutils], [2.99.91], address@hidden, [mailutils])
 AC_CONFIG_SRCDIR([libmailutils/mailbox/mailbox.c])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([gnits 1.11 dist-bzip2 dist-xz std-options silent-rules])
diff --git a/imap4d/imap4d.h b/imap4d/imap4d.h
index 592d812..8d6170b 100644
--- a/imap4d/imap4d.h
+++ b/imap4d/imap4d.h
@@ -219,7 +219,7 @@ extern int io_stream_completion_response (mu_stream_t str,
                                          int rc, 
                                          const char *format, ...)
                                     MU_PRINTFLIKE(4,5);
-int io_getline (char **pbuf, size_t *psize, size_t *pnbytes);
+void io_getline (char **pbuf, size_t *psize, size_t *pnbytes);
 void io_setio (int, int);
 void io_flush (void);
 int io_wait_input (int);
diff --git a/imap4d/io.c b/imap4d/io.c
index 49e4f2f..3cfa373 100644
--- a/imap4d/io.c
+++ b/imap4d/io.c
@@ -305,7 +305,7 @@ util_is_master ()
   return iostream == NULL;
 }
 
-int
+void
 io_getline (char **pbuf, size_t *psize, size_t *pnbytes)
 {
   size_t len;
@@ -323,7 +323,11 @@ io_getline (char **pbuf, size_t *psize, size_t *pnbytes)
       if (pnbytes)
        *pnbytes = len;
     }
-  return rc;
+  else
+    {
+      mu_error (_("read error: %s"), mu_strerror (rc));
+      imap4d_bye (ERR_NO_IFILE);
+    }
 }
 
 


hooks/post-receive
-- 
GNU Mailutils