projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move parse.c into rfc822parse.c in the lib-mime as it's what it's about
[apps/madmutt.git]
/
url.c
diff --git
a/url.c
b/url.c
index
67a94cd
..
81b47c7
100644
(file)
--- a/
url.c
+++ b/
url.c
@@
-19,10
+19,11
@@
#include <lib-lib/ascii.h>
#include <lib-lib/mapping.h>
#include <lib-lib/ascii.h>
#include <lib-lib/mapping.h>
+#include <lib-mime/mime.h>
+
#include "mutt.h"
#include "url.h"
#include "mutt.h"
#include "url.h"
-#include "mime.h"
#include <ctype.h>
#include <ctype.h>
@@
-49,10
+50,7
@@
static void url_pct_decode (char *s)
return;
for (d = s; *s; s++) {
return;
for (d = s; *s; s++) {
- if (*s == '%' && s[1] && s[2] &&
- isxdigit ((unsigned char) s[1]) &&
- isxdigit ((unsigned char) s[2]) &&
- hexval (s[1]) >= 0 && hexval (s[2]) >= 0) {
+ if (*s == '%' && hexval (s[1]) >= 0 && hexval (s[2]) >= 0) {
*d++ = (hexval (s[1]) << 4) | (hexval (s[2]));
s += 2;
}
*d++ = (hexval (s[1]) << 4) | (hexval (s[2]));
s += 2;
}
@@
-236,7
+234,7
@@
int url_parse_mailto (ENVELOPE * e, char **body, const char *src)
if (!ascii_strcasecmp (tag, "body")) {
if (body)
if (!ascii_strcasecmp (tag, "body")) {
if (body)
-
str_replace
(body, value);
+
m_strreplace
(body, value);
}
else {
#define SAFEPFX (option (OPTSTRICTMAILTO) ? "" : "X-Mailto-")
}
else {
#define SAFEPFX (option (OPTSTRICTMAILTO) ? "" : "X-Mailto-")