X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=muttlib.c;h=fc9606d6160e6494a2b3c6698b175993471f4ce2;hb=8d5f74a1030b2e5e93027c91c35b7facea2d61be;hp=29380660ae430d266b31aa76d1418194326bec45;hpb=ac813896ca32d850febc2d95065ac4fa040f11f9;p=apps%2Fmadmutt.git

diff --git a/muttlib.c b/muttlib.c
index 2938066..fc9606d 100644
--- a/muttlib.c
+++ b/muttlib.c
@@ -12,16 +12,18 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <ctype.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/wait.h>
 #include <errno.h>
-#include <sys/stat.h>
 #include <fcntl.h>
-#include <time.h>
+#include <grp.h>
+#include <pwd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/wait.h>
+#include <time.h>
+#include <unistd.h>
 #include <utime.h>
 
 #include <lib-lib/mem.h>
@@ -30,7 +32,6 @@
 #include <lib-lib/macros.h>
 #include <lib-lib/buffer.h>
 #include <lib-lib/file.h>
-#include <lib-lib/debug.h>
 #include <lib-lib/url.h>
 
 #include <lib-mime/mime.h>
@@ -38,6 +39,7 @@
 #include <lib-ui/curses.h>
 #include <lib-ui/enter.h>
 
+#include "alias.h"
 #include "mutt.h"
 #include "mx.h"
 #include "attach.h"
@@ -51,16 +53,6 @@
 
 #define SW              (option(OPTMBOXPANE)?SidebarWidth:0)
 
-BODY *mutt_new_body (void)
-{
-  BODY *p = p_new(BODY, 1);
-
-  p->disposition = DISPATTACH;
-  p->use_disp = 1;
-  return (p);
-}
-
-
 /* Modified by blong to accept a "suggestion" for file name.  If
  * that file exists, then construct one with unique name but 
  * keep any extension.  This might fail, I guess.
@@ -106,7 +98,7 @@ int mutt_copy_body (FILE * fp, BODY ** tgt, BODY * src)
   char tmp[_POSIX_PATH_MAX];
   BODY *b;
 
-  PARAMETER *par, **ppar;
+  parameter_t *par, **ppar;
 
   short use_disp;
 
@@ -123,7 +115,7 @@ int mutt_copy_body (FILE * fp, BODY ** tgt, BODY * src)
   if (mutt_save_attachment (fp, src, tmp, 0, NULL) == -1)
     return -1;
 
-  *tgt = mutt_new_body ();
+  *tgt = body_new();
   b = *tgt;
 
   memcpy (b, src, sizeof (BODY));
@@ -165,47 +157,6 @@ int mutt_copy_body (FILE * fp, BODY ** tgt, BODY * src)
   return 0;
 }
 
-
-
-void mutt_free_body (BODY ** p)
-{
-  BODY *a = *p, *b;
-
-  while (a) {
-    b = a;
-    a = a->next;
-
-    if (b->parameter)
-      parameter_list_wipe(&b->parameter);
-    if (b->unlink && b->filename) {
-      debug_print (1, ("unlinking %s.\n", b->filename));
-      unlink (b->filename);
-    }
-    else if (b->filename)
-      debug_print (1, ("not unlinking %s.\n", b->filename));
-
-    p_delete(&b->filename);
-    p_delete(&b->content);
-    p_delete(&b->xtype);
-    p_delete(&b->subtype);
-    p_delete(&b->description);
-    p_delete(&b->form_name);
-
-    if (b->hdr) {
-      /* Don't free twice (b->hdr->content = b->parts) */
-      b->hdr->content = NULL;
-      header_delete(&b->hdr);
-    }
-
-    if (b->parts)
-      mutt_free_body (&b->parts);
-
-    p_delete(&b);
-  }
-
-  *p = 0;
-}
-
 HEADER *mutt_dup_header (HEADER * h)
 {
   HEADER *hnew;
@@ -401,53 +352,6 @@ char *_mutt_expand_path (char *s, ssize_t slen, int rx)
   return (s);
 }
 
