X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/e33979708ffdf9aa7beafcd67479374120530cfb..94187a80bd60baab4b9c4b949ad820d730578123:/sbr/m_getfld.c diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c index 18e38d04..a8377bf7 100644 --- a/sbr/m_getfld.c +++ b/sbr/m_getfld.c @@ -8,6 +8,7 @@ #include #include #include +#include /* Purpose @@ -59,10 +60,13 @@ Usage ===== - m_getfld_state_t gstate = 0; - ... - int state = m_getfld (&gstate, ...); - ... + m_getfld_state_t gstate; + + gstate = m_getfld_state_init(mailfp); + Perhaps m_getfld_track_filepos2(&gstate); + ... + state = m_getfld2(&gstate, ...); + ...Repeat until finished with mailfp. m_getfld_state_destroy (&gstate); The state is retained internally by gstate. To reset its state to FLD: @@ -90,7 +94,7 @@ To speed things up considerably, the routine Eom() was made an auxiliary function called by the macro eom(). Unless we are bursting a maildrop, - the eom() macro returns FALSE saying we aren't at the end of the + the eom() macro returns false saying we aren't at the end of the message. The next thing to do is to read the mts.conf file and initialize @@ -200,6 +204,7 @@ /* * static prototypes */ +static void Ungetc(m_getfld_state_t s); static int m_Eom (m_getfld_state_t); #define eom(c,s) (s->msg_style != MS_DEFAULT && \ @@ -304,13 +309,11 @@ struct m_getfld_state { int state; }; -static -void -m_getfld_state_init (m_getfld_state_t *gstate, FILE *iob) { +m_getfld_state_t m_getfld_state_init(FILE *iob) +{ m_getfld_state_t s; 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; @@ -322,6 +325,8 @@ m_getfld_state_init (m_getfld_state_t *gstate, FILE *iob) { s->fdelimlen = s->edelimlen = 0; s->state = FLD; s->track_filepos = 0; + + return s; } /* scan() needs to force an initial state of FLD for each message. */ @@ -338,12 +343,21 @@ m_getfld_state_reset (m_getfld_state_t *gstate) { void m_getfld_track_filepos (m_getfld_state_t *gstate, FILE *iob) { if (! *gstate) { - m_getfld_state_init (gstate, iob); + *gstate = m_getfld_state_init(iob); } (*gstate)->track_filepos = 1; } +/* m_getfld_track_filepos() with the existing iob. */ +void m_getfld_track_filepos2(m_getfld_state_t *gstate) +{ + if (!*gstate) + adios(NULL, "m_getfld_track_filepos2 without gstate"); + + m_getfld_track_filepos(gstate, (*gstate)->iob); +} + void m_getfld_state_destroy (m_getfld_state_t *gstate) { m_getfld_state_t s = *gstate; @@ -393,7 +407,7 @@ enter_getfld (m_getfld_state_t *gstate, FILE *iob) { off_t pos_movement; if (! *gstate) { - m_getfld_state_init (gstate, iob); + *gstate = m_getfld_state_init(iob); } s = *gstate; s->bytes_read = 0; @@ -409,7 +423,8 @@ enter_getfld (m_getfld_state_t *gstate, FILE *iob) { if (!s->track_filepos) return; - pos = ftello(iob); + if ((pos = ftello(iob)) == -1) + adios("getfld's iob", "failed to get offset on entry"); if (pos == 0 && s->last_internal_pos == 0) return; @@ -438,11 +453,15 @@ enter_getfld (m_getfld_state_t *gstate, FILE *iob) { s->total_bytes_read += pos_movement; pos = s->last_internal_pos; } else { + off_t off; 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); + off = pos / MSG_INPUT_SIZE * MSG_INPUT_SIZE; + if (fseeko(iob, off, SEEK_SET) == -1) + adios("getfld's iob", "failed to set offset to skip: " + "%" PRIdMAX, (intmax_t)off); 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; @@ -450,7 +469,9 @@ enter_getfld (m_getfld_state_t *gstate, FILE *iob) { } } - fseeko (iob, pos, SEEK_SET); + if (fseeko(iob, pos, SEEK_SET) == -1) + adios("getfld's iob", "failed to set offset on entry: %" PRIdMAX, + (intmax_t)pos); } static void @@ -459,11 +480,15 @@ leave_getfld (m_getfld_state_t s) { if (s->track_filepos) { /* Save the internal file position that we use for the input buffer. */ - s->last_internal_pos = ftello (s->iob); + if ((s->last_internal_pos = ftello(s->iob)) == -1) + adios("getfld's iob", "failed to get offset before seek"); /* Set file stream position so that callers can use ftell(). */ - fseeko (s->iob, s->total_bytes_read, SEEK_SET); - s->last_caller_pos = ftello (s->iob); + if (fseeko(s->iob, s->total_bytes_read, SEEK_SET) == -1) + adios("getfld's iob", "failed to set offset: %" PRIdMAX, + (intmax_t)s->total_bytes_read); + + s->last_caller_pos = s->total_bytes_read; } } @@ -503,27 +528,29 @@ Getc (m_getfld_state_t s) { return (unsigned char)*s->readpos++; } -/* Return the next character that would be read by Getc() without - * consuming it, fetching more of the input for the buffer if required, - * or EOF on end of file. */ +/* Return the next character that Getc() would return, which may be EOF. */ static int -Peek (m_getfld_state_t s) { - if (s->end - s->readpos < 1 && read_more (s) == 0) { - return EOF; - } - return s->readpos < s->end ? (unsigned char) *s->readpos : EOF; +Peek (m_getfld_state_t s) +{ + int c; + + c = Getc(s); + if (c != EOF) + Ungetc(s); + + return c; } -/* If there's room, put non-EOF c back into msg_buf and rewind so it's - * read next. c need not be the value already in the buffer. If there - * isn't room then return EOF, else return c. */ -static int -Ungetc (int c, m_getfld_state_t s) { - if (s->readpos == s->msg_buf) { - return EOF; - } - --s->bytes_read; - return *--s->readpos = (unsigned char) c; +/* If there's room, undo the consumption of one character from msg_buf, + * rewinding so it's read next, else die. */ +static void +Ungetc(m_getfld_state_t s) +{ + if (s->readpos == s->msg_buf) + adios(NULL, "Ungetc() at start of message buffer."); + + s->readpos--; + s->bytes_read--; } @@ -549,7 +576,7 @@ m_getfld (m_getfld_state_t *gstate, char name[NAMESZ], char *buf, int *bufsz, ; if (c != EOF) - Ungetc(c, s); + Ungetc(s); *bufsz = *buf = 0; leave_getfld (s); return s->state = FILEEOF; @@ -567,7 +594,7 @@ m_getfld (m_getfld_state_t *gstate, char name[NAMESZ], char *buf, int *bufsz, while ((c = Getc(s)) != EOF && eom (c, s)) ; if (c != EOF) - Ungetc(c, s); + Ungetc(s); *bufsz = *buf = 0; leave_getfld (s); return s->state = FILEEOF; @@ -816,6 +843,16 @@ m_getfld (m_getfld_state_t *gstate, char name[NAMESZ], char *buf, int *bufsz, } +/* m_getfld() with the existing iob. */ +int m_getfld2(m_getfld_state_t *gstate, char name[NAMESZ], char *buf, int *bufsz) +{ + if (!*gstate) + adios(NULL, "m_getfld2 without gstate"); + + return m_getfld(gstate, name, buf, bufsz, (*gstate)->iob); +} + + void m_unknown(m_getfld_state_t *gstate, FILE *iob) { @@ -889,7 +926,7 @@ m_unknown(m_getfld_state_t *gstate, FILE *iob) * separator) or the last char (since the matchc would have found it * if it was a real delim). */ - s->pat_map = (char **) mh_xcalloc (256, sizeof(char *)); + s->pat_map = mh_xcalloc (256, sizeof(char *)); for (cp = s->fdelim + 1; cp < s->delimend; cp++ ) s->pat_map[(unsigned char)*cp] = cp; @@ -899,13 +936,23 @@ m_unknown(m_getfld_state_t *gstate, FILE *iob) while ((c = Getc(s)) != EOF && eom (c, s)) ; if (c != EOF) - Ungetc(c, s); + Ungetc(s); } leave_getfld (s); } +/* m_unknown() with the existing iob. */ +void m_unknown2(m_getfld_state_t *gstate) +{ + if (!*gstate) + adios(NULL, "m_unknown2 without gstate"); + + m_unknown(gstate, (*gstate)->iob); +} + + /* * test for msg delimiter string */