X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=parse.c;h=9ff0debb6c2e677cefa871a3761fa52e34f56c24;hp=7eebd2f765ef73bb7d074fef47ea872a624f57fe;hb=eed5352e46df93f8921d2e6dfdc95b027bad6e1e;hpb=c8ceef3ed6424dcb5a6ec835e7d8d9cc00595372

diff --git a/parse.c b/parse.c
index 7eebd2f..9ff0deb 100644
--- a/parse.c
+++ b/parse.c
@@ -11,10 +11,14 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/buffer.h>
+
 #include "mutt.h"
-#include "buffer.h"
 #include "enter.h"
-#include "ascii.h"
 #include "recvattach.h"
 #include "mx.h"
 #include "mime.h"
@@ -23,9 +27,6 @@
 #include "mutt_crypt.h"
 #include "url.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 #include "lib/rx.h"
 #include "lib/debug.h"
 
@@ -44,14 +45,14 @@ char *mutt_read_rfc822_line (FILE * f, char *line, size_t * linelen)
   char ch;
   size_t offset = 0;
 
-  FOREVER {
+  for (;;) {
     if (fgets (buf, *linelen - offset, f) == NULL ||    /* end of file or */
         (ISSPACE (*line) && !offset)) { /* end of headers */
       *line = 0;
       return (line);
     }
 
-    buf += str_len (buf) - 1;
+    buf += m_strlen(buf) - 1;
     if (*buf == '\n') {
       /* we did get a full line. remove trailing space */
       while (ISSPACE (*buf))
@@ -76,7 +77,7 @@ char *mutt_read_rfc822_line (FILE * f, char *line, size_t * linelen)
     if (*linelen < offset + STRING) {
       /* grow the buffer */
       *linelen += STRING;
-      mem_realloc (&line, *linelen);
+      p_realloc(&line, *linelen);
       buf = line + offset;
     }
   }
@@ -100,19 +101,19 @@ LIST *mutt_parse_references (char *s, int in_reply_to)
     new = NULL;
 
     if (*s == '<') {
-      n = str_len (s);
+      n = m_strlen(s);
       if (s[n - 1] != '>') {
         o = s;
         s = NULL;
         continue;
       }
 
-      new = str_dup (s);
+      new = m_strdup(s);
     }
     else if (o) {
-      m = str_len (s);
+      m = m_strlen(s);
       if (s[m - 1] == '>') {
-        new = mem_malloc (sizeof (char) * (n + m + 1));
+        new = p_new(char, n + m + 1);
         strcpy (new, o);        /* __STRCPY_CHECKED__ */
         strcpy (new + n, s);    /* __STRCPY_CHECKED__ */
       }
@@ -126,9 +127,9 @@ LIST *mutt_parse_references (char *s, int in_reply_to)
        */
       if (!(at = strchr (new, '@')) || strchr (at + 1, '@')
           || (in_reply_to && at - new <= 8))
-        mem_free (&new);
+        p_delete(&new);
       else {
-        t = (LIST *) mem_malloc (sizeof (LIST));
+        t = p_new(LIST, 1);
         t->data = new;
         t->next = lst;
         lst = t;
@@ -187,9 +188,7 @@ static PARAMETER *parse_parameters (const char *s)
 
       new = mutt_new_parameter ();
 
-      new->attribute = mem_malloc (i + 1);
-      memcpy (new->attribute, s, i);
-      new->attribute[i] = 0;
+      new->attribute = p_dupstr(s, i);
 
       /* remove whitespace from the end of the attribute name */
       while (ISSPACE (new->attribute[--i]))
@@ -235,9 +234,9 @@ static PARAMETER *parse_parameters (const char *s)
         buffer[i] = 0;
       }
 
-      new->value = str_dup (buffer);
+      new->value = m_strdup(buffer);
 
-      debug_print (2, ("`%s' = `%s'\n", new->attribute ? new->attribute : "", 
+      debug_print (2, ("`%s' = `%s'\n", new->attribute ? new->attribute : "",
                   new->value ? new->value : ""));
 
       /* Add this parameter to the list */
@@ -307,7 +306,7 @@ void mutt_parse_content_type (char *s, BODY * ct)
   char *pc;
   char *subtype;
 
-  mem_free (&ct->subtype);
+  p_delete(&ct->subtype);
   mutt_free_parameter (&ct->parameter);
 
   /* First extract any existing parameters */
@@ -322,7 +321,7 @@ void mutt_parse_content_type (char *s, BODY * ct)
      * let that take precedence, and don't set it here */
     if ((pc = mutt_get_parameter ("name", ct->parameter)) != 0
         && !ct->filename)
-      ct->filename = str_dup (pc);
+      ct->filename = m_strdup(pc);
 
 #ifdef SUN_ATTACHMENT
     /* this is deep and utter perversion */
@@ -337,7 +336,7 @@ void mutt_parse_content_type (char *s, BODY * ct)
     *subtype++ = '\0';
     for (pc = subtype; *pc && !ISSPACE (*pc) && *pc != ';'; pc++);
     *pc = '\0';
-    ct->subtype = str_dup (subtype);
+    ct->subtype = m_strdup(subtype);
   }
 
   /* Finally, get the major type */
@@ -345,11 +344,11 @@ void mutt_parse_content_type (char *s, BODY * ct)
 
 #ifdef SUN_ATTACHMENT
   if (ascii_strcasecmp ("x-sun-attachment", s) == 0)
-    ct->subtype = str_dup ("x-sun-attachment");
+    ct->subtype = m_strdup("x-sun-attachment");
 #endif
 
   if (ct->type == TYPEOTHER) {
-    ct->xtype = str_dup (s);
+    ct->xtype = m_strdup(s);
   }
 
   if (ct->subtype == NULL) {
@@ -357,20 +356,20 @@ void mutt_parse_content_type (char *s, BODY * ct)
      * field, so we can attempt to convert the type to BODY here.
      */
     if (ct->type == TYPETEXT)
-      ct->subtype = str_dup ("plain");
+      ct->subtype = m_strdup("plain");
     else if (ct->type == TYPEAUDIO)
-      ct->subtype = str_dup ("basic");
+      ct->subtype = m_strdup("basic");
     else if (ct->type == TYPEMESSAGE)
-      ct->subtype = str_dup ("rfc822");
+      ct->subtype = m_strdup("rfc822");
     else if (ct->type == TYPEOTHER) {
       char buffer[SHORT_STRING];
 
       ct->type = TYPEAPPLICATION;
       snprintf (buffer, sizeof (buffer), "x-%s", s);
-      ct->subtype = str_dup (buffer);
+      ct->subtype = m_strdup(buffer);
     }
     else
-      ct->subtype = str_dup ("x-unknown");
+      ct->subtype = m_strdup("x-unknown");
   }
 
   /* Default character set for text types. */
@@ -404,7 +403,7 @@ static void parse_content_disposition (char *s, BODY * ct)
                              (parms = parse_parameters (s)))) != 0)
       str_replace (&ct->filename, s);
     if ((s = mutt_get_parameter ("name", parms)) != 0)
-      ct->form_name = str_dup (s);
+      ct->form_name = m_strdup(s);
     mutt_free_parameter (&parms);
   }
 }
