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

[apps/madmutt.git] / copy.c

diff --git a/copy.c b/copy.c
index 4368f02..48dcabb 100644 (file)
--- a/copy.c
+++ b/copy.c
@@ -38,9 +38,8 @@ static int copy_delete_attach (BODY * b, FILE * fpin, FILE * fpout,
  * below is to avoid creating a HEADER structure in message_handler().
  */
 int
  * below is to avoid creating a HEADER structure in message_handler().
  */
 int

-mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
-               const char *prefix)
-{
+mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end,
+               int flags, const char *prefix) {

   int from = 0;
   int this_is_from;
   int ignore = 0;
   int from = 0;
   int this_is_from;
   int ignore = 0;


@@ -54,8 +53,8 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
   int error;
   int curline = 0;
 
   int error;
   int curline = 0;
 

-  if (ftell (in) != off_start)
-    fseek (in, off_start, 0);
+  if (ftello (in) != off_start)
+    fseeko (in, off_start, 0);

 
   buf[0] = '\n';
   buf[1] = 0;
 
   buf[0] = '\n';
   buf[1] = 0;


@@ -66,7 +65,7 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
     /* Without these flags to complicate things
      * we can do a more efficient line to line copying
      */
     /* Without these flags to complicate things
      * we can do a more efficient line to line copying
      */

-    while (ftell (in) < off_end) {
+    while (ftello (in) < off_end) {

       nl = strchr (buf, '\n');
 
       if ((fgets (buf, sizeof (buf), in)) == NULL)
       nl = strchr (buf, '\n');
 
       if ((fgets (buf, sizeof (buf), in)) == NULL)


@@ -130,7 +129,7 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
   headers = mem_calloc (hdr_count, sizeof (char *));
 
   /* Read all the headers into the array */
   headers = mem_calloc (hdr_count, sizeof (char *));
 
   /* Read all the headers into the array */

-  while (ftell (in) < off_end) {
+  while (ftello (in) < off_end) {

     nl = strchr (buf, '\n');
 
     /* Read a line */
     nl = strchr (buf, '\n');
 
     /* Read a line */


@@ -236,7 +235,7 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
         strcat (this_one, " ...");
       }
     }
         strcat (this_one, " ...");
       }
     }

-  }                             /* while (ftell (in) < off_end) */
+  }                             /* while (ftello (in) < off_end) */

 
   /* Do we have anything pending?  -- XXX, same code as in above in the loop. */
   if (this_one) {
 
   /* Do we have anything pending?  -- XXX, same code as in above in the loop. */
   if (this_one) {


@@ -446,7 +445,7 @@ mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags,
   }
 
   if (flags & CH_UPDATE_LEN && (flags & CH_NOLEN) == 0) {
   }
 
   if (flags & CH_UPDATE_LEN && (flags & CH_NOLEN) == 0) {

-    fprintf (out, "Content-Length: " OFF_T_FMT "\n", h->content->length);
+    fprintf (out, "Content-Length: %zd\n", h->content->length);

     if (h->lines != 0 || h->content->length == 0)
       fprintf (out, "Lines: %d\n", h->lines);
   }
     if (h->lines != 0 || h->content->length == 0)
       fprintf (out, "Lines: %d\n", h->lines);
   }


@@ -465,7 +464,7 @@ mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags,
 }
 
 /* Count the number of lines and bytes to be deleted in this body*/
 }
 
 /* Count the number of lines and bytes to be deleted in this body*/

