X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/601b42c1d28069afd8a8ba694baefb76e6ea5171..c04511f6d7599349819e2a39699d8d6c049955ba:/lib/mime.c?ds=sidebyside
diff --git a/lib/mime.c b/lib/mime.c
index da41426..9cc54d6 100644
--- a/lib/mime.c
+++ b/lib/mime.c
@@ -2,33 +2,27 @@
* This file is part of DisOrder
* Copyright (C) 2005, 2007, 2008 Richard Kettlewell
*
- * This program is free software; you can redistribute it and/or modify
+ * 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
+ * the Free Software Foundation, either version 3 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.
- *
+ *
+ * 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-1307
- * USA
+ * along with this program. If not, see .
*/
/** @file lib/mime.c
* @brief Support for MIME and allied protocols
*/
-#include
-#include "types.h"
+#include "common.h"
-#include
#include
-#include
-
#include "mem.h"
#include "mime.h"
#include "vector.h"
@@ -334,7 +328,7 @@ const char *mime_parse(const char *s,
return mime_qp(s);
if(!strcmp(cte, "7bit") || !strcmp(cte, "8bit"))
return s;
- error(0, "unknown content-transfer-encoding '%s'", cte);
+ disorder_error(0, "unknown content-transfer-encoding '%s'", cte);
return 0;
}
return s;
@@ -381,15 +375,19 @@ int mime_multipart(const char *s,
int ret;
/* We must start with a boundary string */
- if(!isboundary(s, boundary, bl))
+ if(!isboundary(s, boundary, bl)) {
+ disorder_error(0, "mime_multipart: first line is not the boundary string");
return -1;
+ }
/* Keep going until we hit a final boundary */
while(!isfinal(s, boundary, bl)) {
s = strstr(s, "\r\n") + 2;
start = s;
while(!isboundary(s, boundary, bl)) {
- if(!(e = strstr(s, "\r\n")))
+ if(!(e = strstr(s, "\r\n"))) {
+ disorder_error(0, "mime_multipart: line does not end CRLF");
return -1;
+ }
s = e + 2;
}
if((ret = callback(xstrndup(start,
@@ -568,17 +566,17 @@ int parse_cookie(const char *s,
continue;
}
if(!(s = parsetoken(s, &n, cookie_separator))) {
- error(0, "parse_cookie: cannot parse attribute name");
+ disorder_error(0, "parse_cookie: cannot parse attribute name");
return -1;
- }
+ }
s = skipwhite(s, 0);
if(*s++ != '=') {
- error(0, "parse_cookie: did not find expected '='");
+ disorder_error(0, "parse_cookie: did not find expected '='");
return -1;
}
s = skipwhite(s, 0);
if(!(s = mime_parse_word(s, &v, cookie_value_separator))) {
- error(0, "parse_cookie: cannot parse value for '%s'", n);
+ disorder_error(0, "parse_cookie: cannot parse value for '%s'", n);
return -1;
}
if(n[0] == '$') {
@@ -589,14 +587,14 @@ int parse_cookie(const char *s,
if(cd->ncookies > 0 && cd->cookies[cd->ncookies-1].path == 0)
cd->cookies[cd->ncookies-1].path = v;
else {
- error(0, "redundant $Path in Cookie: header");
+ disorder_error(0, "redundant $Path in Cookie: header");
return -1;
}
} else if(!strcmp(n, "$Domain")) {
if(cd->ncookies > 0 && cd->cookies[cd->ncookies-1].domain == 0)
cd->cookies[cd->ncookies-1].domain = v;
else {
- error(0, "redundant $Domain in Cookie: header");
+ disorder_error(0, "redundant $Domain in Cookie: header");
return -1;
}
}
@@ -612,7 +610,7 @@ int parse_cookie(const char *s,
}
s = skipwhite(s, 0);
if(*s && (*s != ',' && *s != ';')) {
- error(0, "missing separator in Cookie: header");
+ disorder_error(0, "missing separator in Cookie: header");
return -1;
}
}