X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=attach.c;h=00df99c9a332944d9edd2e70ca5a6ed50acbc189;hp=f917c1fa6dc0c0f9cfefb3d443ee114b73a33c33;hb=6920eb5798f2d9f25e5ea1af2ba86122cf408bd1;hpb=1a79031e2cd056f6f7d95dfaccc58323251521ba

diff --git a/attach.c b/attach.c
index f917c1f..00df99c 100644
--- a/attach.c
+++ b/attach.c
@@ -12,7 +12,7 @@
 
 #include <lib-sys/unix.h>
 #include <lib-mime/mime.h>
-#include <lib-ui/curses.h>
+#include <lib-ui/lib-ui.h>
 #include <lib-ui/menu.h>
 #include <lib-mx/mx.h>
 
@@ -22,7 +22,7 @@
 #include "keymap.h"
 #include "pager.h"
 #include "copy.h"
-#include <lib-crypt/crypt.h>
+#include "crypt.h"
 
 int mutt_get_tmp_attachment (BODY * a)
 {
@@ -138,7 +138,7 @@ int mutt_compose_attachment (BODY * a)
             /* Remove headers by copying out data to another file, then 
              * copying the file back */
             fseeko (fp, b->offset, 0);
-            tfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+            tfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(mod_core.tmpdir), NULL);
             if (!tfp) {
               mutt_perror (_("Failure to open file to strip headers."));
               goto bailout;
@@ -228,7 +228,7 @@ int mutt_edit_attachment (BODY * a)
   }
   else if (a->type == TYPETEXT) {
     /* On text, default to editor */
-    mutt_edit_file (NONULL (Editor), a->filename);
+    mutt_edit_file(a->filename);
   } else {
     rfc1524_entry_delete(&entry);
     mutt_error (_("No mailcap edit entry for %s"), type);
@@ -255,7 +255,7 @@ static int is_mmnoask (const char *buf)
 
   if ((p = getenv ("MM_NOASK")) != NULL && *p) {
     if (m_strcmp(p, "1") == 0)
-      return (1);
+      return 1;
 
     m_strcpy(tmp, sizeof(tmp), p);
     p = tmp;
@@ -264,22 +264,22 @@ static int is_mmnoask (const char *buf)
       if ((q = strrchr (p, '/')) != NULL) {
         if (*(q + 1) == '*') {
           if (ascii_strncasecmp (buf, p, q - p) == 0)
-            return (1);
+            return 1;
         } else {
           if (ascii_strcasecmp (buf, p) == 0)
-            return (1);
+            return 1;
         }
       } else {
         lng = m_strlen(p);
         if (buf[lng] == '/' && m_strncasecmp(buf, p, lng) == 0)
-          return (1);
+          return 1;
       }
 
       p = NULL;
     }
   }
 
-  return (0);
+  return 0;
 }
 
 void mutt_check_lookup_list (BODY * b, char *type, int len)
@@ -370,9 +370,6 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
   int pagerfd = -1;
 
   is_message = mutt_is_message_type(a);
-  if (is_message && a->hdr && (a->hdr->security & ENCRYPT) &&
-      !crypt_valid_passphrase (a->hdr->security))
-    return (rc);
   use_mailcap = (flag == M_MAILCAP ||
                  (flag == M_REGULAR && rfc1524_mailcap_isneeded(a)));
   snprintf (type, sizeof (type), "%s/%s", TYPE (a), a->subtype);
