X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=recvattach.c;h=b76c43a298fa37f25323ea12121f726f1196da80;hb=26a1babec6628dff14e428def9cff4e92a4ef7c8;hp=1121d2d259409024ba317a4f2d1bb8a63635f9e1;hpb=91d0c04349c9345f0ee29a61cc18dfc144b60edc;p=apps%2Fmadmutt.git

diff --git a/recvattach.c b/recvattach.c
index 1121d2d..b76c43a 100644
--- a/recvattach.c
+++ b/recvattach.c
@@ -8,39 +8,25 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
+
+#include <lib-mime/mime.h>
+
+#include <lib-ui/curses.h>
+#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
+#include <lib-mx/mx.h>
 
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/file.h>
-#include <lib-lib/mapping.h>
+#include <lib-sys/unix.h>
 
 #include "mutt.h"
-#include "enter.h"
 #include "handler.h"
 #include "recvattach.h"
-#include "mutt_curses.h"
-#include "mutt_menu.h"
-#include "rfc1524.h"
-#include "mime.h"
 #include "attach.h"
-#include "mx.h"
 #include "copy.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
 
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <errno.h>
-
 static const char *Mailbox_is_read_only = N_("Mailbox is read-only.");
 static char LastSaveFolder[_POSIX_PATH_MAX] = "";
 
@@ -62,7 +48,7 @@ static struct mapping_t AttachHelp[] = {
   {NULL, OP_NULL}
 };
 