@@ -420,7 +419,7 @@ BODY *mutt_read_mime_header (FILE * fp, int digest)
 {
   BODY *p = mutt_new_body ();
   char *c;
-  char *line = mem_malloc (LONG_STRING);
+  char *line = p_new(char, LONG_STRING);
   size_t linelen = LONG_STRING;
 
   p->hdr_offset = ftello (fp);
@@ -474,11 +473,11 @@ BODY *mutt_read_mime_header (FILE * fp, int digest)
   }
   p->offset = ftello (fp);       /* Mark the start of the real data */
   if (p->type == TYPETEXT && !p->subtype)
-    p->subtype = str_dup ("plain");
+    p->subtype = m_strdup("plain");
   else if (p->type == TYPEMESSAGE && !p->subtype)
-    p->subtype = str_dup ("rfc822");
+    p->subtype = m_strdup("rfc822");
 
-  mem_free (&line);
+  p_delete(&line);
 
   return (p);
 }
@@ -572,7 +571,7 @@ BODY *mutt_parse_messageRFC822 (FILE * fp, BODY * parent)
  *	digest		1 if reading a multipart/digest, 0 otherwise
  */
 
-BODY *mutt_parse_multipart (FILE * fp, const char *boundary, LOFF_T end_off,
+BODY *mutt_parse_multipart (FILE * fp, const char *boundary, off_t end_off,
                             int digest)
 {
 #ifdef SUN_ATTACHMENT
@@ -590,9 +589,9 @@ BODY *mutt_parse_multipart (FILE * fp, const char *boundary, LOFF_T end_off,
     return (NULL);
   }
 
-  blen = str_len (boundary);
+  blen = m_strlen(boundary);
   while (ftello (fp) < end_off && fgets (buffer, LONG_STRING, fp) != NULL) {
-    len = str_len (buffer);
+    len = m_strlen(buffer);
 
     crlf = (len > 1 && buffer[len - 2] == '\r') ? 1 : 0;
 
@@ -613,7 +612,7 @@ BODY *mutt_parse_multipart (FILE * fp, const char *boundary, LOFF_T end_off,
         buffer[i] = 0;
 
       /* Check for the end boundary */
-      if (str_cmp (buffer + blen + 2, "--") == 0) {
+      if (m_strcmp(buffer + blen + 2, "--") == 0) {
         final = 1;
         break;                  /* done parsing */
       }
@@ -794,7 +793,7 @@ time_t mutt_parse_date (const char *s, HEADER * h)
   char scratch[SHORT_STRING];
 
   /* Don't modify our argument. Fixed-size buffer is ok here since
-   * the date format imposes a natural limit. 
+   * the date format imposes a natural limit.
    */
 
   strfcpy (scratch, s, sizeof (scratch));
@@ -806,7 +805,7 @@ time_t mutt_parse_date (const char *s, HEADER * h)
     t = scratch;
   SKIPWS (t);
 
-  memset (&tm, 0, sizeof (tm));
+  p_clear(&tm, 1);
 
   while ((t = strtok (t, " \t")) != NULL) {
     switch (count) {
@@ -911,19 +910,13 @@ time_t mutt_parse_date (const char *s, HEADER * h)
 }
 
 /* extract the first substring that looks like a message-id */
-static char *extract_message_id (const char *s)
+static char *extract_message_id(const char *s)
 {
-  const char *p;
-  char *r;
-  size_t l;
+    const char *p;
 
-  if ((s = strchr (s, '<')) == NULL || (p = strchr (s, '>')) == NULL)
-    return (NULL);
-  l = (size_t) (p - s) + 1;
-  r = mem_malloc (l + 1);
-  memcpy (r, s, l);
-  r[l] = 0;
-  return (r);
+    if ((s = strchr(s, '<')) == NULL || (p = strchr(s, '>')) == NULL)
+        return NULL;
+    return p_dupstr(s, (p - s) + 1);
 }
 
 void mutt_parse_mime_message (CONTEXT * ctx, HEADER * cur)
@@ -1042,7 +1035,7 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
        * bothered me for _years_ */
       if (!e->from) {
         e->from = rfc822_new_address ();
-        e->from->personal = str_dup (p);
+        e->from->personal = m_strdup(p);
       }
       matched = 1;
     }
@@ -1050,7 +1043,7 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
     else if (!str_casecmp (line + 1, "ollowup-to")) {
       if (!e->followup_to) {
         str_skip_trailws (p);
-        e->followup_to = str_dup (str_skip_initws (p));
+        e->followup_to = m_strdup(str_skip_initws (p));
       }
       matched = 1;
     }
@@ -1070,9 +1063,9 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
       if (hdr) {
         hdr->lines = atoi (p);
 
-        /* 
+        /*
          * HACK - mutt has, for a very short time, produced negative
-         * Lines header values.  Ignore them. 
+         * Lines header values.  Ignore them.
          */
         if (hdr->lines < 0)
           hdr->lines = 0;
@@ -1092,7 +1085,7 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
 
           /* Take the first mailto URL */
           if (url_check_scheme (beg) == U_MAILTO) {
-            mem_free (&e->list_post);
+            p_delete(&e->list_post);
             e->list_post = str_substrdup (beg, end);
             break;
           }
@@ -1110,7 +1103,7 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
     }
     else if (!ascii_strcasecmp (line + 1, "essage-id")) {
       /* We add a new "Message-ID:" when building a message */
-      mem_free (&e->message_id);
+      p_delete(&e->message_id);
       e->message_id = extract_message_id (p);
       matched = 1;
     }
@@ -1131,9 +1124,9 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
 #ifdef USE_NNTP
   case 'n':
     if (!str_casecmp (line + 1, "ewsgroups")) {
-      mem_free (&e->newsgroups);
+      p_delete(&e->newsgroups);
       str_skip_trailws (p);
-      e->newsgroups = str_dup (str_skip_initws (p));
+      e->newsgroups = m_strdup(str_skip_initws (p));
       matched = 1;
     }
     break;
@@ -1143,7 +1136,7 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
     /* field `Organization:' saves only for pager! */
     if (!str_casecmp (line + 1, "rganization")) {
       if (!e->organization && str_casecmp (p, "unknown"))
-        e->organization = str_dup (p);
+        e->organization = m_strdup(p);
     }
     break;
 
@@ -1174,7 +1167,7 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
   case 's':
     if (!ascii_strcasecmp (line + 1, "ubject")) {
       if (!e->subject)
-        e->subject = str_dup (p);
+        e->subject = m_strdup(p);
       matched = 1;
     }
     else if (!ascii_strcasecmp (line + 1, "ender")) {
@@ -1202,7 +1195,7 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
     }
     else if ((!ascii_strcasecmp ("upersedes", line + 1) ||
               !ascii_strcasecmp ("upercedes", line + 1)) && hdr)
-      e->supersedes = str_dup (p);
+      e->supersedes = m_strdup(p);
     break;
 
   case 't':
@@ -1235,18 +1228,18 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
       matched = 1;
     }
     else if (ascii_strcasecmp (line + 1, "-label") == 0) {
-      e->x_label = str_dup (p);
+      e->x_label = m_strdup(p);
       matched = 1;
     }
 #ifdef USE_NNTP
     else if (!str_casecmp (line + 1, "-comment-to")) {
       if (!e->x_comment_to)
-        e->x_comment_to = str_dup (p);
+        e->x_comment_to = m_strdup(p);
       matched = 1;
     }
     else if (!str_casecmp (line + 1, "ref")) {
       if (!e->xref)
-        e->xref = str_dup (p);
+        e->xref = m_strdup(p);
       matched = 1;
     }
 #endif
@@ -1258,7 +1251,7 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
   /* Keep track of the user-defined headers */
   if (!matched && user_hdrs) {
     /* restore the original line */
-    line[str_len (line)] = ':';
+    line[m_strlen(line)] = ':';
 
     if (weed && option (OPTWEED) && mutt_matches_ignore (line, Ignore)
         && !mutt_matches_ignore (line, UnIgnore))
@@ -1270,7 +1263,7 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
     }
     else
       last = e->userhdrs = mutt_new_list ();
-    last->data = str_dup (line);
+    last->data = m_strdup(line);
     if (do_2047)
       rfc2047_decode (&last->data);
   }
@@ -1289,14 +1282,14 @@ done:
  * f		stream to read from
  *
  * hdr		header structure of current message (optional).
- * 
+ *
  * user_hdrs	If set, store user headers.  Used for recall-message and
  * 		postpone modes.
- * 
+ *
  * weed		If this parameter is set and the user has activated the
  * 		$weed option, honor the header weed list for user headers.
  * 	        Used for recall-message.
- * 
+ *
  * Returns:     newly allocated envelope structure.  You should free it by
  *              mutt_free_envelope() when envelope stay unneeded.
  */
@@ -1305,9 +1298,9 @@ ENVELOPE *mutt_read_rfc822_header (FILE * f, HEADER * hdr, short user_hdrs,
 {
   ENVELOPE *e = mutt_new_envelope ();
   LIST *last = NULL;
-  char *line = mem_malloc (LONG_STRING);
+  char *line = p_new(char, LONG_STRING);
   char *p;
-  LOFF_T loc;
+  off_t loc;
   int matched;
   size_t linelen = LONG_STRING;
   char buf[LONG_STRING + 1];
@@ -1318,7 +1311,7 @@ ENVELOPE *mutt_read_rfc822_header (FILE * f, HEADER * hdr, short user_hdrs,
 
       /* set the defaults from RFC1521 */
       hdr->content->type = TYPETEXT;
-      hdr->content->subtype = str_dup ("plain");
+      hdr->content->subtype = m_strdup("plain");
       hdr->content->encoding = ENC7BIT;
       hdr->content->length = -1;
 
@@ -1396,7 +1389,7 @@ ENVELOPE *mutt_read_rfc822_header (FILE * f, HEADER * hdr, short user_hdrs,
 
   }
 
-  mem_free (&line);
+  p_delete(&line);
 
   if (hdr) {
     hdr->content->hdr_offset = hdr->offset;
@@ -1440,13 +1433,13 @@ ADDRESS *mutt_parse_adrlist (ADDRESS * p, const char *s)
 int count_body_parts_check(LIST **checklist, BODY *b, int dflt) {
   LIST *type;
   ATTACH_MATCH *a;
-  
+
   /* If list is null, use default behavior. */
   if (! *checklist) {
     /*return dflt;*/
     return 0;
   }
-  
+
   for (type = *checklist; type; type = type->next) {
     a = (ATTACH_MATCH *)type->data;
     debug_print(5, ("cbpc: %s %d/%s ?? %s/%s [%d]... ",
@@ -1466,32 +1459,32 @@ int count_body_parts_check(LIST **checklist, BODY *b, int dflt) {
 #define AT_COUNT(why) { shallcount = 1; }
 #define AT_NOCOUNT(why) { shallcount = 0; }
 
-int count_body_parts (BODY *body, int flags) { 
+int count_body_parts (BODY *body, int flags) {
   int count = 0;
   int shallcount, shallrecurse;
   BODY *bp;
-  
+
   if (body == NULL)
     return 0;
-  
+
   for (bp = body; bp != NULL; bp = bp->next) {
     /* Initial disposition is to count and not to recurse this part. */
     AT_COUNT("default");
     shallrecurse = 0;
-    
+
     debug_print(5, ("bp: desc=\"%s\"; fn=\"%s\", type=\"%d/%s\"\n",
                bp->description ? bp->description : ("none"),
                bp->filename ? bp->filename :
                bp->d_filename ? bp->d_filename : "(none)",
                bp->type, bp->subtype ? bp->subtype : "*"));
-    
+
     if (bp->type == TYPEMESSAGE) {
       shallrecurse = 1;
-      
+
       /* If it's an external body pointer, don't recurse it. */
       if (!ascii_strcasecmp (bp->subtype, "external-body"))
         shallrecurse = 0;
-      
+
       /* Don't count containers if they're top-level. */
       if (flags & M_PARTS_TOPLEVEL)
         AT_NOCOUNT("top-level message/*");
@@ -1500,19 +1493,19 @@ int count_body_parts (BODY *body, int flags) {
       shallrecurse = 1;
       if (!str_casecmp(bp->subtype, "alternative"))
         shallrecurse = 0;
-      
+
       /* Don't count containers if they're top-level. */
       if (flags & M_PARTS_TOPLEVEL)
         AT_NOCOUNT("top-level multipart");
     }
-    
+
     if (bp->disposition == DISPINLINE &&
         bp->type != TYPEMULTIPART && bp->type != TYPEMESSAGE && bp == body)
       AT_NOCOUNT("ignore fundamental inlines");
-    
+
     /* If this body isn't scheduled for enumeration already, don't bother
      * profiling it further. */
-    
+
     if (shallcount) {
       /* Turn off shallcount if message type is not in ok list,
        * or if it is in except list. Check is done separately for
@@ -1531,21 +1524,21 @@ int count_body_parts (BODY *body, int flags) {
           AT_NOCOUNT("excluded");
       }
     }
-    
+
     if (shallcount)
       count++;
     bp->attach_qualifies = shallcount ? 1 : 0;
-    
-    debug_print(5, ("cbp: %08x shallcount = %d\n", (unsigned int)bp, shallcount));
-    
+
+    debug_print(5, ("cbp: %p shallcount = %d\n", bp, shallcount));
+
     if (shallrecurse) {
-      debug_print(5, ("cbp: %08x pre count = %d\n", (unsigned int)bp, count));
+      debug_print(5, ("cbp: %p pre count = %d\n", bp, count));
       bp->attach_count = count_body_parts(bp->parts, flags & ~M_PARTS_TOPLEVEL);
       count += bp->attach_count;
-      debug_print(5, ("cbp: %08x post count = %d\n", (unsigned int)bp, count));
+      debug_print(5, ("cbp: %p post count = %d\n", bp, count));
     }
   }
-  
+
   debug_print(5, ("bp: return %d\n", count < 0 ? 0 : count));
   return count < 0 ? 0 : count;
 }
@@ -1555,12 +1548,12 @@ int mutt_count_body_parts (HEADER *hdr, int flags) {
     return (0);
   if (hdr->attach_valid && !(flags & M_PARTS_RECOUNT))
     return hdr->attach_total;
-  
+
   if (AttachAllow || AttachExclude || InlineAllow || InlineExclude)
     hdr->attach_total = count_body_parts(hdr->content, flags | M_PARTS_TOPLEVEL);
   else
     hdr->attach_total = 0;
-  
+
   hdr->attach_valid = 1;
   return hdr->attach_total;
 }