projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
exit strfcpy, only use m_strcpy.
[apps/madmutt.git]
/
rfc2231.c
diff --git
a/rfc2231.c
b/rfc2231.c
index
87856ac
..
0f9a2f5
100644
(file)
--- a/
rfc2231.c
+++ b/
rfc2231.c
@@
-23,9
+23,9
@@
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
#include "mutt.h"
#include "mutt.h"
-#include "ascii.h"
#include "mime.h"
#include "charset.h"
#include "rfc2047.h"
#include "mime.h"
#include "charset.h"
#include "rfc2047.h"
@@
-187,7
+187,7
@@
static char *rfc2231_get_charset (char *value, char *charset, size_t chslen)
}
*t = '\0';
}
*t = '\0';
-
strfcpy (charset, value, chslen
);
+
m_strcpy(charset, chslen, value
);
if ((u = strchr (t + 1, '\'')))
return u + 1;
if ((u = strchr (t + 1, '\'')))
return u + 1;
@@
-231,7
+231,7
@@
static void rfc2231_list_insert (struct rfc2231_parameter **list,
q = p;
p = p->next;
q = p;
p = p->next;
- c =
str_cmp
(par->value, q->value);
+ c =
m_strcmp
(par->value, q->value);
if ((c > 0) || (c == 0 && par->index >= q->index))
break;
}
if ((c > 0) || (c == 0 && par->index >= q->index))
break;
}
@@
-259,7
+259,7
@@
static void rfc2231_join_continuations (PARAMETER ** head,
value = NULL;
l = 0;
value = NULL;
l = 0;
-
strfcpy (attribute, par->attribute, sizeof (attribute)
);
+
m_strcpy(attribute, sizeof(attribute), par->attribute
);
if ((encoded = par->encoded))
valp = rfc2231_get_charset (par->value, charset, sizeof (charset));
if ((encoded = par->encoded))
valp = rfc2231_get_charset (par->value, charset, sizeof (charset));
@@
-280,7
+280,7
@@
static void rfc2231_join_continuations (PARAMETER ** head,
rfc2231_free_parameter (&par);
if ((par = q))
valp = par->value;
rfc2231_free_parameter (&par);
if ((par = q))
valp = par->value;
- } while (par && !
str_cmp
(par->attribute, attribute));
+ } while (par && !
m_strcmp
(par->attribute, attribute));
if (value) {
if (encoded)
if (value) {
if (encoded)