-static int count_delete_lines (FILE * fp, BODY * b, LOFF_T *length,
+static int count_delete_lines (FILE * fp, BODY * b, off_t *length,

                                size_t datelen)
 {
   int dellines = 0;
                                size_t datelen)
 {
   int dellines = 0;


@@ -473,7 +472,7 @@ static int count_delete_lines (FILE * fp, BODY * b, LOFF_T *length,
   int ch;
 
   if (b->deleted) {
   int ch;
 
   if (b->deleted) {

-    fseek (fp, b->offset, SEEK_SET);
+    fseeko (fp, b->offset, SEEK_SET);

     for (l = b->length; l; l--) {
       ch = getc (fp);
       if (ch == EOF)
     for (l = b->length; l; l--) {
       ch = getc (fp);
       if (ch == EOF)


@@ -518,7 +517,7 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
 {
   char prefix[SHORT_STRING];
   STATE s;
 {
   char prefix[SHORT_STRING];
   STATE s;

-  LOFF_T new_offset = -1;
+  off_t new_offset = -1;

   int rc = 0;
 
   if (flags & M_CM_PREFIX) {
   int rc = 0;
 
   if (flags & M_CM_PREFIX) {


@@ -535,14 +534,14 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
 
     else if (hdr->attach_del && (chflags & CH_UPDATE_LEN)) {
       int new_lines;
 
     else if (hdr->attach_del && (chflags & CH_UPDATE_LEN)) {
       int new_lines;

-      LOFF_T new_length = body->length;
+      off_t new_length = body->length;

       char date[SHORT_STRING];
 
       mutt_make_date (date, sizeof (date));
       date[5] = date[str_len (date) - 1] = '\"';
 
       /* Count the number of lines and bytes to be deleted */
       char date[SHORT_STRING];
 
       mutt_make_date (date, sizeof (date));
       date[5] = date[str_len (date) - 1] = '\"';
 
       /* Count the number of lines and bytes to be deleted */

-      fseek (fpin, body->offset, SEEK_SET);
+      fseeko (fpin, body->offset, SEEK_SET);

       new_lines = hdr->lines -
         count_delete_lines (fpin, body, &new_length, str_len (date));
 
       new_lines = hdr->lines -
         count_delete_lines (fpin, body, &new_length, str_len (date));
 


@@ -550,7 +549,7 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
       if (mutt_copy_header (fpin, hdr, fpout,
                             chflags | CH_NOLEN | CH_NONEWLINE, NULL))
         return -1;
       if (mutt_copy_header (fpin, hdr, fpout,
                             chflags | CH_NOLEN | CH_NONEWLINE, NULL))
         return -1;

-      fprintf (fpout, "Content-Length: " OFF_T_FMT "\n", new_length);
+      fprintf (fpout, "Content-Length: %zd\n", new_length);

       if (new_lines <= 0)
         new_lines = 0;
       else
       if (new_lines <= 0)
         new_lines = 0;
       else


@@ -560,13 +559,13 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
       new_offset = ftello (fpout);
 
       /* Copy the body */
       new_offset = ftello (fpout);
 
       /* Copy the body */

-      fseek (fpin, body->offset, SEEK_SET);
+      fseeko (fpin, body->offset, SEEK_SET);

       if (copy_delete_attach (body, fpin, fpout, date))
         return -1;
 
 #ifdef DEBUG
       {
       if (copy_delete_attach (body, fpin, fpout, date))
         return -1;
 
 #ifdef DEBUG
       {

-        LOFF_T fail = ((ftello (fpout) - new_offset) - new_length);
+        off_t fail = ((ftello (fpout) - new_offset) - new_length);

 
         if (fail) {
           mutt_error ("The length calculation was wrong by %ld bytes", fail);
 
         if (fail) {
           mutt_error ("The length calculation was wrong by %ld bytes", fail);


@@ -651,7 +650,7 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
     mutt_write_mime_header (cur, fpout);
     fputc ('\n', fpout);
 
     mutt_write_mime_header (cur, fpout);
     fputc ('\n', fpout);
 

-    fseek (fp, cur->offset, 0);
+    fseeko (fp, cur->offset, 0);

     if (mutt_copy_bytes (fp, fpout, cur->length) == -1) {
       fclose (fp);
       mutt_free_body (&cur);
     if (mutt_copy_bytes (fp, fpout, cur->length) == -1) {
       fclose (fp);
       mutt_free_body (&cur);


@@ -661,7 +660,7 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
     fclose (fp);
   }
   else {
     fclose (fp);
   }
   else {

-    fseek (fpin, body->offset, 0);
+    fseeko (fpin, body->offset, 0);

     if (flags & M_CM_PREFIX) {
       int c;
       size_t bytes = body->length;
     if (flags & M_CM_PREFIX) {
       int c;
       size_t bytes = body->length;


@@ -726,7 +725,7 @@ _mutt_append_message (CONTEXT * dest, FILE * fpin, CONTEXT * src,
   MESSAGE *msg;
   int r;
 
   MESSAGE *msg;
   int r;
 

-  fseek(fpin, hdr->offset, 0);
+  fseeko(fpin, hdr->offset, 0);

   if (fgets (buf, sizeof (buf), fpin) == NULL)
     return (-1);
   if ((msg = mx_open_new_message (dest, hdr, is_from (buf, NULL, 0, NULL) ? 0 : M_ADD_FROM)) == NULL)
   if (fgets (buf, sizeof (buf), fpin) == NULL)
     return (-1);
   if ((msg = mx_open_new_message (dest, hdr, is_from (buf, NULL, 0, NULL) ? 0 : M_ADD_FROM)) == NULL)


@@ -773,23 +772,23 @@ static int copy_delete_attach (BODY * b, FILE * fpin, FILE * fpout,
   for (part = b->parts; part; part = part->next) {
     if (part->deleted || part->parts) {
       /* Copy till start of this part */
   for (part = b->parts; part; part = part->next) {
     if (part->deleted || part->parts) {
       /* Copy till start of this part */

-      if (mutt_copy_bytes (fpin, fpout, part->hdr_offset - ftell (fpin)))
+      if (mutt_copy_bytes (fpin, fpout, part->hdr_offset - ftello (fpin)))

         return -1;
 
       if (part->deleted) {
         fprintf (fpout,
                  "Content-Type: message/external-body; access-type=x-mutt-deleted;\n"
         return -1;
 
       if (part->deleted) {
         fprintf (fpout,
                  "Content-Type: message/external-body; access-type=x-mutt-deleted;\n"

-                 "\texpiration=%s; length=" OFF_T_FMT "\n"
+                 "\texpiration=%s; length=%zd\n"

                  "\n", date + 5, part->length);
         if (ferror (fpout))
           return -1;
 
         /* Copy the original mime headers */
                  "\n", date + 5, part->length);
         if (ferror (fpout))
           return -1;
 
         /* Copy the original mime headers */

-        if (mutt_copy_bytes (fpin, fpout, part->offset - ftell (fpin)))
+        if (mutt_copy_bytes (fpin, fpout, part->offset - ftello (fpin)))

           return -1;
 
         /* Skip the deleted body */
           return -1;
 
         /* Skip the deleted body */

-        fseek (fpin, part->offset + part->length, SEEK_SET);
+        fseeko (fpin, part->offset + part->length, SEEK_SET);

       }
       else {
         if (copy_delete_attach (part, fpin, fpout, date))
       }
       else {
         if (copy_delete_attach (part, fpin, fpout, date))


@@ -799,7 +798,7 @@ static int copy_delete_attach (BODY * b, FILE * fpin, FILE * fpout,
   }
 
   /* Copy the last parts */
   }
 
   /* Copy the last parts */

-  if (mutt_copy_bytes (fpin, fpout, b->offset + b->length - ftell (fpin)))
+  if (mutt_copy_bytes (fpin, fpout, b->offset + b->length - ftello (fpin)))

     return -1;
 
   return 0;
     return -1;
 
   return 0;