Synchronize with trunk

[disorder] / lib / mime.h

diff --git a/lib/mime.h b/lib/mime.h
index b863f4abb6695f8d9cdeaed4ec3ec74edcea3533..c3292fd40a5ceff2f466ce001deca097758fe343 100644 (file)
--- a/lib/mime.h
+++ b/lib/mime.h
@@ -1,21 +1,19 @@
 /*
  * This file is part of DisOrder
- * Copyright (C) 2005, 2007 Richard Kettlewell
+ * 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 <http://www.gnu.org/licenses/>.
  */
 /** @file lib/mime.h
  * @brief Support for MIME and allied protocols
@@ -24,14 +22,11 @@
 #ifndef MIME_H
 #define MIME_H
 
+struct kvp;
+
 int mime_content_type(const char *s,
                      char **typep,
-                     char **parameternamep,
-                     char **parametervaluep);
-/* Parse a content-type value.  returns 0 on success, -1 on error.
- * paramaternamep and parametervaluep are only set if present.
- * type and parametername are forced to lower case.
- */
+                     struct kvp **parametersp);
 
 const char *mime_parse(const char *s,
                       int (*callback)(const char *name, const char *value,
@@ -99,6 +94,10 @@ char *mime_to_qp(const char *text);
 const char *mime_encode_text(const char *text,
                             const char **charsetp,
                             const char **encodingp);
+const char *mime_parse_word(const char *s, char **valuep,
+                           int (*special)(int));
+int mime_http_separator(int c);
+int mime_tspecial(int c);
 
 #endif /* MIME_H */