X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=handler.c;h=3a9dd146a4f2913a95e4b01ffda732d1e240245a;hp=4abb3015822c4dd2cdfde2146644356f1056d852;hb=df5b14084b39821395408679a2fb6f74605182ce;hpb=c98480f8568e6c1bc927c6c5f2b5e80b4aa6548c

diff --git a/handler.c b/handler.c
index 4abb301..3a9dd14 100644
--- a/handler.c
+++ b/handler.c
@@ -24,6 +24,8 @@
 #include <lib-lib/macros.h>
 #include <lib-lib/file.h>
 
+#include <lib-mime/mime.h>
+
 #include "mutt.h"
 #include "recvattach.h"
 #include "handler.h"
@@ -31,7 +33,6 @@
 #include "rfc1524.h"
 #include "rfc3676.h"
 #include "keymap.h"
-#include "mime.h"
 #include "copy.h"
 #include "charset.h"
 #include "mutt_crypt.h"
@@ -44,29 +45,7 @@
 typedef int handler_f (BODY *, STATE *);
 typedef handler_f *handler_t;
 
-int Index_hex[128] = {
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-  0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1,
-  -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-  -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
-};
-
-int Index_64[128] = {
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
-  52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1,
-  -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
-  15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
-  -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
-  41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1
-};
-
-void mutt_decode_xbit (STATE * s, long len, int istext, iconv_t cd)
+static void mutt_decode_xbit (STATE * s, long len, int istext, iconv_t cd)
 {
   int c, ch;
   char bufi[BUFI_SIZE];
@@ -242,7 +221,7 @@ void mutt_decode_base64 (STATE * s, long len, int istext, iconv_t cd)
     for (i = 0; i < 4 && len > 0; len--) {
       if ((ch = fgetc (s->fpin)) == EOF)
         break;
-      if (ch >= 0 && ch < 128 && (base64val (ch) != -1 || ch == '='))
+      if (base64val(ch) >= 0 || ch == '=')
         buf[i++] = ch;
     }
     if (i != 4) {
@@ -250,8 +229,8 @@ void mutt_decode_base64 (STATE * s, long len, int istext, iconv_t cd)
       break;
     }
 
-    c1 = base64val (buf[0]);
-    c2 = base64val (buf[1]);
+    c1 = base64val(buf[0]);
+    c2 = base64val(buf[1]);
     ch = (c1 << 2) | (c2 >> 4);
 
     if (cr && ch != '\n')
@@ -266,7 +245,7 @@ void mutt_decode_base64 (STATE * s, long len, int istext, iconv_t cd)
 
     if (buf[2] == '=')
       break;
-    c3 = base64val (buf[2]);
+    c3 = base64val(buf[2]);
     ch = ((c2 & 0xf) << 4) | (c3 >> 2);
 
     if (cr && ch != '\n')
@@ -281,7 +260,7 @@ void mutt_decode_base64 (STATE * s, long len, int istext, iconv_t cd)
 
     if (buf[3] == '=')
       break;
-    c4 = base64val (buf[3]);
+    c4 = base64val(buf[3]);
     ch = ((c3 & 0x3) << 6) | c4;
 
     if (cr && ch != '\n')
@@ -1104,7 +1083,7 @@ static int autoview_handler (BODY * a, STATE * s)
   p_delete(&fname);
 
   if (entry->command) {
-    strfcpy (command, entry->command, sizeof (command));
+    m_strcpy(command, sizeof(command), entry->command);
 
     /* rfc1524_expand_command returns 0 if the file is required */
     piped =