[SCM] GNU Mailutils branch, master, updated. release-2.2-678-gfc68d02

[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=fc68d026ebb7685c6d6d7fd5f7675fcc0aba8c05

The branch, master has been updated
       via  fc68d026ebb7685c6d6d7fd5f7675fcc0aba8c05 (commit)
      from  8ad65f75903bd0cd024baab2aea20cf0fdba93bd (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 fc68d026ebb7685c6d6d7fd5f7675fcc0aba8c05
Author: Damien Diederen <address@hidden>
Date:   Sun Jun 8 11:32:15 2014 +0200

    maildir: Keep trailing comma even when no flags are set
    
    Without this, `mk_info_filename' generates filenames of the following
    form when the flag set is empty:
    
        1402217787.M664911P5957Q143.hostname:2
    
    The original Maildir spec (http://cr.yp.to/proto/maildir.html),
    however, mandates that filenames must be of the form `uniq:info', with
    `info' starting with "2,"--including a comma.
    
    This patch removes the "cleanup" performed by `mk_info_filename' as
    that there is no rationale for it in mailutils' source code history,
    and as it breaks Gnus' "nnmaildir" backend (Cf.  `nnmaildir--add-flag').
    
    * libproto/maildir/mbox.c (mk_info_filename): Keep comma at the end of
    filename when the flags suffix is empty.

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

Summary of changes:
 libproto/maildir/mbox.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/libproto/maildir/mbox.c b/libproto/maildir/mbox.c
index 3cddb6f..9773143 100644
--- a/libproto/maildir/mbox.c
+++ b/libproto/maildir/mbox.c
@@ -278,10 +278,7 @@ mk_info_filename (char *directory, char *suffix, char 
*name, int flags)
   size += 3 + strlen (fbuf);
 
   tmp = malloc (size);
-  if (!fbuf[0])
-    sprintf (tmp, "%s/%s/%*.*s:2", directory, suffix, namelen, namelen, name);
-  else
-    sprintf (tmp, "%s/%s/%*.*s:2,%s", directory, suffix, namelen, namelen, 
name, fbuf);
+  sprintf (tmp, "%s/%s/%*.*s:2,%s", directory, suffix, namelen, namelen, name, 
fbuf);
   return tmp;
 }
 


hooks/post-receive
-- 
GNU Mailutils