X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/af56ad38ce8b8123cf048bd02fabec21ba580d15..2b60a54adb3b0bf5a9b927708085492b816a6015:/sbr/m_getfld.c diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c index 2458c3e5..eb377411 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: @@ -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; @@ -446,8 +460,8 @@ enter_getfld (m_getfld_state_t *gstate, FILE *iob) { chunks of size MSG_INPUT_SIZE. */ 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: %ld", - off); + 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; @@ -456,7 +470,8 @@ enter_getfld (m_getfld_state_t *gstate, FILE *iob) { } if (fseeko(iob, pos, SEEK_SET) == -1) - adios("getfld's iob", "failed to set offset on entry: %ld", pos); + adios("getfld's iob", "failed to set offset on entry: %" PRIdMAX, + (intmax_t)pos); } static void @@ -470,10 +485,10 @@ leave_getfld (m_getfld_state_t s) { /* Set file stream position so that callers can use ftell(). */ if (fseeko(s->iob, s->total_bytes_read, SEEK_SET) == -1) - adios("getfld's iob", "failed to set offset: %ld", - s->total_bytes_read); - if ((s->last_caller_pos = ftello(s->iob)) == -1) - adios("getfld's iob", "failed to get offset after seek"); + adios("getfld's iob", "failed to set offset: %" PRIdMAX, + (intmax_t)s->total_bytes_read); + + s->last_caller_pos = s->total_bytes_read; } } @@ -513,29 +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, undo the consumption of one character from msg_buf, - * rewinding so it's read next. If the previous character isn't - * available because we're at the start of msg_buf then return EOF, else - * return the character that will be read next, a la Peek(). */ -static int + * rewinding so it's read next, else die. */ +static void Ungetc(m_getfld_state_t s) { - if (s->readpos == s->msg_buf) { - return EOF; - } - --s->bytes_read; - return *--s->readpos; + if (s->readpos == s->msg_buf) + adios(NULL, "Ungetc() at start of message buffer."); + + s->readpos--; + s->bytes_read--; } @@ -828,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) { @@ -918,6 +943,16 @@ m_unknown(m_getfld_state_t *gstate, FILE *iob) } +/* 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 */