X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=handler.c;h=2bee349d69107526ee070c595df4909f2bc05993;hp=553ff298d8fee8f01e56a0e21736f7f376f72160;hb=91d0c04349c9345f0ee29a61cc18dfc144b60edc;hpb=9274cbe8e6410ddb95ddc667faa678a29da85420

diff --git a/handler.c b/handler.c
index 553ff29..2bee349 100644
--- a/handler.c
+++ b/handler.c
@@ -22,6 +22,7 @@
 #include <lib-lib/ascii.h>
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
+#include <lib-lib/file.h>
 
 #include "mutt.h"
 #include "recvattach.h"
@@ -43,29 +44,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];
@@ -241,7 +220,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) {
@@ -249,8 +228,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')
@@ -265,7 +244,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')
@@ -280,7 +259,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')
@@ -327,14 +306,14 @@ void mutt_decode_uuencoded (STATE * s, long len, int istext, iconv_t cd)
     if ((fgets (tmps, sizeof (tmps), s->fpin)) == NULL)
       return;
     len -= m_strlen(tmps);
-    if ((!str_ncmp (tmps, "begin", 5)) && ISSPACE (tmps[5]))
+    if ((!m_strncmp(tmps, "begin", 5)) && ISSPACE (tmps[5]))
       break;
   }
   while (len > 0) {
     if ((fgets (tmps, sizeof (tmps), s->fpin)) == NULL)
       return;
     len -= m_strlen(tmps);
-    if (!str_ncmp (tmps, "end", 3))
+    if (!m_strncmp(tmps, "end", 3))
       break;
     pt = tmps;
     linelen = decode_byte (*pt);
@@ -1103,7 +1082,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 =
@@ -1398,7 +1377,7 @@ int mutt_body_handler (BODY * b, STATE * s)
         handler = mutt_signed_handler;
     }
     else if ((WithCrypto & APPLICATION_PGP)
-             && str_casecmp ("encrypted", b->subtype) == 0) {
+             && m_strcasecmp("encrypted", b->subtype) == 0) {
       p = mutt_get_parameter ("protocol", b->parameter);
 
       if (!p)