move some decoding functions right into the str module, with a bit more

[apps/madmutt.git] / mime.h

diff --git a/mime.h b/mime.h
index ebef53e..d102594 100644 (file)
--- a/mime.h
+++ b/mime.h
@@ -1,24 +1,14 @@
 /*
 /*

+ * Copyright notice from original mutt:

  * Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
  * Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.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.
+ */

 
 /* Content-Type */
 
 /* Content-Type */

-enum
-{
+enum {

   TYPEOTHER,
   TYPEAUDIO,
   TYPEAPPLICATION,
   TYPEOTHER,
   TYPEAUDIO,
   TYPEAPPLICATION,


@@ -27,12 +17,12 @@ enum
   TYPEMODEL,
   TYPEMULTIPART,
   TYPETEXT,
   TYPEMODEL,
   TYPEMULTIPART,
   TYPETEXT,

-  TYPEVIDEO
+  TYPEVIDEO,
+  TYPEANY

 };
 
 /* Content-Transfer-Encoding */
 };
 
 /* Content-Transfer-Encoding */

-enum
-{
+enum {

   ENCOTHER,
   ENC7BIT,
   ENC8BIT,
   ENCOTHER,
   ENC7BIT,
   ENC8BIT,


@@ -43,8 +33,7 @@ enum
 };
 
 /* Content-Disposition values */
 };
 
 /* Content-Disposition values */

-enum
-{
+enum {

   DISPINLINE,
   DISPATTACH,
   DISPFORMDATA
   DISPINLINE,
   DISPATTACH,
   DISPFORMDATA


@@ -53,14 +42,9 @@ enum
 /* MIME encoding/decoding global vars */
 
 #ifndef _SENDLIB_C
 /* MIME encoding/decoding global vars */
 
 #ifndef _SENDLIB_C

-extern int Index_hex[];
-extern int Index_64[];

 extern char B64Chars[];
 #endif
 
 extern char B64Chars[];
 #endif
 

-#define hexval(c) Index_hex[(unsigned int)(c)]
-#define base64val(c) Index_64[(unsigned int)(c)]
-

 #define is_multipart(x) \
     ((x)->type == TYPEMULTIPART \
      || ((x)->type == TYPEMESSAGE && (!strcasecmp((x)->subtype, "rfc822") \
 #define is_multipart(x) \
     ((x)->type == TYPEMULTIPART \
      || ((x)->type == TYPEMESSAGE && (!strcasecmp((x)->subtype, "rfc822") \