X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/d16be832996ef8a2844df3f7c91afe58cc7a46fb..HEAD:/lib/mime.c

diff --git a/lib/mime.c b/lib/mime.c
index 5db7585..99dac39 100644
--- a/lib/mime.c
+++ b/lib/mime.c
@@ -1,34 +1,28 @@
 /*
  * This file is part of DisOrder
- * Copyright (C) 2005, 2007, 2008 Richard Kettlewell
+ * Copyright (C) 2005, 2007-10, 2013 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 <http://www.gnu.org/licenses/>.
  */
 /** @file lib/mime.c
  * @brief Support for MIME and allied protocols
  */
 
-#include <config.h>
-#include "types.h"
+#include "common.h"
 
-#include <string.h>
 #include <ctype.h>
 
-#include <stdio.h>
-
 #include "mem.h"
 #include "mime.h"
 #include "vector.h"
@@ -36,6 +30,7 @@
 #include "log.h"
 #include "base64.h"
 #include "kvp.h"
+#include "printf.h"
 
 /** @brief Match whitespace characters */
 static int whitespace(int c) {
@@ -116,7 +111,7 @@ static const char *skipwhite(const char *s, int rfc822_comments) {
   int c, depth;
   
   for(;;) {
-    switch(c = *s) {
+    switch(*s) {
     case ' ':
     case '\t':
     case '\r':
@@ -179,6 +174,7 @@ const char *mime_parse_word(const char *s, char **valuep,
       case '\\':
 	if(!(c = *s++))
 	  return 0;
+	/* else fall through ... */
       default:
 	dynstr_append(value, c);
 	break;
@@ -334,7 +330,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;
@@ -382,7 +378,7 @@ int mime_multipart(const char *s,
 
   /* We must start with a boundary string */
   if(!isboundary(s, boundary, bl)) {
-    error(0, "mime_multipart: first line is not the boundary string");
+    disorder_error(0, "mime_multipart: first line is not the boundary string");
     return -1;
   }
   /* Keep going until we hit a final boundary */
@@ -391,7 +387,7 @@ int mime_multipart(const char *s,
     start = s;
     while(!isboundary(s, boundary, bl)) {
       if(!(e = strstr(s, "\r\n"))) {
-	error(0, "mime_multipart: line does not end CRLF");
+	disorder_error(0, "mime_multipart: line does not end CRLF");
 	return -1;
       }
       s = e + 2;
@@ -408,7 +404,7 @@ int mime_multipart(const char *s,
  * @param s Start of field
  * @param dispositionp Where to store disposition
  * @param parameternamep Where to store parameter name
- * @param parametervaluep Wher to store parameter value
+ * @param parametervaluep Where to store parameter value
  * @return 0 on success, non-0 on error
  *
  * See <a href="http://tools.ietf.org/html/rfc2388#section-3">RFC 2388 s3</a>
@@ -572,17 +568,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] == '$') {
@@ -593,14 +589,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;
 	}
       }
@@ -616,7 +612,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;
     }
   }
@@ -718,7 +714,7 @@ char *mime_to_qp(const char *text) {
       ++linelength;
     } else {
       /* Anything else that needs encoding */
-      snprintf(buffer, sizeof buffer, "=%02X", c);
+      byte_snprintf(buffer, sizeof buffer, "=%02X", c);
       dynstr_append_string(d, buffer);
       linelength += 3;
     }