we're grownups now. don't care about stupid OS'es that don't know what an

[apps/madmutt.git] / parse.c

diff --git a/parse.c b/parse.c
index 036a183..d623d44 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -423,7 +423,7 @@ BODY *mutt_read_mime_header (FILE * fp, int digest)
   char *line = mem_malloc (LONG_STRING);
   size_t linelen = LONG_STRING;
 
-  p->hdr_offset = ftell (fp);
+  p->hdr_offset = ftello (fp);
 
   p->encoding = ENC7BIT;        /* default from RFC1521 */
   p->type = digest ? TYPEMESSAGE : TYPETEXT;
@@ -472,7 +472,7 @@ BODY *mutt_read_mime_header (FILE * fp, int digest)
     }
 #endif
   }
-  p->offset = ftell (fp);       /* Mark the start of the real data */
+  p->offset = ftello (fp);       /* Mark the start of the real data */
   if (p->type == TYPETEXT && !p->subtype)
     p->subtype = str_dup ("plain");
   else if (p->type == TYPEMESSAGE && !p->subtype)
@@ -496,7 +496,7 @@ void mutt_parse_part (FILE * fp, BODY * b)
 #endif
       bound = mutt_get_parameter ("boundary", b->parameter);
 
-    fseek (fp, b->offset, SEEK_SET);
+    fseeko (fp, b->offset, SEEK_SET);
     b->parts = mutt_parse_multipart (fp, bound,
                                      b->offset + b->length,
                                      ascii_strcasecmp ("digest",
@@ -505,7 +505,7 @@ void mutt_parse_part (FILE * fp, BODY * b)
 
   case TYPEMESSAGE:
     if (b->subtype) {
-      fseek (fp, b->offset, SEEK_SET);
+      fseeko (fp, b->offset, SEEK_SET);
       if (mutt_is_message_type (b->type, b->subtype))
         b->parts = mutt_parse_messageRFC822 (fp, b);
       else if (ascii_strcasecmp (b->subtype, "external-body") == 0)
@@ -542,7 +542,7 @@ BODY *mutt_parse_messageRFC822 (FILE * fp, BODY * parent)
   BODY *msg;
 
   parent->hdr = mutt_new_header ();
-  parent->hdr->offset = ftell (fp);
+  parent->hdr->offset = ftello (fp);
   parent->hdr->env = mutt_read_rfc822_header (fp, parent->hdr, 0, 0);
   msg = parent->hdr->content;
 
@@ -572,7 +572,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, long end_off,
+BODY *mutt_parse_multipart (FILE * fp, const char *boundary, off_t end_off,
                             int digest)
 {
 #ifdef SUN_ATTACHMENT
@@ -591,7 +591,7 @@ BODY *mutt_parse_multipart (FILE * fp, const char *boundary, long end_off,
   }
 
   blen = str_len (boundary);
-  while (ftell (fp) < end_off && fgets (buffer, LONG_STRING, fp) != NULL) {
+  while (ftello (fp) < end_off && fgets (buffer, LONG_STRING, fp) != NULL) {
     len = str_len (buffer);
 
     crlf = (len > 1 && buffer[len - 2] == '\r') ? 1 : 0;
@@ -599,10 +599,10 @@ BODY *mutt_parse_multipart (FILE * fp, const char *boundary, long end_off,
     if (buffer[0] == '-' && buffer[1] == '-' &&
         str_ncmp (buffer + 2, boundary, blen) == 0) {
       if (last) {
-        last->length = ftell (fp) - last->offset - len - 1 - crlf;
+        last->length = ftello (fp) - last->offset - len - 1 - crlf;
         if (last->parts && last->parts->length == 0)
           last->parts->length =
-            ftell (fp) - last->parts->offset - len - 1 - crlf;
+            ftello (fp) - last->parts->offset - len - 1 - crlf;
         /* if the body is empty, we can end up with a -1 length */
         if (last->length < 0)
           last->length = 0;
@@ -625,7 +625,7 @@ BODY *mutt_parse_multipart (FILE * fp, const char *boundary, long end_off,
           for (lines =
                atoi (mutt_get_parameter ("content-lines", new->parameter));
                lines; lines--)
-            if (ftell (fp) >= end_off
+            if (ftello (fp) >= end_off
                 || fgets (buffer, LONG_STRING, fp) == NULL)
               break;
         }
@@ -1307,7 +1307,7 @@ ENVELOPE *mutt_read_rfc822_header (FILE * f, HEADER * hdr, short user_hdrs,
   LIST *last = NULL;
   char *line = mem_malloc (LONG_STRING);
   char *p;
-  long loc;
+  off_t loc;
   int matched;
   size_t linelen = LONG_STRING;
   char buf[LONG_STRING + 1];
@@ -1327,7 +1327,7 @@ ENVELOPE *mutt_read_rfc822_header (FILE * f, HEADER * hdr, short user_hdrs,
     }
   }
 
-  while ((loc = ftell (f)),
+  while ((loc = ftello (f)),
          *(line = mutt_read_rfc822_line (f, line, &linelen)) != 0) {
     matched = 0;
 
@@ -1345,7 +1345,7 @@ ENVELOPE *mutt_read_rfc822_header (FILE * f, HEADER * hdr, short user_hdrs,
         continue;
       }
 
-      fseek (f, loc, 0);
+      fseeko (f, loc, 0);
       break;                    /* end of header */
     }
 
@@ -1400,7 +1400,7 @@ ENVELOPE *mutt_read_rfc822_header (FILE * f, HEADER * hdr, short user_hdrs,
 
   if (hdr) {
     hdr->content->hdr_offset = hdr->offset;
-    hdr->content->offset = ftell (f);
+    hdr->content->offset = ftello (f);
     rfc2047_decode_envelope (e);
     /* check for missing or invalid date */
     if (hdr->date_sent <= 0) {