-static int mutt_extract_path (char *filename, char *path)
+static int mutt_extract_path (char *filename, char *path, ssize_t pathlen)
 {
   char *tmp = p_new(char, _POSIX_PATH_MAX);
   char *help_ptr;
@@ -73,7 +59,7 @@ static int mutt_extract_path (char *filename, char *path)
     if (*filename == '/') {
       *help_ptr++ = *filename++;
       *help_ptr++ = '\0';
-      strcat (path, tmp);
+      m_strcat(path, pathlen, tmp);
       help_ptr = tmp;
     }
     *help_ptr++ = *filename++;
@@ -90,7 +76,7 @@ void mutt_update_tree (ATTACHPTR ** idx, short idxlen)
 
   for (x = 0; x < idxlen; x++) {
     idx[x]->num = x;
-    if (2 * (idx[x]->level + 2) < sizeof (buf)) {
+    if (2 * (idx[x]->level + 2) < ssizeof (buf)) {
       if (idx[x]->level) {
         s = buf + 2 * (idx[x]->level - 1);
         *s++ = (idx[x]->content->next) ? M_TREE_LTEE : M_TREE_LLCORNER;
@@ -104,12 +90,12 @@ void mutt_update_tree (ATTACHPTR ** idx, short idxlen)
 
     if (idx[x]->tree) {
       if (m_strcmp(idx[x]->tree, buf) != 0)
-        str_replace (&idx[x]->tree, buf);
+        m_strreplace(&idx[x]->tree, buf);
     }
     else
       idx[x]->tree = m_strdup(buf);
 
-    if (2 * (idx[x]->level + 2) < sizeof (buf) && idx[x]->level) {
+    if (2 * (idx[x]->level + 2) < ssizeof (buf) && idx[x]->level) {
       s = buf + 2 * (idx[x]->level - 1);
       *s++ = (idx[x]->content->next) ? '\005' : '\006';
       *s++ = '\006';
@@ -137,8 +123,7 @@ ATTACHPTR **mutt_gen_attach_list (BODY * m,
         && (compose
             || (parent_type == -1
                 && ascii_strcasecmp ("alternative", m->subtype)))
-        && (!(WithCrypto & APPLICATION_PGP)
-            || !mutt_is_multipart_encrypted (m))
+        && (!mutt_is_multipart_encrypted (m))
       ) {
       idx =
         mutt_gen_attach_list (m->parts, m->type, idx, idxlen, idxmax, level,
@@ -155,14 +140,12 @@ ATTACHPTR **mutt_gen_attach_list (BODY * m,
       new->level = level;
 
       /* We don't support multipart messages in the compose menu yet */
-      if (!compose && !m->collapsed &&
-          ((m->type == TYPEMULTIPART && (!(WithCrypto & APPLICATION_PGP)
-                                         || !mutt_is_multipart_encrypted (m))
-           )
-           || mutt_is_message_type (m->type, m->subtype))) {
-        idx =
-          mutt_gen_attach_list (m->parts, m->type, idx, idxlen, idxmax,
-                                level + 1, compose);
+      if (!compose && !m->collapsed
+      &&  ((m->type == TYPEMULTIPART && !mutt_is_multipart_encrypted(m))
+      ||  mutt_is_message_type(m)))
+      {
+        idx = mutt_gen_attach_list (m->parts, m->type, idx, idxlen, idxmax,
+                                    level + 1, compose);
       }
     }
   }
@@ -189,7 +172,7 @@ ATTACHPTR **mutt_gen_attach_list (BODY * m,
  * %u = unlink 
  */
 const char *mutt_attach_fmt (char *dest,
-                             size_t destlen,
+                             ssize_t destlen,
                              char op,
                              const char *src,
                              const char *prefix,
@@ -202,7 +185,7 @@ const char *mutt_attach_fmt (char *dest,
   char charset[SHORT_STRING];
   ATTACHPTR *aptr = (ATTACHPTR *) data;
   int optional = (flags & M_FORMAT_OPTIONAL);
-  size_t l;
+  ssize_t l;
 
   switch (op) {
   case 'C':
@@ -234,8 +217,8 @@ const char *mutt_attach_fmt (char *dest,
         mutt_format_s (dest, destlen, prefix, aptr->content->description);
         break;
       }
-      if (mutt_is_message_type (aptr->content->type, aptr->content->subtype)
-          && MsgFmt && aptr->content->hdr) {
+      if (mutt_is_message_type(aptr->content) && MsgFmt && aptr->content->hdr)
+      {
         char s[SHORT_STRING];
 
         _mutt_make_string (s, sizeof (s), MsgFmt, NULL, aptr->content->hdr,
@@ -252,8 +235,7 @@ const char *mutt_attach_fmt (char *dest,
       }
     }
     else if (aptr->content->description ||
-             (mutt_is_message_type
-              (aptr->content->type, aptr->content->subtype)
+             (mutt_is_message_type(aptr->content)
               && MsgFmt && aptr->content->hdr))
       break;
     /* FALLS THROUGH TO 'f' */
@@ -369,7 +351,7 @@ const char *mutt_attach_fmt (char *dest,
   return (src);
 }
 
-static void attach_entry (char *b, size_t blen, MUTTMENU * menu, int num)
+static void attach_entry (char *b, ssize_t blen, MUTTMENU * menu, int num)
 {
   int w=(COLS-SW)>blen?blen:(COLS-SW);
   mutt_FormatString (b, w, NONULL (AttachFormat), mutt_attach_fmt,
@@ -386,16 +368,6 @@ int mutt_tag_attach (MUTTMENU * menu, int n, int m)
   return cur->tagged - ot;
 }
 
-int mutt_is_message_type (int type, const char *subtype)
-{
-  if (type != TYPEMESSAGE)
-    return 0;
-
-  subtype = NONULL (subtype);
-  return (ascii_strcasecmp (subtype, "rfc822") == 0
-          || ascii_strcasecmp (subtype, "news") == 0);
-}
-
 static int mutt_query_save_attachment (FILE * fp, BODY * body, HEADER * hdr,
                                        char **directory)
 {
@@ -417,7 +389,7 @@ static int mutt_query_save_attachment (FILE * fp, BODY * body, HEADER * hdr,
   else if (body->hdr &&
            body->encoding != ENCBASE64 &&
            body->encoding != ENCQUOTEDPRINTABLE &&
-           mutt_is_message_type (body->type, body->subtype))
+           mutt_is_message_type(body))
     mutt_default_save (buf, sizeof (buf), body->hdr);
   else
     buf[0] = 0;
@@ -441,7 +413,7 @@ static int mutt_query_save_attachment (FILE * fp, BODY * body, HEADER * hdr,
         return -1;
     }
     else {
-      mutt_extract_path (buf, path);
+      mutt_extract_path (buf, path, sizeof(path));
       m_strcpy(LastSaveFolder, sizeof(LastSaveFolder), path);
     }
 
@@ -452,7 +424,7 @@ static int mutt_query_save_attachment (FILE * fp, BODY * body, HEADER * hdr,
                   body->hdr &&
                   body->encoding != ENCBASE64 &&
                   body->encoding != ENCQUOTEDPRINTABLE &&
-                  mutt_is_message_type (body->type, body->subtype));
+                  mutt_is_message_type(body));
 
     if (is_message) {
       struct stat st;
@@ -522,14 +494,14 @@ void mutt_save_attachment_list (FILE * fp, int tag, BODY * top, HEADER * hdr,
           rc = mutt_save_attachment (fp, top, tfile, append, hdr);
           if (rc == 0 && AttachSep && (fpout = fopen (tfile, "a")) != NULL) {
             fprintf (fpout, "%s", AttachSep);
-            fclose (fpout);
+            m_fclose(&fpout);
           }
         }
         else {
           rc = mutt_save_attachment (fp, top, tfile, M_SAVE_APPEND, hdr);
           if (rc == 0 && AttachSep && (fpout = fopen (tfile, "a")) != NULL) {
             fprintf (fpout, "%s", AttachSep);
-            fclose (fpout);
+            m_fclose(&fpout);
           }
         }
       }
@@ -566,12 +538,12 @@ void mutt_save_attachment_list (FILE * fp, int tag, BODY * top, HEADER * hdr,
 }
 
 static void
-mutt_query_pipe_attachment (char *command, FILE * fp, BODY * body, int filter)
+mutt_query_pipe_attachment (char *command, FILE * fp, BODY * body, int afilter)
 {
   char tfile[_POSIX_PATH_MAX];
   char warning[STRING + _POSIX_PATH_MAX];
 
-  if (filter) {
+  if (afilter) {
     snprintf (warning, sizeof (warning),
               _("WARNING!  You are about to overwrite %s, continue?"),
               body->filename);
@@ -585,7 +557,7 @@ mutt_query_pipe_attachment (char *command, FILE * fp, BODY * body, int filter)
     tfile[0] = 0;
 
   if (mutt_pipe_attachment (fp, body, command, tfile)) {
-    if (filter) {
+    if (afilter) {
       mutt_unlink (body->filename);
       mutt_rename_file (tfile, body->filename);
       mutt_update_encoding (body);
@@ -593,7 +565,7 @@ mutt_query_pipe_attachment (char *command, FILE * fp, BODY * body, int filter)
     }
   }
   else {
-    if (filter && tfile[0])
+    if (afilter && tfile[0])
       mutt_unlink (tfile);
   }
 }
@@ -614,7 +586,7 @@ static void pipe_attachment (FILE * fp, BODY * b, STATE * state)
       return;
     }
     mutt_copy_stream (ifp, state->fpout);
-    fclose (ifp);
+    m_fclose(&ifp);
     if (AttachSep)
       state_puts (AttachSep, state);
   }
@@ -622,50 +594,50 @@ static void pipe_attachment (FILE * fp, BODY * b, STATE * state)
 
 static void
 pipe_attachment_list (char *command, FILE * fp, int tag, BODY * top,
-                      int filter, STATE * state)
+                      int afilter, STATE * state)
 {
   for (; top; top = top->next) {
     if (!tag || top->tagged) {
-      if (!filter && !option (OPTATTACHSPLIT))
+      if (!afilter && !option (OPTATTACHSPLIT))
         pipe_attachment (fp, top, state);
       else
-        mutt_query_pipe_attachment (command, fp, top, filter);
+        mutt_query_pipe_attachment (command, fp, top, afilter);
     }
     else if (top->parts)
-      pipe_attachment_list (command, fp, tag, top->parts, filter, state);
+      pipe_attachment_list (command, fp, tag, top->parts, afilter, state);
     if (!tag)
       break;
   }
 }
 
-void mutt_pipe_attachment_list (FILE * fp, int tag, BODY * top, int filter)
+void mutt_pipe_attachment_list (FILE * fp, int tag, BODY * top, int afilter)
 {
   STATE state;
   char buf[SHORT_STRING];
   pid_t thepid;
 
   if (fp)
-    filter = 0;                 /* sanity check: we can't filter in the recv case yet */
+    afilter = 0;                 /* sanity check: we can't filter in the recv case yet */
 
   buf[0] = 0;
   p_clear(&state, 1);
 
-  if (mutt_get_field ((filter ? _("Filter through: ") : _("Pipe to: ")),
+  if (mutt_get_field ((afilter ? _("Filter through: ") : _("Pipe to: ")),
                       buf, sizeof (buf), M_CMD) != 0 || !buf[0])
     return;
 
   mutt_expand_path (buf, sizeof (buf));
 
-  if (!filter && !option (OPTATTACHSPLIT)) {
+  if (!afilter && !option (OPTATTACHSPLIT)) {
     mutt_endwin (NULL);
     thepid = mutt_create_filter (buf, &state.fpout, NULL, NULL);
-    pipe_attachment_list (buf, fp, tag, top, filter, &state);
-    fclose (state.fpout);
+    pipe_attachment_list (buf, fp, tag, top, afilter, &state);
+    m_fclose(&state.fpout);
     if (mutt_wait_filter (thepid) != 0 || option (OPTWAITKEY))
       mutt_any_key_to_continue (NULL);
   }
   else
-    pipe_attachment_list (buf, fp, tag, top, filter, &state);
+    pipe_attachment_list (buf, fp, tag, top, afilter, &state);
 }
 
 static int can_print (BODY * top, int tag)
@@ -718,7 +690,7 @@ static void print_attachment_list (FILE * fp, int tag, BODY * top,
               0) {
             if ((ifp = fopen (newfile, "r")) != NULL) {
               mutt_copy_stream (ifp, state->fpout);
-              fclose (ifp);
+              m_fclose(&ifp);
               if (AttachSep)
                 state_puts (AttachSep, state);
             }
@@ -755,7 +727,7 @@ void mutt_print_attachment_list (FILE * fp, int tag, BODY * top)
     p_clear(&state, 1);
     thepid = mutt_create_filter (NONULL (PrintCmd), &state.fpout, NULL, NULL);
     print_attachment_list (fp, tag, top, &state);
-    fclose (state.fpout);
+    m_fclose(&state.fpout);
     if (mutt_wait_filter (thepid) != 0 || option (OPTWAITKEY))
       mutt_any_key_to_continue (NULL);
   }
@@ -793,12 +765,6 @@ mutt_attach_display_loop (MUTTMENU * menu, int op, FILE * fp, HEADER * hdr,
 {
   ATTACHPTR **idx = *idxp;
 
-#if 0
-  int old_optweed = option (OPTWEED);
-
-  set_option (OPTWEED);
-#endif
-
   do {
     switch (op) {
     case OP_DISPLAY_HEADERS:
@@ -840,8 +806,7 @@ mutt_attach_display_loop (MUTTMENU * menu, int op, FILE * fp, HEADER * hdr,
       break;
       /* functions which are passed through from the pager */
     case OP_CHECK_TRADITIONAL:
-      if (!(WithCrypto & APPLICATION_PGP)
-          || (hdr && hdr->security & PGP_TRADITIONAL_CHECKED)) {
+      if (hdr && hdr->security & PGP_TRADITIONAL_CHECKED) {
         op = OP_NULL;
         break;
       }
@@ -855,10 +820,6 @@ mutt_attach_display_loop (MUTTMENU * menu, int op, FILE * fp, HEADER * hdr,
   }
   while (op != OP_NULL);
 
-#if 0
-  if (option (OPTWEED) != old_optweed)
-    toggle_option (OPTWEED);
-#endif
   return op;
 }
 
@@ -870,10 +831,9 @@ static void attach_collapse (BODY * b, short collapse, short init,
   for (; b; b = b->next) {
     i = init || b->collapsed;
     if (i && option (OPTDIGESTCOLLAPSE) && b->type == TYPEMULTIPART
-        && !ascii_strcasecmp (b->subtype, "digest"))
+        && mime_which_token(b->subtype, -1) == MIME_DIGEST)
       attach_collapse (b->parts, 1, 1, 0);
-    else if (b->type == TYPEMULTIPART
-             || mutt_is_message_type (b->type, b->subtype))
+    else if (b->type == TYPEMULTIPART || mutt_is_message_type(b))
       attach_collapse (b->parts, collapse, i, 0);
     b->collapsed = collapse;
     if (just_one)
@@ -891,19 +851,6 @@ void mutt_attach_init (BODY * b)
   }
 }
 
-static const char *Function_not_permitted =
-N_("Function not permitted in attach-message mode.");
-
-#define CHECK_ATTACH if(option(OPTATTACHMSG)) \
-		     {\
-			mutt_flushinp (); \
-			mutt_error _(Function_not_permitted); \
-			break; \
-		     }
-
-
-
-
 void mutt_view_attachments (HEADER * hdr)
 {
   int secured = 0;
@@ -929,17 +876,16 @@ void mutt_view_attachments (HEADER * hdr)
     return;
 
 
-  if (WithCrypto && ((hdr->security & ENCRYPT) ||
-                     (mutt_is_application_smime (hdr->content) &
-                      SMIMEOPAQUE))) {
+  if ((hdr->security & ENCRYPT) ||
+      (mutt_is_application_smime (hdr->content) & SMIMEOPAQUE))
+  {
     need_secured = 1;
 
     if ((hdr->security & ENCRYPT) && !crypt_valid_passphrase (hdr->security)) {
       mx_close_message (&msg);
       return;
     }
-    if ((WithCrypto & APPLICATION_SMIME)
-        && (hdr->security & APPLICATION_SMIME)) {
+    if (hdr->security & APPLICATION_SMIME) {
       if (hdr->env)
         crypt_smime_getkeys (hdr->env);
 
@@ -956,14 +902,14 @@ void mutt_view_attachments (HEADER * hdr)
           cur = NULL;
           secured = !crypt_smime_decrypt_mime (_fp, &fp, _cur, &cur);
 
-          mutt_free_body (&_cur);
-          safe_fclose (&_fp);
+          body_list_wipe(&_cur);
+          m_fclose(&_fp);
         }
       }
       else
         need_secured = 0;
     }
-    if ((WithCrypto & APPLICATION_PGP) && (hdr->security & APPLICATION_PGP)) {
+    if (hdr->security & APPLICATION_PGP) {
       if (mutt_is_multipart_encrypted (hdr->content))
         secured = !crypt_pgp_decrypt_mime (msg->fp, &fp, hdr->content, &cur);
       else
@@ -978,7 +924,7 @@ void mutt_view_attachments (HEADER * hdr)
     }
   }
 
-  if (!WithCrypto || !need_secured) {
+  if (!need_secured) {
     fp = msg->fp;
     cur = hdr->content;
   }
@@ -995,9 +941,16 @@ void mutt_view_attachments (HEADER * hdr)
   attach_collapse (cur, 0, 1, 0);
   mutt_update_attach_index (cur, &idx, &idxlen, &idxmax, menu);
 
+#define CHECK_ATTACH \
+    if (option(OPTATTACHMSG)) {                                         \
+        mutt_flushinp ();                                               \
+        mutt_error _("Function not permitted in attach-message mode."); \
+        break;                                                          \
+    }
+
   for (;;) {
     if (op == OP_NULL)
-      op = mutt_menuLoop (menu);
+      op = mutt_menuLoop(menu);
     switch (op) {
     case OP_ATTACH_VIEW_MAILCAP:
       mutt_view_attachment (fp, idx[menu->current]->content, M_MAILCAP,
@@ -1037,21 +990,19 @@ void mutt_view_attachments (HEADER * hdr)
       break;
 
     case OP_EXTRACT_KEYS:
-      if ((WithCrypto & APPLICATION_PGP)) {
-        crypt_pgp_extract_keys_from_attachment_list (fp, menu->tagprefix,
-                                                     menu->
-                                                     tagprefix ? cur :
-                                                     idx[menu->current]->
-                                                     content);
-        menu->redraw = REDRAW_FULL;
-      }
+      crypt_pgp_extract_keys_from_attachment_list (fp, menu->tagprefix,
+                                                   menu->
+                                                   tagprefix ? cur :
+                                                   idx[menu->current]->
+                                                   content);
+      menu->redraw = REDRAW_FULL;
       break;
 
     case OP_CHECK_TRADITIONAL:
-      if ((WithCrypto & APPLICATION_PGP)
-          && crypt_pgp_check_traditional (fp, menu->tagprefix ? cur
+      if (crypt_pgp_check_traditional (fp, menu->tagprefix ? cur
                                           : idx[menu->current]->content,
-                                          menu->tagprefix)) {
+                                          menu->tagprefix))
+      {
         hdr->security = crypt_query (cur);
         menu->redraw = REDRAW_FULL;
       }
@@ -1084,14 +1035,12 @@ void mutt_view_attachments (HEADER * hdr)
     case OP_DELETE:
       CHECK_READONLY;
 
-#ifdef USE_POP
       if (Context->magic == M_POP) {
         mutt_flushinp ();
         mutt_error _("Can't delete attachment from POP server.");
 
         break;
       }
-#endif
 
 #ifdef USE_NNTP
       if (Context->magic == M_NNTP) {
@@ -1102,10 +1051,9 @@ void mutt_view_attachments (HEADER * hdr)
       }
 #endif
 
-      if (WithCrypto && (hdr->security & (~PGP_TRADITIONAL_CHECKED))) {
+      if (hdr->security & (~PGP_TRADITIONAL_CHECKED)) {
         mutt_message
-          _
-          ("Deletion of attachments from encrypted messages is unsupported.");
+          _("Deletion of attachments from encrypted messages is unsupported.");
       }
       else {
         if (!menu->tagprefix) {
@@ -1251,9 +1199,9 @@ void mutt_view_attachments (HEADER * hdr)
       p_delete(&idx);
       idxmax = 0;
 
-      if (WithCrypto && need_secured && secured) {
-        fclose (fp);
-        mutt_free_body (&cur);
+      if (need_secured && secured) {
+        m_fclose(&fp);
+        body_list_wipe(&cur);
       }
 
       mutt_menuDestroy (&menu);
@@ -1262,6 +1210,5 @@ void mutt_view_attachments (HEADER * hdr)
 
     op = OP_NULL;
   }
-
   /* not reached */
 }