-char *mutt_get_parameter (const char *s, PARAMETER * p)
-{
-  for (; p; p = p->next)
-    if (ascii_strcasecmp (s, p->attribute) == 0)
-      return (p->value);
-
-  return NULL;
-}
-
-void mutt_set_parameter (const char *attribute, const char *value,
-                         PARAMETER ** p)
-{
-  PARAMETER *q;
-
-  if (!value) {
-    mutt_delete_parameter (attribute, p);
-    return;
-  }
-
-  for (q = *p; q; q = q->next) {
-    if (ascii_strcasecmp (attribute, q->attribute) == 0) {
-      m_strreplace(&q->value, value);
-      return;
-    }
-  }
-
-  q = parameter_new();
-  q->attribute = m_strdup(attribute);
-  q->value = m_strdup(value);
-  q->next = *p;
-  *p = q;
-}
-
-void mutt_delete_parameter (const char *attribute, PARAMETER ** p)
-{
-  PARAMETER *q;
-
-  for (q = *p; q; p = &q->next, q = q->next) {
-    if (ascii_strcasecmp (attribute, q->attribute) == 0) {
-      *p = q->next;
-      q->next = NULL;
-      parameter_list_wipe(&q);
-      return;
-    }
-  }
-}
-
 /* returns 1 if Mutt can't display this type of data, 0 otherwise */
 int mutt_needs_mailcap (BODY * m)
 {
@@ -549,7 +453,6 @@ void _mutt_mktemp (char *s, const char *src, int line)
   snprintf (s, _POSIX_PATH_MAX, "%s/madmutt-%s-%d-%d-%d-%x%x", NONULL (Tempdir),
             NONULL (Hostname), (int) getuid (), (int) getpid (), Counter++, 
             (unsigned int) rand(), (unsigned int) rand());
-  debug_print (1, ("%s:%d: mutt_mktemp returns \"%s\".\n", src, line, s));
   unlink (s);
 }
 
@@ -1207,8 +1110,6 @@ int mutt_match_spam_list (const char *s, SPAM_LIST * l, char *text, int x)
     /* Does this pattern match? */
     if (regexec(l->rx->rx, s, l->nmatch, (regmatch_t *)pmatch, (int) 0) == 0)
     {
-      debug_print (5, ("%s matches %s\n%d subst", s, l->rx->pattern, l->rx->rx->re_nsub));
-
       /* Copy template into text, with substitutions. */
       for (p = l->template; *p;) {
         if (*p == '%') {
@@ -1223,7 +1124,6 @@ int mutt_match_spam_list (const char *s, SPAM_LIST * l, char *text, int x)
         }
       }
       text[tlen] = '\0';
-      debug_print (5, ("\"%s\"\n", text));
       return 1;
     }
   }
@@ -1311,29 +1211,13 @@ int mutt_cmp_env (const ENVELOPE * e1, const ENVELOPE * e2)
   }
 }
 
-int mutt_cmp_param (const PARAMETER * p1, const PARAMETER * p2)
-{
-  while (p1 && p2) {
-    if (m_strcmp(p1->attribute, p2->attribute) ||
-        m_strcmp(p1->value, p2->value))
-      return (0);
-
-    p1 = p1->next;
-    p2 = p2->next;
-  }
-  if (p1 || p2)
-    return (0);
-
-  return (1);
-}
-
 int mutt_cmp_body (const BODY * b1, const BODY * b2)
 {
   if (b1->type != b2->type ||
       b1->encoding != b2->encoding ||
       m_strcmp(b1->subtype, b2->subtype) ||
       m_strcmp(b1->description, b2->description) ||
-      !mutt_cmp_param (b1->parameter, b2->parameter) ||
+      !parameter_equal(b1->parameter, b2->parameter) ||
       b1->length != b2->length)
     return (0);
   return (1);