/*
+ * Copyright notice from original mutt:
* Copyright (C) 1999-2000 Thomas Roessler <roessler@does-not-exist.org>
*
- * This program is free software; you can redistribute it
- * and/or modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later
- * version.
- *
- * This program is distributed in the hope that it will be
- * useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111, USA.
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
*/
/*
#include "mutt.h"
#include "mime.h"
#include "charset.h"
+#include "lib/str.h"
#include "rfc2047.h"
#include "rfc2231.h"
+#include "lib/mem.h"
+
#include <ctype.h>
#include <string.h>
#include <stdlib.h>
-struct rfc2231_parameter
-{
+struct rfc2231_parameter {
char *attribute;
char *value;
- int index;
- int encoded;
- struct rfc2231_parameter
- *next;
+ int index;
+ int encoded;
+ struct rfc2231_parameter
+ *next;
};
static char *rfc2231_get_charset (char *, char *, size_t);
static struct rfc2231_parameter *rfc2231_new_parameter (void);
static void rfc2231_decode_one (char *, char *);
static void rfc2231_free_parameter (struct rfc2231_parameter **);
-static void rfc2231_join_continuations (PARAMETER **, struct rfc2231_parameter *);
-static void rfc2231_list_insert (struct rfc2231_parameter **, struct rfc2231_parameter *);
+static void rfc2231_join_continuations (PARAMETER **,
+ struct rfc2231_parameter *);
+static void rfc2231_list_insert (struct rfc2231_parameter **,
+ struct rfc2231_parameter *);
-static void purge_empty_parameters (PARAMETER **headp)
+static void purge_empty_parameters (PARAMETER ** headp)
{
PARAMETER *p, *q, **last;
-
- for (last = headp, p = *headp; p; p = q)
- {
+
+ for (last = headp, p = *headp; p; p = q) {
q = p->next;
- if (!p->attribute || !p->value)
- {
+ if (!p->attribute || !p->value) {
*last = q;
p->next = NULL;
mutt_free_parameter (&p);
}
-void rfc2231_decode_parameters (PARAMETER **headp)
+void rfc2231_decode_parameters (PARAMETER ** headp)
{
PARAMETER *head = NULL;
PARAMETER **last;
int encoded;
int index;
- short dirty = 0; /* set to 1 when we may have created
- * empty parameters.
- */
-
- if (!headp) return;
+ short dirty = 0; /* set to 1 when we may have created
+ * empty parameters.
+ */
+
+ if (!headp)
+ return;
purge_empty_parameters (headp);
-
- for (last = &head, p = *headp; p; p = q)
- {
+
+ for (last = &head, p = *headp; p; p = q) {
q = p->next;
- if (!(s = strchr (p->attribute, '*')))
- {
+ if (!(s = strchr (p->attribute, '*'))) {
/*
* Using RFC 2047 encoding in MIME parameters is explicitly
*/
if (option (OPTRFC2047PARAMS) && p->value && strstr (p->value, "=?"))
- rfc2047_decode (&p->value);
+ rfc2047_decode (&p->value);
+ else if (!option (OPTSTRICTMIME)) {
+ if (ascii_strcasecmp (AssumedCharset, "us-ascii"))
+ mutt_convert_nonmime_string (&p->value);
+ }
*last = p;
last = &p->next;
p->next = NULL;
}
- else if (*(s + 1) == '\0')
- {
+ else if (*(s + 1) == '\0') {
*s = '\0';
-
+
s = rfc2231_get_charset (p->value, charset, sizeof (charset));
rfc2231_decode_one (p->value, s);
mutt_convert_string (&p->value, charset, Charset, M_ICONV_HOOK_FROM);
*last = p;
last = &p->next;
p->next = NULL;
-
+
dirty = 1;
}
- else
- {
- *s = '\0'; s++; /* let s point to the first character of index. */
- for (t = s; *t && isdigit ((unsigned char) *t); t++)
- ;
+ else {
+ *s = '\0';
+ s++; /* let s point to the first character of index. */
+ for (t = s; *t && isdigit ((unsigned char) *t); t++);
encoded = (*t == '*');
*t = '\0';
conttmp->value = p->value;
conttmp->encoded = encoded;
conttmp->index = index;
-
+
p->attribute = NULL;
p->value = NULL;
FREE (&p);
}
}
- if (conthead)
- {
+ if (conthead) {
rfc2231_join_continuations (last, conthead);
dirty = 1;
}
-
+
*headp = head;
-
+
if (dirty)
purge_empty_parameters (headp);
}
-
+
static struct rfc2231_parameter *rfc2231_new_parameter (void)
{
return safe_calloc (sizeof (struct rfc2231_parameter), 1);
static void rfc2231_free_parameter (struct rfc2231_parameter **p)
{
- if (*p)
- {
+ if (*p) {
FREE (&(*p)->attribute);
FREE (&(*p)->value);
FREE (p);
static char *rfc2231_get_charset (char *value, char *charset, size_t chslen)
{
char *t, *u;
-
- if (!(t = strchr (value, '\'')))
- {
+
+ if (!(t = strchr (value, '\''))) {
charset[0] = '\0';
return value;
}
-
+
*t = '\0';
strfcpy (charset, value, chslen);
-
+
if ((u = strchr (t + 1, '\'')))
return u + 1;
else
{
char *d;
- for (d = dest; *src; src++)
- {
+ for (d = dest; *src; src++) {
if (*src == '%' &&
isxdigit ((unsigned char) *(src + 1)) &&
- isxdigit ((unsigned char) *(src + 2)))
- {
+ isxdigit ((unsigned char) *(src + 2))) {
*d++ = (hexval (*(src + 1)) << 4) | (hexval (*(src + 2)));
src += 2;
}
else
*d++ = *src;
}
-
+
*d = '\0';
}
*/
static void rfc2231_list_insert (struct rfc2231_parameter **list,
- struct rfc2231_parameter *par)
+ struct rfc2231_parameter *par)
{
struct rfc2231_parameter **last = list;
struct rfc2231_parameter *p = *list, *q;
int c;
-
- while (p)
- {
+
+ while (p) {
last = &p->next;
- q = p; p = p->next;
+ q = p;
+ p = p->next;
- c = strcmp (par->value, q->value);
+ c = safe_strcmp (par->value, q->value);
if ((c > 0) || (c == 0 && par->index >= q->index))
break;
}
-
+
par->next = p;
*last = par;
}
/* process continuation parameters */
-static void rfc2231_join_continuations (PARAMETER **head,
- struct rfc2231_parameter *par)
+static void rfc2231_join_continuations (PARAMETER ** head,
+ struct rfc2231_parameter *par)
{
struct rfc2231_parameter *q;
int encoded;
size_t l, vl;
-
- while (par)
- {
- value = NULL; l = 0;
-
+
+ while (par) {
+ value = NULL;
+ l = 0;
+
strfcpy (attribute, par->attribute, sizeof (attribute));
if ((encoded = par->encoded))
else
valp = par->value;
- do
- {
+ do {
if (encoded && par->encoded)
- rfc2231_decode_one (par->value, valp);
-
- vl = strlen (par->value);
-
+ rfc2231_decode_one (par->value, valp);
+
+ vl = safe_strlen (par->value);
+
safe_realloc (&value, l + vl + 1);
- strcpy (value + l, par->value); /* __STRCPY_CHECKED__ */
+ strcpy (value + l, par->value); /* __STRCPY_CHECKED__ */
l += vl;
q = par->next;
rfc2231_free_parameter (&par);
if ((par = q))
- valp = par->value;
- } while (par && !strcmp (par->attribute, attribute));
-
- if (value)
- {
+ valp = par->value;
+ } while (par && !safe_strcmp (par->attribute, attribute));
+
+ if (value) {
if (encoded)
- mutt_convert_string (&value, charset, Charset, M_ICONV_HOOK_FROM);
+ mutt_convert_string (&value, charset, Charset, M_ICONV_HOOK_FROM);
*head = mutt_new_parameter ();
(*head)->attribute = safe_strdup (attribute);
(*head)->value = value;
for (s = *pd; *s; s++)
if (*s & 0x80)
break;
-
+
if (!*s)
return 0;
-
+
if (!Charset || !SendCharset ||
!(charset = mutt_choose_charset (Charset, SendCharset,
- *pd, strlen (*pd), &d, &dlen)))
- {
+ *pd, safe_strlen (*pd), &d, &dlen))) {
charset = safe_strdup (Charset ? Charset : "unknown-8bit");
d = *pd;
- dlen = strlen (d);
+ dlen = safe_strlen (d);
}
if (!mutt_is_us_ascii (charset))
else if (strchr (MimeSpecials, *s) || strchr ("*'%", *s))
++ext;
- if (encode)
- {
- e = safe_malloc (dlen + 2*ext + strlen (charset) + 3);
- sprintf (e, "%s''", charset); /* __SPRINTF_CHECKED__ */
- t = e + strlen (e);
+ if (encode) {
+ e = safe_malloc (dlen + 2 * ext + safe_strlen (charset) + 3);
+ sprintf (e, "%s''", charset); /* __SPRINTF_CHECKED__ */
+ t = e + safe_strlen (e);
for (s = d, slen = dlen; slen; s++, slen--)
if (*s < 0x20 || *s >= 0x7f ||
- strchr (MimeSpecials, *s) || strchr ("*'%", *s))
- {
- sprintf (t, "%%%02X", (unsigned char)*s);
- t += 3;
+ strchr (MimeSpecials, *s) || strchr ("*'%", *s)) {
+ sprintf (t, "%%%02X", (unsigned char) *s);
+ t += 3;
}
else
- *t++ = *s;
+ *t++ = *s;
*t = '\0';
if (d != *pd)
FREE (pd);
*pd = e;
}
- else if (d != *pd)
- {
+ else if (d != *pd) {
FREE (pd);
*pd = d;
}
-
+
FREE (&charset);
-
+
return encode;
}
-
projects / apps / madmutt.git / blobdiff