[SCM] GNU Mailutils branch, master, updated. release-2.2-685-g8e1f5a5

[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=8e1f5a53201184ff42348f9d4cf230f765d1441d

The branch, master has been updated
       via  8e1f5a53201184ff42348f9d4cf230f765d1441d (commit)
       via  e1e999ded50db980bf844c479c9fc150e0ed3e5d (commit)
      from  2357bd10a05ad5161919b8b06856b1a4d11ea777 (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 8e1f5a53201184ff42348f9d4cf230f765d1441d
Author: Sergey Poznyakoff <address@hidden>
Date:   Thu Jul 17 15:27:09 2014 +0300

    Bugfixes.
    
    * examples/echosrv.c: Fix typo.
    * libmailutils/sockaddr/url.c: Likewise.
    * mh/mhn.c: Likewise.
    * mh/folder.c (roll_back): Fix conditional.
    * THANKS: Update.

commit e1e999ded50db980bf844c479c9fc150e0ed3e5d
Author: Sergey Poznyakoff <address@hidden>
Date:   Thu Jul 17 15:25:06 2014 +0300

    Bugfix.
    
    * libmailutils/filter/iconvflt.c: Fix silly errors.

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

Summary of changes:
 THANKS                         |    1 +
 examples/echosrv.c             |    2 +-
 libmailutils/filter/iconvflt.c |   12 ++++++------
 libmailutils/sockaddr/url.c    |    2 +-
 mh/folder.c                    |    5 +++--
 mh/mhn.c                       |    2 +-
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/THANKS b/THANKS
index f00b2a8..8153e27 100644
--- a/THANKS
+++ b/THANKS
@@ -21,6 +21,7 @@ Jordi Mallach        <address@hidden>
 Kidong Lee           <address@hidden>
 Kostas Zorbadelos    <address@hidden>
 Matthew Whitworth    <address@hidden>
+maks                 <address@hidden>
 Neil R. Ormos        <address@hidden>
 Olivier Bornet       <address@hidden>
 Robby Villegas       <address@hidden>
diff --git a/examples/echosrv.c b/examples/echosrv.c
index 76d6e5b..cfb7a17 100644
--- a/examples/echosrv.c
+++ b/examples/echosrv.c
@@ -140,7 +140,7 @@ create_server (char *arg)
       exit (1);
     }
 
-  memset (&hints, sizeof(hints), 0);
+  memset (&hints, 0, sizeof(hints));
   hints.flags = MU_AH_PASSIVE;
   hints.socktype = SOCK_STREAM;
   hints.protocol = IPPROTO_TCP;
diff --git a/libmailutils/filter/iconvflt.c b/libmailutils/filter/iconvflt.c
index 1d0f3db..07d3fcb 100644
--- a/libmailutils/filter/iconvflt.c
+++ b/libmailutils/filter/iconvflt.c
@@ -80,12 +80,12 @@ static void
 format_octal (char *op, unsigned char n)
 {
   op += 4;
-  *--op = n % 8;
-  n >> 3;
-  *--op = n % 8;
-  n >> 3;
-  *--op = n % 8;
-  n >> 3;
+  *--op = n % 8 + '0';
+  n >>= 3;
+  *--op = n % 8 + '0';
+  n >>= 3;
+  *--op = n % 8 + '0';
+  n >>= 3;
   *--op = '\\';
 }
 
diff --git a/libmailutils/sockaddr/url.c b/libmailutils/sockaddr/url.c
index 08e37df..baa8347 100644
--- a/libmailutils/sockaddr/url.c
+++ b/libmailutils/sockaddr/url.c
@@ -62,7 +62,7 @@ mu_sockaddr_from_url (struct mu_sockaddr **retval, mu_url_t 
url,
     memcpy (&hints, mh, sizeof (hints));
   else
     {
-      memset (&hints, sizeof(hints), 0);
+      memset (&hints, 0, sizeof(hints));
       hints.family = AF_UNSPEC;
       hints.socktype = SOCK_STREAM;
       hints.protocol = IPPROTO_TCP;
diff --git a/mh/folder.c b/mh/folder.c
index 0810a29..acaba97 100644
--- a/mh/folder.c
+++ b/mh/folder.c
@@ -720,9 +720,9 @@ roll_back (const char *folder_name, struct pack_tab 
*pack_tab, size_t i)
   if (i == 0)
     return;
   
-  start = i - 1;
+  start = --i;
   mu_error (_("rolling back changes..."));
-  while (--i >= 0)
+  do
     if (pack_rename (pack_tab + i, 1))
       {
        mu_error (_("CRITICAL ERROR: Folder `%s' left in an inconsistent state, 
because an error\n"
@@ -736,6 +736,7 @@ roll_back (const char *folder_name, struct pack_tab 
*pack_tab, size_t i)
        mu_error (_("You will have to fix it manually."));
        exit (1);
       }
+  while (i-- > 0);
   mu_error (_("folder `%s' restored successfully"), folder_name);
 }
 
diff --git a/mh/mhn.c b/mh/mhn.c
index d307b23..5714030 100644
--- a/mh/mhn.c
+++ b/mh/mhn.c
@@ -2808,7 +2808,7 @@ mhn_header (mu_message_t msg, mu_message_t omsg)
                mu_message_get_part (omsg, 1, &part);
              else
                part = omsg;
-             if (part);
+             if (part)
                {
                  mu_header_t parthdr = NULL;
                  char *typestr, *typeargs;


hooks/post-receive
-- 
GNU Mailutils