@@ -440,7 +437,7 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
 
   if (use_pager) {
     /* recv case */
-    pagerfd = m_tempfd(pagerfile, sizeof(pagerfile), NONULL(Tempdir),
+    pagerfd = m_tempfd(pagerfile, sizeof(pagerfile), NONULL(mod_core.tmpdir),
                        fp && !use_mailcap ? a->filename : NULL);
   }
 
@@ -536,19 +533,10 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
   /* We only reach this point if there have been no errors */
 
   if (use_pager) {
-    pager_t info;
-    p_clear(&info, 1);
-
-    info.fp  = fp;
-    info.bdy = a;
-    info.ctx = Context;
-    info.idx = idx;
-    info.idxlen = idxlen;
-    info.hdr = hdr;
-
-    rc = mutt_do_pager(descrip, pagerfile,
-                       M_PAGER_ATTACHMENT | (is_message ? M_PAGER_MESSAGE : 0),
-                       &info);
+    pager_t info = { Context, hdr, a, fp, idx, idxlen };
+    rc = mutt_pager(descrip, pagerfile,
+                    M_PAGER_ATTACHMENT | (is_message ? M_PAGER_MESSAGE : 0),
+                    &info);
     *pagerfile = '\0';
   }
   else
@@ -570,8 +558,7 @@ return_error:
 }
 
 /* returns 1 on success, 0 on error */
