X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=attach.c;h=3fbe7d2faf81442e2456348ac3048220592a30ee;hp=9e3bbb9dec9527003921c8a750e756d30cba5094;hb=201fd8633cc86ccda413c919ae6e2ae04e89b4a9;hpb=c98480f8568e6c1bc927c6c5f2b5e80b4aa6548c

diff --git a/attach.c b/attach.c
index 9e3bbb9..3fbe7d2 100644
--- a/attach.c
+++ b/attach.c
@@ -18,18 +18,20 @@
 #include <lib-lib/file.h>
 #include <lib-lib/macros.h>
 
+#include <lib-mime/mime.h>
+
+#include <lib-ui/curses.h>
+#include <lib-ui/menu.h>
+
 #include "mutt.h"
 #include "handler.h"
 #include "recvattach.h"
-#include "mutt_menu.h"
-#include "mutt_curses.h"
 #include "keymap.h"
 #include "rfc1524.h"
-#include "mime.h"
 #include "pager.h"
 #include "copy.h"
 #include "mx.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
 
 #include "lib/debug.h"
 
@@ -65,7 +67,7 @@ int mutt_get_tmp_attachment (BODY * a)
 
   if ((fpin = fopen (a->filename, "r")) && (fpout = safe_fopen (tempfile, "w"))) {      /* __FOPEN_CHECKED__ */
     mutt_copy_stream (fpin, fpout);
-    str_replace (&a->filename, tempfile);
+    m_strreplace(&a->filename, tempfile);
     a->unlink = 1;
 
     if (a->stamp >= st.st_mtime)
@@ -98,9 +100,9 @@ int mutt_compose_attachment (BODY * a)
     if (entry->composecommand || entry->composetypecommand) {
 
       if (entry->composetypecommand)
-        strfcpy (command, entry->composetypecommand, sizeof (command));
+        m_strcpy(command, sizeof(command), entry->composetypecommand);
       else
-        strfcpy (command, entry->composecommand, sizeof (command));
+        m_strcpy(command, sizeof(command), entry->composecommand);
       if (rfc1524_expand_filename (entry->nametemplate,
                                    a->filename, newfile, sizeof (newfile))) {
         debug_print (1, ("oldfile: %s\t newfile: %s\n", a->filename, newfile));
@@ -113,7 +115,7 @@ int mutt_compose_attachment (BODY * a)
           unlink_newfile = 1;
       }
       else
-        strfcpy (newfile, a->filename, sizeof (newfile));
+        m_strcpy(newfile, sizeof(newfile), a->filename);
 
       if (rfc1524_expand_command (a, newfile, type,
                                   command, sizeof (command))) {
@@ -141,7 +143,7 @@ int mutt_compose_attachment (BODY * a)
           b = mutt_read_mime_header (fp, 0);
           if (b) {
             if (b->parameter) {
-              mutt_free_parameter (&a->parameter);
+              parameter_delete(&a->parameter);
               a->parameter = b->parameter;
               b->parameter = NULL;
             }
@@ -221,7 +223,7 @@ int mutt_edit_attachment (BODY * a)
   if (rfc1524_mailcap_lookup (a, type, entry, M_EDIT)) {
     if (entry->editcommand) {
 
-      strfcpy (command, entry->editcommand, sizeof (command));
+      m_strcpy(command, sizeof(command), entry->editcommand);
       if (rfc1524_expand_filename (entry->nametemplate,
                                    a->filename, newfile, sizeof (newfile))) {
         debug_print (1, ("oldfile: %s\t newfile: %s\n", a->filename, newfile));
@@ -234,7 +236,7 @@ int mutt_edit_attachment (BODY * a)
           unlink_newfile = 1;
       }
       else
-        strfcpy (newfile, a->filename, sizeof (newfile));
+        m_strcpy(newfile, sizeof(newfile), a->filename);
 
       if (rfc1524_expand_command (a, newfile, type,
                                   command, sizeof (command))) {
@@ -283,7 +285,7 @@ static int is_mmnoask (const char *buf)
     if (m_strcmp(p, "1") == 0)
       return (1);
 
-    strfcpy (tmp, p, sizeof (tmp));
+    m_strcpy(tmp, sizeof(tmp), p);
     p = tmp;
 
     while ((p = strtok (p, ",")) != NULL) {
@@ -321,9 +323,11 @@ void mutt_check_lookup_list (BODY * b, char *type, int len)
          ascii_strncasecmp (type, t->data, i) == 0) ||
         ascii_strcasecmp (type, t->data) == 0) {
 
-      BODY tmp = { 0 };
+      BODY tmp;
       int n;
 
+      p_clear(&tmp, 1);
+
       if ((n = mutt_lookup_mime_type (&tmp, b->filename)) != TYPEOTHER) {
         snprintf (type, len, "%s/%s",
                   n == TYPEAUDIO ? "audio" :
@@ -396,7 +400,7 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
   int unlink_tempfile = 0;
 
   is_message = mutt_is_message_type (a->type, a->subtype);
-  if (WithCrypto && is_message && a->hdr && (a->hdr->security & ENCRYPT) &&
+  if (is_message && a->hdr && (a->hdr->security & ENCRYPT) &&
       !crypt_valid_passphrase (a->hdr->security))
     return (rc);
   use_mailcap = (flag == M_MAILCAP ||
@@ -425,7 +429,7 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
 
       goto return_error;
     }
-    strfcpy (command, entry->command, sizeof (command));
+    m_strcpy(command, sizeof(command), entry->command);
 
     if (fp) {
       fname = m_strdup(a->filename);
@@ -441,7 +445,7 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
         if (safe_symlink (a->filename, tempfile) == -1) {
           if (mutt_yesorno (_("Can't match nametemplate, continue?"), M_YES)
               == M_YES)
-            strfcpy (tempfile, a->filename, sizeof (tempfile));
+            m_strcpy(tempfile, sizeof(tempfile), a->filename);
           else
             goto return_error;
         }
@@ -450,7 +454,7 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
       }
     }
     else if (fp == NULL)        /* send case */
-      strfcpy (tempfile, a->filename, sizeof (tempfile));
+      m_strcpy(tempfile, sizeof(tempfile), a->filename);
 
     if (fp) {
       /* recv case: we need to save the attachment to a file */
@@ -467,7 +471,7 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
   if (use_pager) {
     if (fp && !use_mailcap && a->filename) {
       /* recv case */
-      strfcpy (pagerfile, a->filename, sizeof (pagerfile));
+      m_strcpy(pagerfile, sizeof(pagerfile), a->filename);
       mutt_adv_mktemp (NULL, pagerfile, sizeof (pagerfile));
     }
     else
@@ -555,7 +559,7 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
     }
 
     if (a->description)
-      strfcpy (descrip, a->description, sizeof (descrip));
+      m_strcpy(descrip, sizeof(descrip), a->description);
     else if (a->filename)
       snprintf (descrip, sizeof (descrip), "---Attachment: %s : %s",
                 a->filename, type);
@@ -862,7 +866,7 @@ int mutt_decode_save_attachment (FILE * fp, BODY * m, char *path,
     m->length = 0;
     m->encoding = saved_encoding;
     if (saved_parts) {
-      mutt_free_header (&m->hdr);
+      header_delete(&m->hdr);
       m->parts = saved_parts;
       m->hdr = saved_hdr;
     }
@@ -907,7 +911,7 @@ int mutt_print_attachment (FILE * fp, BODY * a)
             rfc1524_free_entry (&entry);
             return 0;
           }
-          strfcpy (newfile, a->filename, sizeof (newfile));
+          m_strcpy(newfile, sizeof(newfile), a->filename);
         }
         else
           unlink_newfile = 1;
@@ -918,9 +922,9 @@ int mutt_print_attachment (FILE * fp, BODY * a)
     if (fp)
       mutt_save_attachment (fp, a, newfile, 0, NULL);
 
-    strfcpy (command, entry->printcommand, sizeof (command));
-    piped =
-      rfc1524_expand_command (a, newfile, type, command, sizeof (command));
+    m_strcpy(command, sizeof(command), entry->printcommand);
+    piped = rfc1524_expand_command(a, newfile, type, command,
+                                   sizeof(command));
 
     mutt_endwin (NULL);