drop the ad-hoc TZ parse, non-rfc822 compliant dates are quite rare

[apps/madmutt.git] / muttlib.c

diff --git a/muttlib.c b/muttlib.c
index 1c54b13..7e89aff 100644 (file)
--- 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,16 +32,16 @@
 #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>
 
 #include <lib-ui/curses.h>
 #include <lib-ui/enter.h>
 
+#include "alias.h"
 #include "mutt.h"
 #include "mx.h"
-#include "url.h"
 #include "attach.h"
 
 #include "version.h"
@@ -67,12 +69,12 @@ BODY *mutt_new_body (void)
  * Renamed to mutt_adv_mktemp so I only have to change where it's
  * called, and not all possible cases.
  */
-void mutt_adv_mktemp (const char* dir, char *s, size_t l)
+void mutt_adv_mktemp (const char* dir, char *s, ssize_t l)
 {
   char buf[_POSIX_PATH_MAX];
   char tmp[_POSIX_PATH_MAX];
   char *period;
-  size_t sl;
+  ssize_t sl;
   struct stat sb;
 
   m_strcpy(buf, sizeof(buf), m_strisempty(dir) ? NONULL(Tempdir) : dir);
@@ -176,13 +178,10 @@ void mutt_free_body (BODY ** p)
     a = a->next;
 
     if (b->parameter)
-      parameter_delete(&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);
@@ -216,7 +215,7 @@ HEADER *mutt_dup_header (HEADER * h)
 }
 
 /* returns true if the header contained in "s" is in list "t" */
-int mutt_matches_ignore (const char *s, LIST * t)
+int mutt_matches_ignore (const char *s, string_list_t * t)
 {
   for (; t; t = t->next) {
     if (!ascii_strncasecmp (s, t->data, m_strlen(t->data))
@@ -230,7 +229,7 @@ int mutt_matches_ignore (const char *s, LIST * t)
 void mutt_expand_link (char *newpath, const char *path, const char *lnk)
 {
   const char *lb = NULL;
-  size_t len;
+  ssize_t len;
 
   /* lnk is full path */
   if (*lnk == '/') {
@@ -249,12 +248,12 @@ void mutt_expand_link (char *newpath, const char *path, const char *lnk)
   m_strcpy(newpath + len, _POSIX_PATH_MAX - len, lnk);
 }
 
-char *mutt_expand_path (char *s, size_t slen)
+char *mutt_expand_path (char *s, ssize_t slen)
 {
   return _mutt_expand_path (s, slen, 0);
 }
 
-char *_mutt_expand_path (char *s, size_t slen, int rx)
+char *_mutt_expand_path (char *s, ssize_t slen, int rx)
 {
   char p[_POSIX_PATH_MAX] = "";
   char q[_POSIX_PATH_MAX] = "";
@@ -320,9 +319,10 @@ char *_mutt_expand_path (char *s, size_t slen, int rx)
     case '@':
       {
         HEADER *h;
+        /* FIXME: BUG ? */
         address_t *alias;
 
-        if ((alias = mutt_lookup_alias (s + 1))) {
+        if ((alias = alias_lookup(s + 1))) {
           h = header_new();
           h->env = envelope_new();
           h->env->from = h->env->to = alias;
@@ -441,7 +441,7 @@ void mutt_delete_parameter (const char *attribute, PARAMETER ** p)
     if (ascii_strcasecmp (attribute, q->attribute) == 0) {
       *p = q->next;
       q->next = NULL;
-      parameter_delete(&q);
+      parameter_list_wipe(&q);
       return;
     }
   }
@@ -534,7 +534,7 @@ void mutt_merge_envelopes(ENVELOPE* base, ENVELOPE** extra)
   /* spam and user headers should never be hashed, and the new envelope may
    * have better values. Use new versions regardless. */
   mutt_buffer_free (&base->spam);
-  mutt_free_list (&base->userhdrs);
+  string_list_wipe(&base->userhdrs);
   MOVE_ELEM(spam);
   MOVE_ELEM(userhdrs);
 #undef MOVE_ELEM
@@ -548,28 +548,14 @@ 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);
 }
 
-void mutt_free_alias (ALIAS ** p)
-{
-  ALIAS *t;
-
-  while (*p) {
-    t = *p;
-    *p = (*p)->next;
-    p_delete(&t->name);
-    address_delete (&t->addr);
-    p_delete(&t);
-  }
-}
-
 /* collapse the pathname using ~ or = when possible */
 void mutt_pretty_mailbox (char *s)
 {
   char *p = s, *q = s;
-  size_t len;
+  ssize_t len;
   url_scheme_t scheme;
 
   scheme = url_check_scheme (s);
@@ -616,7 +602,7 @@ void mutt_pretty_mailbox (char *s)
   }
 }
 
-void mutt_pretty_size (char *s, size_t len, long n)
+void mutt_pretty_size (char *s, ssize_t len, long n)
 {
   if (n == 0)
     m_strcpy(s, len, "0K");
@@ -635,7 +621,7 @@ void mutt_pretty_size (char *s, size_t len, long n)
   }
 }
 
-void mutt_expand_file_fmt (char *dest, size_t destlen, const char *fmt,
+void mutt_expand_file_fmt (char *dest, ssize_t destlen, const char *fmt,
                            const char *src)
 {
   char tmp[LONG_STRING];
@@ -644,12 +630,12 @@ void mutt_expand_file_fmt (char *dest, size_t destlen, const char *fmt,
   mutt_expand_fmt (dest, destlen, fmt, tmp);
 }
 
-void mutt_expand_fmt (char *dest, size_t destlen, const char *fmt,
+void mutt_expand_fmt (char *dest, ssize_t destlen, const char *fmt,
                       const char *src)
 {
   const char *p;
   char *d;
-  size_t slen;
+  ssize_t slen;
   int found = 0;
 
   slen = m_strlen(src);
@@ -692,7 +678,7 @@ void mutt_expand_fmt (char *dest, size_t destlen, const char *fmt,
 
 /* return 0 on success, -1 on abort, 1 on error */
 int mutt_check_overwrite (const char *attname, const char *path,
-                          char *fname, size_t flen, int *append,
+                          char *fname, ssize_t flen, int *append,
                           char **directory)
 {
   int rc = 0;
@@ -760,7 +746,7 @@ int mutt_check_overwrite (const char *attname, const char *path,
   return 0;
 }
 
-void mutt_save_path (char *d, size_t dsize, address_t * a)
+void mutt_save_path (char *d, ssize_t dsize, address_t * a)
 {
   if (a && a->mailbox) {
     m_strcpy(d, dsize, a->mailbox);
@@ -776,7 +762,7 @@ void mutt_save_path (char *d, size_t dsize, address_t * a)
     *d = 0;
 }
 
-void mutt_safe_path (char *s, size_t l, address_t * a)
+void mutt_safe_path (char *s, ssize_t l, address_t * a)
 {
   char *p;
 
@@ -1217,11 +1203,8 @@ 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, (size_t) 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));
-
+    if (regexec(l->rx->rx, s, l->nmatch, (regmatch_t *)pmatch, (int) 0) == 0)
+    {
       /* Copy template into text, with substitutions. */
       for (p = l->template; *p;) {
         if (*p == '%') {
@@ -1236,7 +1219,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;
     }
   }
@@ -1285,7 +1267,7 @@ int mutt_cmp_addr (const address_t * a, const address_t * b)
   return (1);
 }
 
-int mutt_cmp_list (const LIST * a, const LIST * b)
+int mutt_cmp_list (const string_list_t * a, const string_list_t * b)
 {
   while (a && b) {
     if (m_strcmp(a->data, b->data))