/*
+ * Copyright notice from original mutt:
* Copyright (C) 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.
+ */
/*
* A simple URL parser.
*/
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/mapping.h>
+
+#include <lib-mime/mime.h>
+
#include "mutt.h"
-#include "mapping.h"
#include "url.h"
-#include "mime.h"
#include <ctype.h>
-static struct mapping_t UrlMap[] =
-{
- { "file", U_FILE },
- { "imap", U_IMAP },
- { "imaps", U_IMAPS },
- { "pop", U_POP },
- { "pops", U_POPS },
- { "nntp", U_NNTP },
- { "nntps", U_NNTPS },
- { "snews", U_NNTPS },
- { "mailto", U_MAILTO },
- { NULL, U_UNKNOWN}
+static struct mapping_t UrlMap[] = {
+ {"file", U_FILE},
+ {"imap", U_IMAP},
+ {"imaps", U_IMAPS},
+ {"pop", U_POP},
+ {"pops", U_POPS},
+ {"nntp", U_NNTP},
+ {"news", U_NNTP},
+ {"nntps", U_NNTPS},
+ {"snews", U_NNTPS},
+ {"mailto", U_MAILTO},
+ {NULL, U_UNKNOWN}
};
if (!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)
- {
+
+ for (d = s; *s; s++) {
+ if (*s == '%' && hexval (s[1]) >= 0 && hexval (s[2]) >= 0) {
*d++ = (hexval (s[1]) << 4) | (hexval (s[2]));
s += 2;
}
else
*d++ = *s;
}
- *d ='\0';
+ *d = '\0';
}
url_scheme_t url_check_scheme (const char *s)
char sbuf[STRING];
char *t;
int i;
-
+
if (!s || !(t = strchr (s, ':')))
return U_UNKNOWN;
if ((t - s) + 1 >= sizeof (sbuf))
return U_UNKNOWN;
-
- strfcpy (sbuf, s, t - s + 1);
+
+ m_strcpy(sbuf, t - s + 1, s);
for (t = sbuf; *t; t++)
*t = ascii_tolower (*t);
{
if (ascii_strncasecmp (src, "file:", 5))
return -1;
- else if (!ascii_strncasecmp (src, "file://", 7)) /* we don't support remote files */
+ else if (!ascii_strncasecmp (src, "file://", 7)) /* we don't support remote files */
return -1;
else
- strfcpy (d, src + 5, dl);
-
+ m_strcpy(d, dl, src + 5);
+
url_pct_decode (d);
return 0;
}
/* ciss_parse_userhost: fill in components of ciss with info from src. Note
* these are pointers into src, which is altered with '\0's. Port of 0
* means no port given. */
-static char *ciss_parse_userhost (ciss_url_t *ciss, char *src)
+static char *ciss_parse_userhost (ciss_url_t * ciss, char *src)
{
char *t;
char *p;
if (strncmp (src, "//", 2))
return src;
-
+
src += 2;
if ((path = strchr (src, '/')))
*path++ = '\0';
-
- if ((t = strrchr (src, '@')))
- {
+
+ if ((t = strrchr (src, '@'))) {
*t = '\0';
- if ((p = strchr (src, ':')))
- {
+ if ((p = strchr (src, ':'))) {
*p = '\0';
ciss->pass = p + 1;
url_pct_decode (ciss->pass);
}
else
t = src;
-
- if ((p = strchr (t, ':')))
- {
+
+ if ((p = strchr (t, ':'))) {
*p++ = '\0';
ciss->port = atoi (p);
}
else
ciss->port = 0;
-
+
ciss->host = t;
url_pct_decode (ciss->host);
return path;
/* url_parse_ciss: Fill in ciss_url_t. char* elements are pointers into src,
* which is modified by this call (duplicate it first if you need to). */
-int url_parse_ciss (ciss_url_t *ciss, char *src)
+int url_parse_ciss (ciss_url_t * ciss, char *src)
{
char *tmp;
ciss->path = ciss_parse_userhost (ciss, tmp);
url_pct_decode (ciss->path);
-
+
return 0;
}
/* url_ciss_tostring: output the URL string for a given CISS object. */
-int url_ciss_tostring (ciss_url_t* ciss, char* dest, size_t len, int flags)
+
+int url_ciss_tostring (ciss_url_t * ciss, char *dest, size_t len, int flags)
{
+ long l;
+
if (ciss->scheme == U_UNKNOWN)
return -1;
snprintf (dest, len, "%s:", mutt_getnamebyvalue (ciss->scheme, UrlMap));
- if (ciss->host)
- {
- strncat (dest, "//", len - strlen (dest));
+ if (ciss->host) {
+ m_strcat(dest, len, "//");
+ len -= (l = m_strlen(dest));
+ dest += l;
+
if (ciss->user) {
if (flags & U_DECODE_PASSWD && ciss->pass)
- snprintf (dest + strlen (dest), len - strlen (dest), "%s:%s@",
- ciss->user, ciss->pass);
+ snprintf (dest, len, "%s:%s@", ciss->user, ciss->pass);
else
- snprintf (dest + strlen (dest), len - strlen (dest), "%s@",
- ciss->user);
+ snprintf (dest, len, "%s@", ciss->user);
+
+ len -= (l = m_strlen(dest));
+ dest += l;
}
if (ciss->port)
- snprintf (dest + strlen (dest), len - strlen (dest), "%s:%hu/",
- ciss->host, ciss->port);
+ snprintf (dest, len, "%s:%hu/", ciss->host, ciss->port);
else
- snprintf (dest + strlen (dest), len - strlen (dest), "%s/", ciss->host);
+ snprintf (dest, len, "%s/", ciss->host);
}
if (ciss->path)
- strncat (dest, ciss->path, len - strlen (dest));
+ m_strcat(dest, len, ciss->path);
return 0;
}
-int url_parse_mailto (ENVELOPE *e, char **body, const char *src)
+int url_parse_mailto (ENVELOPE * e, char **body, const char *src)
{
char *t;
char *tmp;
int taglen;
- LIST *last = NULL;
-
+ LIST **last = &e->userhdrs;
+
if (!(t = strchr (src, ':')))
return -1;
-
- if ((tmp = safe_strdup (t + 1)) == NULL)
+
+ if ((tmp = m_strdup(t + 1)) == NULL)
return -1;
if ((headers = strchr (tmp, '?')))
e->to = rfc822_parse_adrlist (e->to, tmp);
tag = headers ? strtok (headers, "&") : NULL;
-
- for (; tag; tag = strtok (NULL, "&"))
- {
+
+ for (; tag; tag = strtok (NULL, "&")) {
if ((value = strchr (tag, '=')))
*value++ = '\0';
if (!value || !*value)
url_pct_decode (tag);
url_pct_decode (value);
- if (!ascii_strcasecmp (tag, "body"))
- mutt_str_replace (body, value);
- else
- {
- taglen = strlen (tag);
+ if (!ascii_strcasecmp (tag, "body")) {
+ if (body)
+ m_strreplace(body, value);
+ }
+ else {
+#define SAFEPFX (option (OPTSTRICTMAILTO) ? "" : "X-Mailto-")
+ taglen = m_strlen(tag) + m_strlen(SAFEPFX);
/* mutt_parse_rfc822_line makes some assumptions */
- snprintf (scratch, sizeof (scratch), "%s: %s", tag, value);
+ snprintf (scratch, sizeof (scratch), "%s%s: %s", SAFEPFX, tag, value);
+#undef SAVEPFX
scratch[taglen] = '\0';
- value = &scratch[taglen+1];
- SKIPWS (value);
- mutt_parse_rfc822_line (e, NULL, scratch, value, 1, 0, 0, &last);
+ value = vskipspaces(&scratch[taglen + 1]);
+ last = mutt_parse_rfc822_line (e, NULL, scratch, value, 0, 0, last);
+ /* if $strict_mailto is set, force editing headers to let
+ * users have a look at what we got */
+ if (!option (OPTSTRICTMAILTO)) {
+ set_option (OPTXMAILTO);
+ set_option (OPTEDITHDRS);
+ }
}
}
-
- FREE (&tmp);
+
+ p_delete(&tmp);
return 0;
}
-
projects / apps / madmutt.git / blobdiff