[SCM] GNU Mailutils branch, master, updated. release-3.1.1-19-geae4189

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

The branch, master has been updated
       via  eae41894c2614ddc2c3732014cb62bf68ab4e16a (commit)
       via  7dee238ebdc9bd8ec5e67dd995b916399a2122b1 (commit)
      from  622bc770d5f8d7500fa409993c8fef8de5736962 (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 eae41894c2614ddc2c3732014cb62bf68ab4e16a
Author: Sergey Poznyakoff <address@hidden>
Date:   Wed Dec 28 15:08:28 2016 +0200

    Fix parsing of Content-Type and Content-Disposition headers
    
    Correctly handle character set and language info embedded in
    parameter values, and eventual parameter value continuations
    as per RFC 2231, Section 3.
    
    * include/mailutils/assoc.h (mu_assoc_is_empty): New proto.
    * libmailutils/base/assoc.c (mu_assoc_is_empty): New function.
    
    * include/mailutils/mime.h (mu_mime_header_parse): Output charset is
    char const *.
    * libmailutils/mime/mimehdr.c (mu_mime_header_parse): Likewise.
    
    * include/mailutils/util.h (mu_content_type) <param>: Change type to
    mu_assoc_t
    (mu_param): Remove structure declaration.
    (mu_content_type_parse): Take an optional output charset.
    * libmailutils/base/ctparse.c (mu_content_type_parse): Rewrite using
    mu_mime_header_parse.
    
    * imap4d/fetch.c (send_parameter_list):  Rewrite using mu_mime_header_parse.
    (format_param): Use base64 for parameter values with explicit charsets.
    
    * libmailutils/tests/conttype.c: Reflect the changes to struct
    mu_content_type

commit 7dee238ebdc9bd8ec5e67dd995b916399a2122b1
Author: Sergey Poznyakoff <address@hidden>
Date:   Wed Dec 28 12:34:03 2016 +0200

    Implement mu_assoc_foreach function
    
    * include/mailutils/assoc.h (mu_assoc_action_t): New typedef.
    (mu_assoc_foreach): New function.
    * libmailutils/base/assoc.c (mu_assoc_foreach): New function.

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

Summary of changes:
 imap4d/fetch.c                |  140 +++++++++++----------------
 include/mailutils/assoc.h     |    4 +
 include/mailutils/mime.h      |    2 +-
 include/mailutils/util.h      |   11 +--
 libmailutils/base/assoc.c     |   36 ++++++-
 libmailutils/base/ctparse.c   |  210 +++++++----------------------------------
 libmailutils/mime/mimehdr.c   |    2 +-
 libmailutils/tests/conttype.c |   12 +--
 8 files changed, 139 insertions(+), 278 deletions(-)

diff --git a/imap4d/fetch.c b/imap4d/fetch.c
index ac3fa71..d5d2bfb 100644
--- a/imap4d/fetch.c
+++ b/imap4d/fetch.c
@@ -17,7 +17,7 @@
 
 #include "imap4d.h"
 #include <ctype.h>
-#include <mailutils/argcv.h>
+#include <mailutils/assoc.h>
 
 /*  Taken from RFC2060
     fetch           ::= "FETCH" SPACE set SPACE ("ALL" / "FULL" /
@@ -164,95 +164,47 @@ fetch_send_header_address (mu_header_t header, const char 
*name,
     fetch_send_address (defval);
 }
 
-static void
-imap4d_ws_alloc_die (struct mu_wordsplit *wsp)
-{
-  imap4d_bye (ERR_NO_MEM);
-}
-
-#define IMAP4D_WS_FLAGS \
-  (MU_WRDSF_DEFFLAGS | MU_WRDSF_DELIM | \
-   MU_WRDSF_ENOMEMABRT | MU_WRDSF_ALLOC_DIE)
+static int format_param (char const *name, void *item, void *data);
 
 /* Send parameter list for the bodystructure.  */
 static void
 send_parameter_list (const char *buffer)
 {
-  struct mu_wordsplit ws;
+  int rc;
+  char *value;
+  mu_assoc_t param;
   
-  if (!buffer)
+  if (!buffer || mu_str_skip_class (buffer, MU_CTYPE_BLANK)[0] == 0)
     {
       io_sendf ("NIL");
       return;
     }
-
-  ws.ws_delim = " \t\r\n;=";
-  ws.ws_alloc_die = imap4d_ws_alloc_die;
-  if (mu_wordsplit (buffer, &ws, IMAP4D_WS_FLAGS))
+  
+  rc = mu_mime_header_parse (buffer, NULL, &value, &param);
+  if (rc)
     {
-      mu_error (_("%s failed: %s"), "mu_wordsplit",
-               mu_wordsplit_strerror (&ws));
-      return; /* FIXME: a better error handling, maybe? */
+      mu_diag_funcall (MU_DIAG_ERROR, "mu_content_type_parse", buffer, rc);
+      io_sendf ("NIL");
+      return;
     }
   
-  if (ws.ws_wordc == 0)
-    io_sendf ("NIL");
+  io_sendf ("(");
+  io_send_qstring (value);
+  io_sendf (" ");
+  if (mu_assoc_is_empty (param))
+    {
+      io_sendf ("NIL");
+    }
   else
     {
-      char *p;
-      
+      int first = 1;
       io_sendf ("(");
-        
-      p = ws.ws_wordv[0];
-      io_send_qstring (p);
-
-      if (ws.ws_wordc > 1)
-       {
-         int i, space = 0;
-         char *lvalue = NULL;
-
-         io_sendf ("(");
-         for (i = 1; i < ws.ws_wordc; i++)
-           {
-             if (lvalue)
-               {
-                 if (space)
-                   io_sendf (" ");
-                 io_send_qstring (lvalue);
-                 lvalue = NULL;
-                 space = 1;
-               }
-             
-             switch (ws.ws_wordv[i][0])
-               {
-               case ';':
-                 continue;
-                 
-               case '=':
-                 if (++i < ws.ws_wordc)
-                   {
-                     io_sendf (" ");
-                     io_send_qstring (ws.ws_wordv[i]);
-                   }
-                 break;
-                 
-               default:
-                 lvalue = ws.ws_wordv[i];
-               }
-           }
-         if (lvalue)
-           {
-             if (space)
-               io_sendf (" ");
-             io_send_qstring (lvalue);
-           }
-         io_sendf (")");
-       }
-      else
-       io_sendf (" NIL");
+      mu_assoc_foreach (param, format_param, &first);
       io_sendf (")");
     }
-  mu_wordsplit_free (&ws);
+  io_sendf (")");
+  free (value);
+  mu_assoc_destroy (&param);
 }
 
 static void
@@ -263,7 +215,7 @@ fetch_send_header_list (mu_header_t header, const char 
*name,
   
   if (space)
     io_sendf (" ");
-  if (mu_header_aget_value (header, name, &buffer) == 0)
+  if (mu_header_aget_value_unfold (header, name, &buffer) == 0)
     {
       send_parameter_list (buffer);
       free (buffer);
@@ -315,16 +267,32 @@ fetch_envelope0 (mu_message_t msg)
 static int fetch_bodystructure0 (mu_message_t message, int extension);
 
 static int
-format_param (void *item, void *data)
+format_param (char const *name, void *item, void *data)
 {
-  struct mu_param *p = item;
+  struct mu_mime_param *p = item;
   int *first = data;
 
   if (!*first)
     io_sendf (" ");
-  io_send_qstring (p->name);
+  io_send_qstring (name);
   io_sendf (" ");
-  io_send_qstring (p->value);
+  if (p->cset)
+    {
+      char *text;
+      int rc = mu_rfc2047_encode (p->cset, "base64", p->value, &text);
+      if (rc == 0)
+       {
+         io_send_qstring (text);
+         free (text);
+       }
+      else
+       {
+         mu_diag_funcall (MU_DIAG_ERROR, "mu_rfc2047_encode", p->value, rc);
+         io_send_qstring (p->value);
+       }
+    }
+  else 
+    io_send_qstring (p->value);
   *first = 0;
   return 0;
 }
@@ -338,19 +306,19 @@ get_content_type (mu_header_t hdr, mu_content_type_t 
*ctp, char const *dfl)
   rc = mu_header_aget_value_unfold (hdr, MU_HEADER_CONTENT_TYPE, &buffer);
   if (rc == 0)
     {
-      rc = mu_content_type_parse (buffer, ctp);
+      rc = mu_content_type_parse (buffer, NULL, ctp);
       if (rc == MU_ERR_PARSE)
        {
          mu_error (_("malformed content type: %s"), buffer);
          if (dfl)
-           rc = mu_content_type_parse (dfl, ctp);
+           rc = mu_content_type_parse (dfl, NULL, ctp);
        }
       else if (rc)
        mu_diag_funcall (MU_DIAG_ERROR, "mu_content_type_parse", buffer, rc);
       free (buffer);
     }
   else if (rc == MU_ERR_NOENT && dfl)
-    rc = mu_content_type_parse (dfl, ctp);
+    rc = mu_content_type_parse (dfl, NULL, ctp);
   return rc;
 }
 
@@ -424,13 +392,13 @@ bodystructure (mu_message_t msg, int extension)
       io_send_qstring (ct->subtype);
 
       /* body parameter parenthesized list: Content-type attributes */
-      if (mu_list_is_empty (ct->param))
+      if (mu_assoc_is_empty (ct->param))
        io_sendf (" NIL");
       else
        {
          int first = 1;
          io_sendf (" (");
-         mu_list_foreach (ct->param, format_param, &first);
+         mu_assoc_foreach (ct->param, format_param, &first);
          io_sendf (")");
        }
       mu_content_type_destroy (&ct);
@@ -557,11 +525,11 @@ fetch_bodystructure0 (mu_message_t message, int extension)
          io_send_qstring (ct->subtype);
 
          /* The extension data for multipart. */
-         if (extension && !mu_list_is_empty (ct->param))
+         if (extension && !mu_assoc_is_empty (ct->param))
            {
              int first = 1;
              io_sendf (" (");
-             mu_list_foreach (ct->param, format_param, &first);
+             mu_assoc_foreach (ct->param, format_param, &first);
              io_sendf (")");
            }
          else
@@ -581,8 +549,8 @@ fetch_bodystructure0 (mu_message_t message, int extension)
       fetch_send_header_list (header, MU_HEADER_CONTENT_DISPOSITION,
                              NULL, 1);
       /* body language: Content-Language.  */
-      fetch_send_header_list (header, MU_HEADER_CONTENT_LANGUAGE,
-                             NULL, 1);
+      fetch_send_header_value (header, MU_HEADER_CONTENT_LANGUAGE,
+                              NULL, 1);
     }
   else
     bodystructure (message, extension);
diff --git a/include/mailutils/assoc.h b/include/mailutils/assoc.h
index dbf77f4..5db9f85 100644
--- a/include/mailutils/assoc.h
+++ b/include/mailutils/assoc.h
@@ -42,7 +42,11 @@ int mu_assoc_get_iterator (mu_assoc_t assoc, mu_iterator_t 
*piterator);
 int mu_assoc_remove (mu_assoc_t assoc, const char *name);  
 int mu_assoc_set_destroy_item (mu_assoc_t assoc, mu_deallocator_t fn);
 int mu_assoc_count (mu_assoc_t assoc, size_t *pcount);
+int mu_assoc_is_empty (mu_assoc_t assoc);
 
+typedef int (*mu_assoc_action_t) (char const *, void *, void *);
+int mu_assoc_foreach (mu_assoc_t assoc, mu_assoc_action_t action, void *data);
+  
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/mailutils/mime.h b/include/mailutils/mime.h
index 6799e43..6fb588d 100644
--- a/include/mailutils/mime.h
+++ b/include/mailutils/mime.h
@@ -70,7 +70,7 @@ int mu_base64_decode    (const unsigned char *input, size_t 
input_len,
 int mu_mime_param_assoc_create (mu_assoc_t *passoc);
 int mu_mime_param_assoc_add (mu_assoc_t assoc, const char *name);
   
-int mu_mime_header_parse (const char *text, char *charset, char **pvalue,
+int mu_mime_header_parse (const char *text, const char *charset, char **pvalue,
                          mu_assoc_t *paramtab);
 int mu_mime_header_parse_subset (const char *text, const char *charset,
                                 char **pvalue,
diff --git a/include/mailutils/util.h b/include/mailutils/util.h
index afec5ae..7821cb0 100644
--- a/include/mailutils/util.h
+++ b/include/mailutils/util.h
@@ -131,18 +131,13 @@ struct mu_content_type
   char *type;
   char *subtype;
   char *trailer;
-  mu_list_t param;
+  mu_assoc_t param;
 };
 
 typedef struct mu_content_type *mu_content_type_t;
-
-struct mu_param
-{
-  char *name;
-  char *value;
-};
   
-int mu_content_type_parse (const char *input, mu_content_type_t *retct);
+int mu_content_type_parse (const char *input, const char *charset,
+                          mu_content_type_t *retct);
 void mu_content_type_destroy (mu_content_type_t *pptr);
   
   /* ----------------------- */
diff --git a/libmailutils/base/assoc.c b/libmailutils/base/assoc.c
index bae361c..8b42f82 100644
--- a/libmailutils/base/assoc.c
+++ b/libmailutils/base/assoc.c
@@ -621,9 +621,7 @@ mu_assoc_get_iterator (mu_assoc_t assoc, mu_iterator_t 
*piterator)
   *piterator = iterator;
   return 0;
 }  
-
 
-
 int
 mu_assoc_count (mu_assoc_t assoc, size_t *pcount)
 {
@@ -643,4 +641,38 @@ mu_assoc_count (mu_assoc_t assoc, size_t *pcount)
   *pcount = count;
   return 0;
 }
+
+int
+mu_assoc_is_empty (mu_assoc_t assoc)
+{
+  return assoc == NULL || assoc->head == NULL;
+}
+
+int
+mu_assoc_foreach (mu_assoc_t assoc, mu_assoc_action_t action, void *data)
+{
+  mu_iterator_t itr;
+  int rc;
+  
+  if (!assoc || !action)
+    return EINVAL;
+  rc = mu_assoc_get_iterator (assoc, &itr);
+  if (rc)
+    return rc;
+  for (mu_iterator_first (itr); !mu_iterator_is_done (itr);
+       mu_iterator_next (itr))
+    {
+      char *name;
+      void *value;
 
+      rc = mu_iterator_current_kv (itr, (const void **)&name, (void**)&value);
+      if (rc)
+       break;
+      
+      rc = action (name, value, data);
+      if (rc)
+       break;
+    }
+  mu_iterator_destroy (&itr);
+  return rc;
+}
diff --git a/libmailutils/base/ctparse.c b/libmailutils/base/ctparse.c
index 7734660..9fdee2d 100644
--- a/libmailutils/base/ctparse.c
+++ b/libmailutils/base/ctparse.c
@@ -21,206 +21,68 @@
 #include <stdlib.h>
 #include <string.h>
 #include <mailutils/types.h>
-#include <mailutils/cstr.h>
-#include <mailutils/cctype.h>
+#include <mailutils/mime.h>
+#include <mailutils/assoc.h>
 #include <mailutils/util.h>
 #include <mailutils/errno.h>
 
-void
-mu_param_free (void *data)
-{
-  struct mu_param *p = data;
-  free (p->name);
-  free (p->value);
-  free (p);
-} 
-
-int
-mu_param_cmp (void const *a, void const *b)
-{
-  struct mu_param const *p1 = a; 
-  struct mu_param const *p2 = b;
-
-  return mu_c_strcasecmp (p1->name, p2->name);
-}
-
-static int parse_param (const char **input_ptr, mu_content_type_t ct);
-static int parse_params (const char *input, mu_content_type_t ct);
-static int parse_subtype (const char *input, mu_content_type_t ct);
-static int parse_type (const char *input, mu_content_type_t ct);
-
-static int
-parse_type (const char *input, mu_content_type_t ct)
-{
-  size_t i;
-
-  for (i = 0; input[i] != '/'; i++)
-    {
-      if (input[i] == 0
-         || !(mu_isalnum (input[i]) || input[i] == '-' || input[i] == '_'))
-       return MU_ERR_PARSE;
-    }
-  ct->type = malloc (i + 1);
-  if (!ct->type)
-    return ENOMEM;
-  memcpy (ct->type, input, i);
-  ct->type[i] = 0;
-
-  return parse_subtype (input + i + 1, ct);
-}
-
-static char tspecials[] = "()<>@,;:\\\"/[]?=";
-
-#define ISTOKEN(c) ((unsigned char)(c) > ' ' && !strchr (tspecials, c))
-
-static int
-parse_subtype (const char *input, mu_content_type_t ct)
-{
-  size_t i;
-
-  for (i = 0; !(input[i] == 0 || input[i] == ';'); i++)
-    {
-      if (!ISTOKEN (input[i]))
-       return MU_ERR_PARSE;
-    }
-  ct->subtype = malloc (i + 1);
-  if (!ct->subtype)
-    return ENOMEM;
-  memcpy (ct->subtype, input, i);
-  ct->subtype[i] = 0;
-
-  return parse_params (input + i, ct);
-}
-    
+  
 static int
-parse_params (const char *input, mu_content_type_t ct)
+content_type_parse (const char *input, const char *charset,
+                   mu_content_type_t ct)
 {
   int rc;
-
-  rc = mu_list_create (&ct->param);
+  char *value, *p;
+  
+  rc = mu_mime_header_parse (input, charset, &value, &ct->param);
   if (rc)
     return rc;
-  mu_list_set_destroy_item (ct->param, mu_param_free);
-  mu_list_set_comparator (ct->param, mu_param_cmp);
-  
-  while (*input == ';')
+  p = strchr (value, '/');
+  if (p)
     {
-      input = mu_str_skip_class (input + 1, MU_CTYPE_SPACE);
-      rc = parse_param (&input, ct);
-      if (rc)
-       return rc;
-    }
-
-  if (*input)
-    {
-      input = mu_str_skip_class (input, MU_CTYPE_SPACE);
-      ct->trailer = strdup (input);
-      if (!ct->trailer)
-       return ENOMEM;
-    }
-
-  return rc;
-}
-
-static int
-parse_param (const char **input_ptr, mu_content_type_t ct)
-{
-  const char *input = *input_ptr;
-  size_t i = 0;
-  size_t namelen;
-  size_t valstart, vallen;
-  struct mu_param *p;
-  int rc;
-  unsigned quotechar = 0;
-  
-  while (ISTOKEN (input[i]))
-    i++;
-  namelen = i;
-
-  if (input[i] != '=')
-    return MU_ERR_PARSE;
-  i++;
-  if (input[i] == '"')
-    {
-      i++;
-      valstart = i;
-      while (input[i] != '"')
+      size_t len = p - value;
+      ct->type = malloc (len + 1);
+      if (!ct->type)
        {
-         if (input[i] == '\\')
-           {
-             quotechar++;
-             i++;
-           }
-         if (!input[i])
-           return MU_ERR_PARSE;
-         i++;
+         rc = errno;
+         free (value);
+         return rc;
        }
-      vallen = i - valstart - quotechar;
-      i++;
-    }
-  else
-    {
-      valstart = i;
-      while (ISTOKEN (input[i]))
-       i++;
-      vallen = i - valstart;
-    }
+      memcpy (ct->type, value, len);
+      ct->type[len] = 0;
 
-  p = malloc (sizeof (*p));
-  if (!p)
-    return ENOMEM;
-  p->name = malloc (namelen + 1);
-  p->value = malloc (vallen + 1);
-  if (!p->name || !p->value)
-    {
-      mu_param_free (p);
-      return ENOMEM;
-    }
-
-  memcpy (p->name, input, namelen);
-  p->name[namelen] = 0;
-  if (quotechar)
-    {
-      size_t j;
-      const char *src = input + valstart;
-
-      for (i = j = 0; j < vallen; i++, j++)
+      ct->subtype = strdup (p + 1);
+      if (!ct->subtype)
        {
-         if (src[j] == '\\')
-           j++;
-         p->value[i] = src[j];
+         rc = errno;
+         free (value);
+         return rc;
        }
-      p->value[i] = 0;
     }
   else
     {
-      memcpy (p->value, input + valstart, vallen);
-      p->value[vallen] = 0;
-    }
-  
-  rc = mu_list_append (ct->param, p);
-  if (rc)
-    {
-      mu_param_free (p);
-      return rc;
+      ct->type = value;
+      ct->subtype = NULL;
     }
-
-  *input_ptr = input + i;
-
   return 0;
-}     
-  
+}
+
 int
-mu_content_type_parse (const char *input, mu_content_type_t *retct)
+mu_content_type_parse (const char *input, const char *charset,
+                      mu_content_type_t *retct)
 {
   int rc;
   mu_content_type_t ct;
+
+  if (!input)
+    return EINVAL;
+  if (!retct)
+    return MU_ERR_OUT_PTR_NULL;
   
   ct = calloc (1, sizeof (*ct));
   if (!ct)
     return errno;
-
-  rc = parse_type (mu_str_skip_class (input, MU_CTYPE_SPACE), ct);
+  rc = content_type_parse (input, charset, ct);
   if (rc)
     mu_content_type_destroy (&ct);
   else
@@ -238,7 +100,7 @@ mu_content_type_destroy (mu_content_type_t *pptr)
       free (ct->type);
       free (ct->subtype);
       free (ct->trailer);
-      mu_list_destroy (&ct->param);
+      mu_assoc_destroy (&ct->param);
       free (ct);
       *pptr = NULL;
     }
diff --git a/libmailutils/mime/mimehdr.c b/libmailutils/mime/mimehdr.c
index c015b6a..48ae48e 100644
--- a/libmailutils/mime/mimehdr.c
+++ b/libmailutils/mime/mimehdr.c
@@ -639,7 +639,7 @@ mu_mime_header_parse_subset (const char *text, const char 
*cset,
    corresponding data are of no interest to the caller.
 */
 int
-mu_mime_header_parse (const char *text, char *cset, char **pvalue,
+mu_mime_header_parse (const char *text, char const *cset, char **pvalue,
                      mu_assoc_t *passoc)
 {
   int rc;
diff --git a/libmailutils/tests/conttype.c b/libmailutils/tests/conttype.c
index e4f2485..a94bfaa 100644
--- a/libmailutils/tests/conttype.c
+++ b/libmailutils/tests/conttype.c
@@ -3,11 +3,11 @@
 #include <assert.h>
 
 static int
-print_param (void *item, void *data)
+print_param (char const *name, void *item, void *data)
 {
   size_t *n = data;
-  struct mu_param *p = item;
-  printf ("%2zu: %s=%s\n", *n, p->name, p->value);
+  struct mu_mime_param *p = item;
+  printf ("%2zu: %s=%s\n", *n, name, p->value);
   ++*n;
   return 0;
 }
@@ -18,7 +18,7 @@ parse (char const *input)
   mu_content_type_t ct;
   int rc;
     
-  rc = mu_content_type_parse (input,  &ct);
+  rc = mu_content_type_parse (input, NULL, &ct);
   if (rc)
     {
       mu_error ("%s", mu_strerror (rc));
@@ -29,10 +29,10 @@ parse (char const *input)
   printf ("subtype = %s\n", ct->subtype);
   if (ct->trailer)
     printf ("trailer = %s\n", ct->trailer);
-  if (!mu_list_is_empty (ct->param))
+  if (!mu_assoc_is_empty (ct->param))
     {
       size_t n = 0;
-      mu_list_foreach (ct->param, print_param, &n);
+      mu_assoc_foreach (ct->param, print_param, &n);
     }
   mu_content_type_destroy (&ct);
   return 0;


hooks/post-receive
-- 
GNU Mailutils