begin to move rfc2047 into lib-mime.

[apps/madmutt.git] / rfc2047.c

diff --git a/rfc2047.c b/rfc2047.c
index d973d26..bed0353 100644 (file)
--- a/rfc2047.c
+++ b/rfc2047.c
@@ -1,3 +1,22 @@
+/*
+ *  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., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA 02110-1301, USA.
+ *
+ *  Copyright © 2006 Pierre Habouzit
+ */
+
 /*
  * Copyright notice from original mutt:
  * Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
@@ -16,13 +35,12 @@
 #include <lib-lib/str.h>
 #include <lib-lib/ascii.h>
 
+#include <lib-mime/mime.h>
+
 #include "mutt.h"
-#include "mime.h"
 #include "charset.h"
-#include "rfc2047.h"
 #include "thread.h"
 
-
 #include <ctype.h>
 #include <errno.h>
 #include <stdio.h>
@@ -45,8 +63,6 @@
 
 #define CONTINUATION_BYTE(c) (((c) & 0xc0) == 0x80)
 
-extern char RFC822Specials[];
-
 typedef size_t (*encoder_t) (char *, const char *, size_t,
                              const char *);
 
@@ -154,24 +170,24 @@ static size_t b_encoder (char *s, const char *d, size_t dlen,
     if (!dlen)
       break;
     else if (dlen == 1) {
-      *s++ = B64Chars[(*d >> 2) & 0x3f];
-      *s++ = B64Chars[(*d & 0x03) << 4];
+      *s++ = __m_b64chars[(*d >> 2) & 0x3f];
+      *s++ = __m_b64chars[(*d & 0x03) << 4];
       *s++ = '=';
       *s++ = '=';
       break;
     }
     else if (dlen == 2) {
-      *s++ = B64Chars[(*d >> 2) & 0x3f];
-      *s++ = B64Chars[((*d & 0x03) << 4) | ((d[1] >> 4) & 0x0f)];
-      *s++ = B64Chars[(d[1] & 0x0f) << 2];
+      *s++ = __m_b64chars[(*d >> 2) & 0x3f];
+      *s++ = __m_b64chars[((*d & 0x03) << 4) | ((d[1] >> 4) & 0x0f)];
+      *s++ = __m_b64chars[(d[1] & 0x0f) << 2];
       *s++ = '=';
       break;
     }
     else {
-      *s++ = B64Chars[(*d >> 2) & 0x3f];
-      *s++ = B64Chars[((*d & 0x03) << 4) | ((d[1] >> 4) & 0x0f)];
-      *s++ = B64Chars[((d[1] & 0x0f) << 2) | ((d[2] >> 6) & 0x03)];
-      *s++ = B64Chars[d[2] & 0x3f];
+      *s++ = __m_b64chars[(*d >> 2) & 0x3f];
+      *s++ = __m_b64chars[((*d & 0x03) << 4) | ((d[1] >> 4) & 0x0f)];
+      *s++ = __m_b64chars[((d[1] & 0x0f) << 2) | ((d[2] >> 6) & 0x03)];
+      *s++ = __m_b64chars[d[2] & 0x3f];
       d += 3, dlen -= 3;
     }
   }
@@ -534,9 +550,9 @@ void _rfc2047_encode_string (char **pd, int encode_specials, int col)
   *pd = e;
 }
 
-void rfc2047_encode_adrlist (ADDRESS * addr, const char *tag)
+void rfc2047_encode_adrlist (address_t * addr, const char *tag)
 {
-  ADDRESS *ptr = addr;
+  address_t *ptr = addr;
   int col = tag ? m_strlen(tag) + 2 : 32;
 
   while (ptr) {
@@ -582,9 +598,7 @@ static int rfc2047_decode_word (char *d, const char *s, size_t len)
         for (; pp < pp1; pp++) {
           if (*pp == '_')
             *pd++ = ' ';
-          else if (*pp == '=' &&
-                   (!(pp[1] & ~127) && hexval (pp[1]) != -1) &&
-                   (!(pp[2] & ~127) && hexval (pp[2]) != -1)) {
+          else if (*pp == '=' && hexval(pp[1]) >= 0 && hexval(pp[2]) >= 0) {
             *pd++ = (hexval (pp[1]) << 4) | hexval (pp[2]);
             pp += 2;
           }
@@ -788,7 +802,7 @@ void rfc2047_decode (char **pd)
   str_adjust (pd);
 }
 
-void rfc2047_decode_adrlist (ADDRESS * a)
+void rfc2047_decode_adrlist (address_t * a)
 {
   while (a) {
     if (a->personal)