char *end; /* One past the last character read in. */
/* The following support tracking of the read position in the
input file stream so that callers can interleave m_getfld()
- calls with ftell() and fseek(). ytes_read replaces the old
+ calls with ftell() and fseek(). bytes_read replaces the old
m_getfld() msg_count global. last_caller_pos is stored when
leaving m_getfld()/m_unknown(), then checked on the next entry.
last_internal_pos is used to remember the position used
* The "full" delimiter string for a packed maildrop consists
* of a newline followed by the actual delimiter. E.g., the
* full string for a Unix maildrop would be: "\n\nFrom ".
- * "Fdelim" points to the start of the full string and is used
+ * "fdelim" points to the start of the full string and is used
* in the BODY case of the main routine to search the buffer for
* a possible eom. Msg_delim points to the first character of
- * the actual delim. string (i.e., fdelim+1). Edelim
+ * the actual delim. string (i.e., fdelim+1). edelim
* points to the 2nd character of actual delimiter string. It
* is used in m_Eom because the first character of the string
* has been read and matched before m_Eom is called.
m_getfld_state_init (m_getfld_state_t *gstate, FILE *iob) {
m_getfld_state_t s;
- s = *gstate = (m_getfld_state_t) mh_xmalloc(sizeof (struct m_getfld_state));
+ NEW(s);
+ *gstate = s;
s->readpos = s->end = s->msg_buf;
s->bytes_read = s->total_bytes_read = 0;
s->last_caller_pos = s->last_internal_pos = 0;
enter_getfld (m_getfld_state_t *gstate, FILE *iob) {
m_getfld_state_t s;
off_t pos;
+ off_t pos_movement;
if (! *gstate) {
m_getfld_state_init (gstate, iob);
return;
pos = ftello(iob);
- if (pos != 0 || s->last_internal_pos != 0) {
- if (s->last_internal_pos == 0) {
- s->total_bytes_read = pos;
- } else {
- off_t pos_movement = pos - s->last_caller_pos; /* Can be < 0. */
-
- if (pos_movement == 0) {
- pos = s->last_internal_pos;
- } else {
- /* The current file stream position differs from the
- last one, so caller must have called ftell/o().
- Or, this is the first call and the file position
- was not at 0. */
-
- if (s->readpos + pos_movement >= s->msg_buf &&
- s->readpos + pos_movement < s->end) {
- /* This is currently unused. It could be used by
- parse_mime() if it was changed to use a global
- m_getfld_state. */
- /* We can shift readpos and remain within the
- bounds of msg_buf. */
- s->readpos += pos_movement;
- s->total_bytes_read += pos_movement;
- pos = s->last_internal_pos;
- } else {
- size_t num_read;
-
- /* This seek skips past an integral number of
- chunks of size MSG_INPUT_SIZE. */
- fseeko (iob, pos/MSG_INPUT_SIZE * MSG_INPUT_SIZE, SEEK_SET);
- num_read = fread (s->msg_buf, 1, MSG_INPUT_SIZE, iob);
- s->readpos = s->msg_buf + pos % MSG_INPUT_SIZE;
- s->end = s->msg_buf + num_read;
- s->total_bytes_read = pos;
- }
- }
+ if (pos == 0 && s->last_internal_pos == 0)
+ return;
- fseeko (iob, pos, SEEK_SET);
- }
+ if (s->last_internal_pos == 0) {
+ s->total_bytes_read = pos;
+ return;
}
+
+ pos_movement = pos - s->last_caller_pos; /* Can be < 0. */
+ if (pos_movement == 0) {
+ pos = s->last_internal_pos;
+ } else {
+ /* The current file stream position differs from the
+ last one, so caller must have called ftell/o().
+ Or, this is the first call and the file position
+ was not at 0. */
+
+ if (s->readpos + pos_movement >= s->msg_buf &&
+ s->readpos + pos_movement < s->end) {
+ /* This is currently unused. It could be used by
+ parse_mime() if it was changed to use a global
+ m_getfld_state. */
+ /* We can shift readpos and remain within the
+ bounds of msg_buf. */
+ s->readpos += pos_movement;
+ s->total_bytes_read += pos_movement;
+ pos = s->last_internal_pos;
+ } else {
+ size_t num_read;
+
+ /* This seek skips past an integral number of
+ chunks of size MSG_INPUT_SIZE. */
+ fseeko (iob, pos/MSG_INPUT_SIZE * MSG_INPUT_SIZE, SEEK_SET);
+ num_read = fread (s->msg_buf, 1, MSG_INPUT_SIZE, iob);
+ s->readpos = s->msg_buf + pos % MSG_INPUT_SIZE;
+ s->end = s->msg_buf + num_read;
+ s->total_bytes_read = pos;
+ }
+ }
+
+ fseeko (iob, pos, SEEK_SET);
}
static void
but EOF is typically 0xffffffff. */
static int
Getc (m_getfld_state_t s) {
- if (s->end - s->readpos < 1 && read_more (s) == 0) {
+ if ((s->end - s->readpos < 1 && read_more (s) == 0) ||
+ s->readpos >= s->end)
return EOF;
- } else {
- ++s->bytes_read;
- return s->readpos < s->end ? (unsigned char) *s->readpos++ : EOF;
- }
+
+ s->bytes_read++;
+ return (unsigned char)*s->readpos++;
}
static int
enter_getfld (gstate, iob);
s = *gstate;
- if ((c = Getc(s)) < 0) {
+ if ((c = Getc(s)) == EOF) {
*bufsz = *buf = 0;
leave_getfld (s);
return s->state = FILEEOF;
}
if (eom (c, s)) {
/* flush null messages */
- while ((c = Getc(s)) >= 0 && eom (c, s))
+ while ((c = Getc(s)) != EOF && eom (c, s))
;
- if (c >= 0)
+ if (c != EOF)
Ungetc(c, s);
*bufsz = *buf = 0;
leave_getfld (s);
case FLD:
if (c == '\n' || c == '-') {
/* we hit the header/body separator */
- while (c != '\n' && (c = Getc(s)) >= 0) continue;
+ while (c != '\n' && (c = Getc(s)) != EOF)
+ ;
- if (c < 0 || (c = Getc(s)) < 0 || eom (c, s)) {
+ if (c == EOF || (c = Getc(s)) == EOF || eom (c, s)) {
/* flush null messages */
- while ((c = Getc(s)) >= 0 && eom (c, s))
+ while ((c = Getc(s)) != EOF && eom (c, s))
;
- if (c >= 0)
+ if (c != EOF)
Ungetc(c, s);
*bufsz = *buf = 0;
leave_getfld (s);
if (i == sizeof from-1 && strncmp (text, "From ", sizeof from-1) == 0) {
s->msg_style = MS_MBOX;
delimstr = "\nFrom ";
- while ((c = Getc (s)) != '\n' && c >= 0) continue;
+ while ((c = Getc(s)) != EOF && c != '\n')
+ ;
} else {
/* not a Unix style maildrop */
s->readpos -= s->bytes_read;
if (s->msg_style == MS_MMDF) {
/* flush extra msg hdrs */
- while ((c = Getc(s)) >= 0 && eom (c, s))
+ while ((c = Getc(s)) != EOF && eom (c, s))
;
- if (c >= 0)
+ if (c != EOF)
Ungetc(c, s);
}
if (s->msg_style == MS_MBOX) {
int c;
- while ((c = Getc (s)) != '\n')
- if (c < 0)
- break;
+ while ((c = Getc(s)) != EOF && c != '\n')
+ ;
}
return 1;
projects / nmh / blobdiff