-int mutt_pipe_attachment (FILE * fp, BODY * b, const char *path,
-                          int out)
+int mutt_pipe_attachment(FILE * fp, BODY * b, const char *path, int out)
 {
   pid_t thepid;
   int rv = 0;
@@ -583,7 +570,7 @@ int mutt_pipe_attachment (FILE * fp, BODY * b, const char *path,
     STATE s;
     p_clear(&s, 1);
 
-    if (out)
+    if (out >= 0)
       thepid = mutt_create_filter_fd(path, &s.fpout, NULL, NULL, -1, out, -1);
     else
       thepid = mutt_create_filter(path, &s.fpout, NULL, NULL);
@@ -597,8 +584,7 @@ int mutt_pipe_attachment (FILE * fp, BODY * b, const char *path,
     s.fpin = fp;
     mutt_decode_attachment (b, &s);
     m_fclose(&s.fpout);
-  }
-  else {
+  } else {
     /* send case */
 
     FILE *ifp, *ofp;
@@ -608,10 +594,10 @@ int mutt_pipe_attachment (FILE * fp, BODY * b, const char *path,
       return 0;
     }
 
-    if (out)
-      thepid = mutt_create_filter_fd (path, &ofp, NULL, NULL, -1, out, -1);
+    if (out >= 0)
+      thepid = mutt_create_filter_fd(path, &ofp, NULL, NULL, -1, out, -1);
     else
-      thepid = mutt_create_filter (path, &ofp, NULL, NULL);
+      thepid = mutt_create_filter(path, &ofp, NULL, NULL);
 
     if (thepid < 0) {
       mutt_perror (_("Can't create filter"));
@@ -629,16 +615,16 @@ int mutt_pipe_attachment (FILE * fp, BODY * b, const char *path,
 
 bail:
 
-  if (out)
-    close (out);
+  if (out >= 0)
+    close(out);
 
   /*
    * check for error exit from child process
    */
-  if (mutt_wait_filter (thepid) != 0)
+  if (mutt_wait_filter(thepid) != 0)
     rv = 0;
 
-  if (rv == 0 || option (OPTWAITKEY))
+  if (rv == 0 || option(OPTWAITKEY))
     mutt_any_key_to_continue (NULL);
   return rv;
 }
@@ -694,7 +680,7 @@ int mutt_save_attachment (FILE * fp, BODY * m, char *path, int flags,
         mx_close_mailbox (&ctx, NULL);
         return -1;
       }
-      if (ctx.magic == M_MBOX || ctx.magic == M_MMDF)
+      if (ctx.magic == M_MBOX)
         chflags = CH_FROM;
       chflags |= (ctx.magic == M_MAILDIR ? CH_NOSTATUS : CH_UPDATE);
       if (_mutt_copy_message (msg->fp, fp, hn, hn->content, 0, chflags) == 0
@@ -715,14 +701,14 @@ int mutt_save_attachment (FILE * fp, BODY * m, char *path, int flags,
 
       if ((s.fpout = mutt_save_attachment_open (path, flags)) == NULL) {
         mutt_perror ("fopen");
-        return (-1);
+        return -1;
       }
       fseeko ((s.fpin = fp), m->offset, 0);
       mutt_decode_attachment (m, &s);
 
       if (m_fclose(&s.fpout) != 0) {
         mutt_perror ("fclose");
-        return (-1);
+        return -1;
       }
     }
   } else {
@@ -732,13 +718,13 @@ int mutt_save_attachment (FILE * fp, BODY * m, char *path, int flags,
 
     if ((ofp = fopen (m->filename, "r")) == NULL) {
       mutt_perror ("fopen");
-      return (-1);
+      return -1;
     }
 
     if ((nfp = mutt_save_attachment_open (path, flags)) == NULL) {
       mutt_perror ("fopen");
       m_fclose(&ofp);
-      return (-1);
+      return -1;
     }
 
     if (mutt_copy_stream (ofp, nfp) == -1) {
@@ -746,7 +732,7 @@ int mutt_save_attachment (FILE * fp, BODY * m, char *path, int flags,
 
       m_fclose(&ofp);
       m_fclose(&nfp);
-      return (-1);
+      return -1;
     }
     m_fclose(&ofp);
     m_fclose(&nfp);
@@ -771,7 +757,7 @@ int mutt_decode_save_attachment (FILE * fp, BODY * m, int pathfd,
   if (s.fpout == NULL) {
     close(pathfd);
     mutt_perror ("fopen");
-    return (-1);
+    return -1;
   }
 
   if (fp == NULL) {
@@ -782,12 +768,12 @@ int mutt_decode_save_attachment (FILE * fp, BODY * m, int pathfd,
     if (stat (m->filename, &st) == -1) {
       mutt_perror ("stat");
       m_fclose(&s.fpout);
-      return (-1);
+      return -1;
     }
 
     if ((s.fpin = fopen (m->filename, "r")) == NULL) {
       mutt_perror ("fopen");
-      return (-1);
+      return -1;
     }
 
     saved_encoding = m->encoding;
@@ -822,7 +808,7 @@ int mutt_decode_save_attachment (FILE * fp, BODY * m, int pathfd,
     m_fclose(&s.fpin);
   }
 
-  return (0);
+  return 0;
 }
 
 /* Ok, the difference between send and receive:
@@ -881,7 +867,7 @@ int mutt_print_attachment (FILE * fp, BODY * a)
       if ((ifp = fopen (newfile, "r")) == NULL) {
         mutt_perror ("fopen");
         rfc1524_entry_delete(&entry);
-        return (0);
+        return 0;
       }
 
       if ((thepid = mutt_create_filter (command, &fpout, NULL, NULL)) < 0) {
@@ -908,12 +894,12 @@ int mutt_print_attachment (FILE * fp, BODY * a)
       unlink (newfile);
 
     rfc1524_entry_delete(&entry);
-    return (1);
+    return 1;
   }
 
   tok = mime_which_token(type, -1);
   if (tok == MIME_TEXT_PLAIN || tok == MIME_APPLICATION_POSTSCRIPT) {
-    return (mutt_pipe_attachment (fp, a, NONULL (PrintCmd), 0));
+    return mutt_pipe_attachment(fp, a, NONULL (PrintCmd), -1);
   }
 
   if (mutt_can_decode (a)) {
@@ -925,7 +911,7 @@ int mutt_print_attachment (FILE * fp, BODY * a)
     ifp = NULL;
     fpout = NULL;
 
-    newfile_fd = m_tempfd(newfile, sizeof(newfile), NONULL(Tempdir), NULL);
+    newfile_fd = m_tempfd(newfile, sizeof(newfile), NONULL(mod_core.tmpdir), NULL);
     if (mutt_decode_save_attachment (fp, a, newfile_fd, M_PRINTING) == 0) {
 
       if ((ifp = fopen(newfile, "r")) == NULL) {
@@ -970,7 +956,7 @@ int mutt_attach_check (HEADER* hdr) {
 
   if (!hdr || !hdr->content || !((regex_t*) AttachRemindRegexp.rx) ||
       (fp = safe_fopen (hdr->content->filename, "r")) == NULL)
-    return (0);
+    return 0;
 
   while (!found && fgets (buf, sizeof (buf), fp)) {
     p = buf;
@@ -985,5 +971,5 @@ int mutt_attach_check (HEADER* hdr) {
   }
   m_fclose(&fp);
 
-  return (found);
+  return found;
 }