diff options
| -rw-r--r-- | attach.c | 6 | ||||
| -rw-r--r-- | buffy.c | 8 | ||||
| -rw-r--r-- | copy.c | 40 | ||||
| -rw-r--r-- | copy.h | 2 | ||||
| -rw-r--r-- | crypt-gpgme.c | 19 | ||||
| -rw-r--r-- | crypt.c | 2 | ||||
| -rw-r--r-- | edit.c | 4 | ||||
| -rw-r--r-- | handler.c | 22 | ||||
| -rw-r--r-- | mbox.c | 30 | ||||
| -rw-r--r-- | mutt.h | 6 | ||||
| -rw-r--r-- | pager.c | 12 | ||||
| -rw-r--r-- | parse.c | 28 | ||||
| -rw-r--r-- | pattern.c | 6 | ||||
| -rw-r--r-- | pgp.c | 13 | ||||
| -rw-r--r-- | pgpmicalg.c | 10 | ||||
| -rw-r--r-- | pgppacket.c | 6 | ||||
| -rw-r--r-- | pgppubring.c | 8 | ||||
| -rw-r--r-- | pop.c | 2 | ||||
| -rw-r--r-- | postpone.c | 2 | ||||
| -rw-r--r-- | protos.h | 2 | ||||
| -rw-r--r-- | sendlib.c | 6 | ||||
| -rw-r--r-- | smime.c | 8 |
22 files changed, 122 insertions, 120 deletions
@@ -168,7 +168,7 @@ int mutt_compose_attachment (BODY *a) /* Remove headers by copying out data to another file, then * copying the file back */ - fseek (fp, b->offset, 0); + fseeko (fp, b->offset, 0); mutt_mktemp (tempfile); if ((tfp = safe_fopen (tempfile, "w")) == NULL) { @@ -771,7 +771,7 @@ int mutt_save_attachment (FILE *fp, BODY *m, char *path, int flags, HEADER *hdr) hn->msgno = hdr->msgno; /* required for MH/maildir */ hn->read = 1; - fseek (fp, m->offset, 0); + fseeko (fp, m->offset, 0); if (fgets (buf, sizeof (buf), fp) == NULL) return -1; if (mx_open_mailbox(path, M_APPEND | M_QUIET, &ctx) == NULL) @@ -806,7 +806,7 @@ int mutt_save_attachment (FILE *fp, BODY *m, char *path, int flags, HEADER *hdr) mutt_perror ("fopen"); return (-1); } - fseek ((s.fpin = fp), m->offset, 0); + fseeko ((s.fpin = fp), m->offset, 0); mutt_decode_attachment (m, &s); if (fclose (s.fpout) != 0) @@ -52,14 +52,14 @@ static short BuffyNotify = 0; /* # of unnotified new boxes */ int fseek_last_message (FILE * f) { - long int pos; + LOFF_T pos; char buffer[BUFSIZ + 9]; /* 7 for "\n\nFrom " */ int bytes_read; int i; /* Index into `buffer' for scanning. */ memset (buffer, 0, sizeof(buffer)); fseek (f, 0, SEEK_END); - pos = ftell (f); + pos = ftello (f); /* Set `bytes_read' to the size of the last, probably partial, buffer; 0 < * `bytes_read' <= `BUFSIZ'. */ @@ -72,14 +72,14 @@ int fseek_last_message (FILE * f) { /* we save in the buffer at the end the first 7 chars from the last read */ strncpy (buffer + BUFSIZ, buffer, 5+2); /* 2 == 2 * mutt_strlen(CRLF) */ - fseek (f, pos, SEEK_SET); + fseeko (f, pos, SEEK_SET); bytes_read = fread (buffer, sizeof (char), bytes_read, f); if (bytes_read == -1) return -1; for (i = bytes_read; --i >= 0;) if (!mutt_strncmp (buffer + i, "\n\nFrom ", mutt_strlen ("\n\nFrom "))) { /* found it - go to the beginning of the From */ - fseek (f, pos + i + 2, SEEK_SET); + fseeko (f, pos + i + 2, SEEK_SET); return 0; } bytes_read = BUFSIZ; @@ -41,7 +41,7 @@ static int copy_delete_attach (BODY *b, FILE *fpin, FILE *fpout, char *date); * 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, +mutt_copy_hdr (FILE *in, FILE *out, LOFF_T off_start, LOFF_T off_end, int flags, const char *prefix) { int from = 0; @@ -56,8 +56,8 @@ mutt_copy_hdr (FILE *in, FILE *out, long off_start, long off_end, int flags, char *this_one = NULL; int error; - 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; @@ -67,7 +67,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 */ - while (ftell (in) < off_end) + while (ftello (in) < off_end) { nl = strchr (buf, '\n'); @@ -136,7 +136,7 @@ mutt_copy_hdr (FILE *in, FILE *out, long off_start, long off_end, int flags, headers = safe_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'); @@ -165,10 +165,10 @@ mutt_copy_hdr (FILE *in, FILE *out, long off_start, long off_end, int flags, strcat (headers[x], this_one); /* __STRCAT_CHECKED__ */ FREE (&this_one); } - + this_one = NULL; } - + ignore = 1; this_is_from = 0; if (!from && mutt_strncmp ("From ", buf, 5) == 0) @@ -222,7 +222,7 @@ mutt_copy_hdr (FILE *in, FILE *out, long off_start, long off_end, int flags, } } } - + ignore = 0; } /* If beginning of header */ @@ -238,7 +238,7 @@ mutt_copy_hdr (FILE *in, FILE *out, long off_start, long off_end, int flags, strcat (this_one, buf); /* __STRCAT_CHECKED__ */ } } - } /* 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) @@ -258,7 +258,7 @@ mutt_copy_hdr (FILE *in, FILE *out, long off_start, long off_end, int flags, strcat (headers[x], this_one); /* __STRCAT_CHECKED__ */ FREE (&this_one); } - + this_one = NULL; } @@ -571,7 +571,7 @@ _mutt_copy_message (FILE *fpout, FILE *fpin, HEADER *hdr, BODY *body, date[5] = date[mutt_strlen (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, mutt_strlen (date)); @@ -586,10 +586,10 @@ _mutt_copy_message (FILE *fpout, FILE *fpin, HEADER *hdr, BODY *body, fprintf (fpout, "Lines: %d\n\n", new_lines); if (ferror (fpout) || feof (fpout)) return -1; - new_offset = ftell (fpout); + 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; @@ -686,7 +686,7 @@ _mutt_copy_message (FILE *fpout, FILE *fpin, HEADER *hdr, BODY *body, 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); @@ -698,7 +698,7 @@ _mutt_copy_message (FILE *fpout, FILE *fpin, HEADER *hdr, BODY *body, } else { - fseek (fpin, body->offset, 0); + fseeko (fpin, body->offset, 0); if (flags & M_CM_PREFIX) { int c; @@ -767,7 +767,7 @@ _mutt_append_message (CONTEXT *dest, FILE *fpin, CONTEXT *src, HEADER *hdr, MESSAGE *msg; int r; - fseek(fpin, hdr->offset, 0); + fseeko (fpin, hdr->offset, 0); if (fgets (buf, sizeof (buf), fpin) == NULL) return -1; @@ -814,7 +814,7 @@ static int copy_delete_attach (BODY *b, FILE *fpin, FILE *fpout, char *date) 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) @@ -827,11 +827,11 @@ static int copy_delete_attach (BODY *b, FILE *fpin, FILE *fpout, char *date) 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 */ - fseek (fpin, part->offset + part->length, SEEK_SET); + fseeko (fpin, part->offset + part->length, SEEK_SET); } else { @@ -842,7 +842,7 @@ static int copy_delete_attach (BODY *b, FILE *fpin, FILE *fpout, char *date) } /* 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; @@ -37,7 +37,7 @@ -int mutt_copy_hdr (FILE *, FILE *, long, long, int, const char *); +int mutt_copy_hdr (FILE *, FILE *, LOFF_T, LOFF_T, int, const char *); int mutt_copy_header (FILE *, HEADER *, FILE *, int, const char *); diff --git a/crypt-gpgme.c b/crypt-gpgme.c index f90cb5f1..07d0039a 100644 --- a/crypt-gpgme.c +++ b/crypt-gpgme.c @@ -1621,7 +1621,7 @@ int smime_gpgme_decrypt_mime (FILE *fpin, FILE **fpout, BODY *b, BODY **cur) STATE s; FILE *tmpfp=NULL; int is_signed; - long saved_b_offset; + LOFF_T saved_b_offset; size_t saved_b_length; int saved_b_type; @@ -1640,7 +1640,7 @@ int smime_gpgme_decrypt_mime (FILE *fpin, FILE **fpout, BODY *b, BODY **cur) saved_b_length = b->length; memset (&s, 0, sizeof (s)); s.fpin = fpin; - fseek (s.fpin, b->offset, 0); + fseeko (s.fpin, b->offset, 0); mutt_mktemp (tempfile); if (!(tmpfp = safe_fopen (tempfile, "w+"))) { @@ -1652,7 +1652,7 @@ int smime_gpgme_decrypt_mime (FILE *fpin, FILE **fpout, BODY *b, BODY **cur) s.fpout = tmpfp; mutt_decode_attachment (b, &s); fflush (tmpfp); - b->length = ftell (s.fpout); + b->length = ftello (s.fpout); b->offset = 0; rewind (tmpfp); @@ -1694,7 +1694,7 @@ int smime_gpgme_decrypt_mime (FILE *fpin, FILE **fpout, BODY *b, BODY **cur) saved_b_length = bb->length; memset (&s, 0, sizeof (s)); s.fpin = *fpout; - fseek (s.fpin, bb->offset, 0); + fseeko (s.fpin, bb->offset, 0); mutt_mktemp (tempfile); if (!(tmpfp = safe_fopen (tempfile, "w+"))) { @@ -1706,7 +1706,7 @@ int smime_gpgme_decrypt_mime (FILE *fpin, FILE **fpout, BODY *b, BODY **cur) s.fpout = tmpfp; mutt_decode_attachment (bb, &s); fflush (tmpfp); - bb->length = ftell (s.fpout); + bb->length = ftello (s.fpout); bb->offset = 0; rewind (tmpfp); fclose (*fpout); @@ -1887,7 +1887,8 @@ int pgp_gpgme_application_handler (BODY *m, STATE *s) int needpass = -1, pgp_keyblock = 0; int clearsign = 0; long start_pos = 0; - long bytes, last_pos, offset; + long bytes; + LOFF_T last_pos, offset; char buf[HUGE_STRING]; FILE *pgpout = NULL; @@ -1907,7 +1908,7 @@ int pgp_gpgme_application_handler (BODY *m, STATE *s) if (!mutt_get_body_charset (body_charset, sizeof (body_charset), m)) strfcpy (body_charset, "iso-8859-1", sizeof body_charset); - fseek (s->fpin, m->offset, 0); + fseeko (s->fpin, m->offset, 0); last_pos = m->offset; for (bytes = m->length; bytes > 0;) @@ -1915,7 +1916,7 @@ int pgp_gpgme_application_handler (BODY *m, STATE *s) if (fgets (buf, sizeof (buf), s->fpin) == NULL) break; - offset = ftell (s->fpin); + offset = ftello (s->fpin); bytes -= (offset - last_pos); /* don't rely on mutt_strlen(buf) */ last_pos = offset; @@ -1954,7 +1955,7 @@ int pgp_gpgme_application_handler (BODY *m, STATE *s) gpgme_data_write (armored_data, buf, strlen (buf)); while (bytes > 0 && fgets (buf, sizeof (buf) - 1, s->fpin) != NULL) { - offset = ftell (s->fpin); + offset = ftello (s->fpin); bytes -= (offset - last_pos); /* don't rely on mutt_strlen(buf)*/ last_pos = offset; @@ -504,7 +504,7 @@ int crypt_write_signed(BODY *a, STATE *s, const char *tempfile) return -1; } - fseek (s->fpin, a->hdr_offset, 0); + fseeko (s->fpin, a->hdr_offset, 0); bytes = a->length + a->offset - a->hdr_offset; hadcr = 0; while (bytes > 0) @@ -61,7 +61,7 @@ static char* EditorHelp2 = N_("\ . on a line by itself ends input\n"); static char ** -be_snarf_data (FILE *f, char **buf, int *bufmax, int *buflen, int offset, +be_snarf_data (FILE *f, char **buf, int *bufmax, int *buflen, LOFF_T offset, int bytes, int prefix) { char tmp[HUGE_STRING]; @@ -77,7 +77,7 @@ be_snarf_data (FILE *f, char **buf, int *bufmax, int *buflen, int offset, tmplen = sizeof (tmp) - tmplen; } - fseek (f, offset, 0); + fseeko (f, offset, 0); while (bytes > 0) { if (fgets (p, tmplen - 1, f) == NULL) break; @@ -1340,7 +1340,7 @@ static int alternative_handler (BODY *a, STATE *s) { if (s->flags & M_DISPLAY && !option (OPTWEED)) { - fseek (s->fpin, choice->hdr_offset, 0); + fseeko (s->fpin, choice->hdr_offset, 0); mutt_copy_bytes(s->fpin, s->fpout, choice->offset-choice->hdr_offset); } mutt_body_handler (choice, s); @@ -1364,16 +1364,16 @@ int message_handler (BODY *a, STATE *s) { struct stat st; BODY *b; - long off_start; + LOFF_T off_start; int rc = 0; - off_start = ftell (s->fpin); + off_start = ftello (s->fpin); if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE || a->encoding == ENCUUENCODED) { fstat (fileno (s->fpin), &st); b = mutt_new_body (); - b->length = (long) st.st_size; + b->length = (LOFF_T) st.st_size; b->parts = mutt_parse_messageRFC822 (s->fpin, b); } else @@ -1482,7 +1482,7 @@ int multipart_handler (BODY *a, STATE *s) TYPE (p), p->subtype, ENCODING (p->encoding), length); if (!option (OPTWEED)) { - fseek (s->fpin, p->hdr_offset, 0); + fseeko (s->fpin, p->hdr_offset, 0); mutt_copy_bytes(s->fpin, s->fpout, p->offset-p->hdr_offset); } else @@ -1697,7 +1697,7 @@ static int external_body_handler (BODY *b, STATE *s) state_printf (s, _("[-- name: %s --]\n"), b->parts->filename); } - mutt_copy_hdr (s->fpin, s->fpout, ftell (s->fpin), b->parts->offset, + mutt_copy_hdr (s->fpin, s->fpout, ftello (s->fpin), b->parts->offset, (option (OPTWEED) ? (CH_WEED | CH_REORDER) : 0) | CH_DECODE , NULL); } @@ -1712,7 +1712,7 @@ static int external_body_handler (BODY *b, STATE *s) state_attach_puts (_("[-- and the indicated external source has --]\n" "[-- expired. --]\n"), s); - mutt_copy_hdr(s->fpin, s->fpout, ftell (s->fpin), b->parts->offset, + mutt_copy_hdr(s->fpin, s->fpout, ftello (s->fpin), b->parts->offset, (option (OPTWEED) ? (CH_WEED | CH_REORDER) : 0) | CH_DECODE, NULL); } @@ -1729,7 +1729,7 @@ static int external_body_handler (BODY *b, STATE *s) state_printf (s, _("[-- and the indicated access-type %s is unsupported --]\n"), access_type); - mutt_copy_hdr (s->fpin, s->fpout, ftell (s->fpin), b->parts->offset, + mutt_copy_hdr (s->fpin, s->fpout, ftello (s->fpin), b->parts->offset, (option (OPTWEED) ? (CH_WEED | CH_REORDER) : 0) | CH_DECODE , NULL); } @@ -1750,7 +1750,7 @@ void mutt_decode_attachment (BODY *b, STATE *s) cd = mutt_iconv_open (Charset, charset, M_ICONV_HOOK_FROM); } - fseek (s->fpin, b->offset, 0); + fseeko (s->fpin, b->offset, 0); switch (b->encoding) { case ENCQUOTEDPRINTABLE: @@ -1867,7 +1867,7 @@ int mutt_body_handler (BODY *b, STATE *s) if (plaintext || handler) { - fseek (s->fpin, b->offset, 0); + fseeko (s->fpin, b->offset, 0); /* see if we need to decode this part before processing it */ if (b->encoding == ENCBASE64 || b->encoding == ENCQUOTEDPRINTABLE || @@ -1912,7 +1912,7 @@ int mutt_body_handler (BODY *b, STATE *s) if (decode) { - b->length = ftell (s->fpout); + b->length = ftello (s->fpout); b->offset = 0; fclose (s->fpout); @@ -41,10 +41,10 @@ struct m_update_t { short valid; - long hdr; - long body; + LOFF_T hdr; + LOFF_T body; long lines; - long length; + LOFF_T length; }; /* parameters: @@ -147,7 +147,7 @@ int mmdf_parse_mailbox (CONTEXT *ctx) if (!is_from (buf, return_path, sizeof (return_path), &t)) { - if (fseek (ctx->fp, loc, SEEK_SET) != 0) + if (fseeko (ctx->fp, loc, SEEK_SET) != 0) { dprint (1, (debugfile, "mmdf_parse_mailbox: fseek() failed\n")); mutt_error _("Mailbox is corrupt!"); @@ -167,11 +167,11 @@ int mmdf_parse_mailbox (CONTEXT *ctx) if (0 < tmploc && tmploc < ctx->size) { - if (fseek (ctx->fp, tmploc, SEEK_SET) != 0 || + if (fseeko (ctx->fp, tmploc, SEEK_SET) != 0 || fgets (buf, sizeof (buf) - 1, ctx->fp) == NULL || mutt_strcmp (MMDF_SEP, buf) != 0) { - if (fseek (ctx->fp, loc, SEEK_SET) != 0) + if (fseeko (ctx->fp, loc, SEEK_SET) != 0) dprint (1, (debugfile, "mmdf_parse_mailbox: fseek() failed\n")); hdr->content->length = -1; } @@ -319,7 +319,7 @@ int mbox_parse_mailbox (CONTEXT *ctx) fgets (buf, sizeof (buf), ctx->fp) == NULL || mutt_strncmp ("From ", buf, 5) != 0) { - dprint (1, (debugfile, "mbox_parse_mailbox: bad content-length in message %d (cl=%ld)\n", curhdr->index, curhdr->content->length)); + dprint (1, (debugfile, "mbox_parse_mailbox: bad content-length in message %d (cl=" OFF_T_FMT ")\n", curhdr->index, curhdr->content->length)); dprint (1, (debugfile, "\tLINE: %s", buf)); if (fseeko (ctx->fp, loc, SEEK_SET) != 0) /* nope, return the previous position */ { @@ -601,14 +601,14 @@ int mbox_check_mailbox (CONTEXT *ctx, int *index_hint) * see the message separator at *exactly* what used to be the end of the * folder. */ - if (fseek (ctx->fp, ctx->size, SEEK_SET) != 0) + if (fseeko (ctx->fp, ctx->size, SEEK_SET) != 0) dprint (1, (debugfile, "mbox_check_mailbox: fseek() failed\n")); if (fgets (buffer, sizeof (buffer), ctx->fp) != NULL) { if ((ctx->magic == M_MBOX && mutt_strncmp ("From ", buffer, 5) == 0) || (ctx->magic == M_MMDF && mutt_strcmp (MMDF_SEP, buffer) == 0)) { - if (fseek (ctx->fp, ctx->size, SEEK_SET) != 0) + if (fseeko (ctx->fp, ctx->size, SEEK_SET) != 0) dprint (1, (debugfile, "mbox_check_mailbox: fseek() failed\n")); if (ctx->magic == M_MBOX) mbox_parse_mailbox (ctx); @@ -675,7 +675,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int *index_hint) int rc = -1; int need_sort = 0; /* flag to resort mailbox if new mail arrives */ int first = -1; /* first message to be written */ - long offset; /* location in mailbox to write changed messages */ + LOFF_T offset; /* location in mailbox to write changed messages */ struct stat statbuf; struct utimbuf utimebuf; struct m_update_t *newOffset = NULL; @@ -808,7 +808,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int *index_hint) * temporary file only contains saved message which are located after * `offset' in the real mailbox */ - newOffset[i - first].hdr = ftell (fp) + offset; + newOffset[i - first].hdr = ftello (fp) + offset; if (mutt_copy_message (fp, ctx, ctx->hdrs[i], M_CM_UPDATE, CH_FROM | CH_UPDATE | CH_UPDATE_LEN) == -1) { @@ -824,7 +824,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int *index_hint) * we just flush the in memory cache so that the message will be reparsed * if the user accesses it later. */ - newOffset[i - first].body = ftell (fp) - ctx->hdrs[i]->content->length + offset; + newOffset[i - first].body = ftello (fp) - ctx->hdrs[i]->content->length + offset; mutt_free_body (&ctx->hdrs[i]->content->parts); switch(ctx->magic) @@ -880,7 +880,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int *index_hint) return (-1); } - if (fseek (ctx->fp, offset, SEEK_SET) != 0 || /* seek the append location */ + if (fseeko (ctx->fp, offset, SEEK_SET) != 0 || /* seek the append location */ /* do a sanity check to make sure the mailbox looks ok */ fgets (buf, sizeof (buf), ctx->fp) == NULL || (ctx->magic == M_MBOX && mutt_strncmp ("From ", buf, 5) != 0) || @@ -892,7 +892,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int *index_hint) } else { - if (fseek (ctx->fp, offset, SEEK_SET) != 0) /* return to proper offset */ + if (fseeko (ctx->fp, offset, SEEK_SET) != 0) /* return to proper offset */ { i = -1; dprint (1, (debugfile, "mbox_sync_mailbox: fseek() failed\n")); @@ -910,7 +910,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int *index_hint) } if (i == 0) { - ctx->size = ftell (ctx->fp); /* update the size of the mailbox */ + ctx->size = ftello (ctx->fp); /* update the size of the mailbox */ ftruncate (fileno (ctx->fp), ctx->size); } } @@ -627,8 +627,8 @@ typedef struct body * where we need to send the headers of the * attachment */ - long offset; /* offset where the actual data begins */ - LOFF_T length; /* length (in bytes) of attachment */ + LOFF_T offset; /* offset where the actual data begins */ + LOFF_T length; /* length (in bytes) of attachment */ char *filename; /* when sending a message, this is the file * to which this structure refers */ @@ -740,7 +740,7 @@ typedef struct header time_t date_sent; /* time when the message was sent (UTC) */ time_t received; /* time when the message was placed in the mailbox */ - long offset; /* where in the stream does this message begin? */ + LOFF_T offset; /* where in the stream does this message begin? */ int lines; /* how many lines in the body of this message? */ int index; /* the absolute (unsorted) message number */ int msgno; /* number displayed to the user */ @@ -113,7 +113,7 @@ struct syntax_t struct line_t { - long offset; + LOFF_T offset; short type; short continuation; short chunks; @@ -999,7 +999,7 @@ trim_incomplete_mbyte(unsigned char *buf, size_t len) } static int -fill_buffer (FILE *f, long *last_pos, long offset, unsigned char *buf, +fill_buffer (FILE *f, LOFF_T *last_pos, LOFF_T offset, unsigned char *buf, unsigned char *fmt, size_t blen, int *buf_ready) { unsigned char *p; @@ -1009,13 +1009,13 @@ fill_buffer (FILE *f, long *last_pos, long offset, unsigned char *buf, { buf[blen - 1] = 0; if (offset != *last_pos) - fseek (f, offset, 0); + fseeko (f, offset, 0); if (fgets ((char *) buf, blen - 1, f) == NULL) { fmt[0] = 0; return (-1); } - *last_pos = ftell (f); + *last_pos = ftello (f); b_read = (int) (*last_pos - offset); *buf_ready = 1; @@ -1232,7 +1232,7 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf, */ static int -display_line (FILE *f, long *last_pos, struct line_t **lineInfo, int n, +display_line (FILE *f, LOFF_T *last_pos, struct line_t **lineInfo, int n, int *last, int *max, int flags, struct q_class_t **QuoteList, int *q_level, int *force_redraw, regex_t *SearchRE) { @@ -1519,7 +1519,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra) int r = -1; int redraw = REDRAW_FULL; FILE *fp = NULL; - long last_pos = 0, last_offset = 0; + LOFF_T last_pos = 0, last_offset = 0; int old_smart_wrap, old_markers; struct stat sb; regex_t SearchRE; @@ -431,7 +431,7 @@ BODY *mutt_read_mime_header (FILE *fp, int digest) char *line = safe_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; @@ -488,7 +488,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 = safe_strdup ("plain"); else if (p->type == TYPEMESSAGE && !p->subtype) @@ -513,7 +513,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", b->subtype) == 0); @@ -522,7 +522,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) @@ -560,7 +560,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; @@ -590,7 +590,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, int digest) +BODY *mutt_parse_multipart (FILE *fp, const char *boundary, LOFF_T end_off, int digest) { #ifdef SUN_ATTACHMENT int lines; @@ -608,7 +608,7 @@ BODY *mutt_parse_multipart (FILE *fp, const char *boundary, long end_off, int di } blen = mutt_strlen (boundary); - while (ftell (fp) < end_off && fgets (buffer, LONG_STRING, fp) != NULL) + while (ftello (fp) < end_off && fgets (buffer, LONG_STRING, fp) != NULL) { len = mutt_strlen (buffer); @@ -619,9 +619,9 @@ BODY *mutt_parse_multipart (FILE *fp, const char *boundary, long end_off, int di { 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; + last->parts->length = 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; @@ -645,7 +645,7 @@ BODY *mutt_parse_multipart (FILE *fp, const char *boundary, long end_off, int di if (mutt_get_parameter ("content-lines", new->parameter)) { for (lines = atoi(mutt_get_parameter ("content-lines", new->parameter)); lines; lines-- ) - if (ftell (fp) >= end_off || fgets (buffer, LONG_STRING, fp) == NULL) + if (ftello (fp) >= end_off || fgets (buffer, LONG_STRING, fp) == NULL) break; } #endif @@ -1304,7 +1304,7 @@ ENVELOPE *mutt_read_rfc822_header (FILE *f, HEADER *hdr, short user_hdrs, LIST *last = NULL; char *line = safe_malloc (LONG_STRING); char *p; - long loc; + LOFF_T loc; int matched; size_t linelen = LONG_STRING; char buf[LONG_STRING+1]; @@ -1326,7 +1326,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; @@ -1347,7 +1347,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 */ } @@ -1409,7 +1409,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); /* do RFC2047 decoding */ rfc2047_decode_adrlist (e->from); @@ -190,7 +190,7 @@ msg_search (CONTEXT *ctx, pattern_t* pat, int msgno) return (0); } - fseek (msg->fp, h->offset, 0); + fseeko (msg->fp, h->offset, 0); mutt_body_handler (h->content, &s); } @@ -206,13 +206,13 @@ msg_search (CONTEXT *ctx, pattern_t* pat, int msgno) fp = msg->fp; if (pat->op != M_BODY) { - fseek (fp, h->offset, 0); + fseeko (fp, h->offset, 0); lng = h->content->offset - h->offset; } if (pat->op != M_HEADER) { if (pat->op == M_BODY) - fseek (fp, h->content->offset, 0); + fseeko (fp, h->content->offset, 0); lng += h->content->length; } } @@ -247,7 +247,8 @@ int pgp_application_pgp_handler (BODY *m, STATE *s) int clearsign = 0, rv, rc; int c = 1; /* silence GCC warning */ long start_pos = 0; - long bytes, last_pos, offset; + long bytes; + LOFF_T last_pos, offset; char buf[HUGE_STRING]; char outfile[_POSIX_PATH_MAX]; char tmpfname[_POSIX_PATH_MAX]; @@ -263,7 +264,7 @@ int pgp_application_pgp_handler (BODY *m, STATE *s) rc = 0; /* silence false compiler warning if (s->flags & M_DISPLAY) */ - fseek (s->fpin, m->offset, 0); + fseeko (s->fpin, m->offset, 0); last_pos = m->offset; for (bytes = m->length; bytes > 0;) @@ -271,7 +272,7 @@ int pgp_application_pgp_handler (BODY *m, STATE *s) if (fgets (buf, sizeof (buf), s->fpin) == NULL) break; - offset = ftell (s->fpin); + offset = ftello (s->fpin); bytes -= (offset - last_pos); /* don't rely on mutt_strlen(buf) */ last_pos = offset; @@ -315,7 +316,7 @@ int pgp_application_pgp_handler (BODY *m, STATE *s) |