X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/df646add9dde90130753c06938e425c8f8f39c0f..670a0d84c25b458bbb348d2a1ecee178cfa6c226:/sbr/m_getfld.c diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c index 48551ae5..940b3efc 100644 --- a/sbr/m_getfld.c +++ b/sbr/m_getfld.c @@ -5,9 +5,12 @@ * complete copyright information. */ -#include -#include -#include +#include "h/mh.h" +#include "m_getfld.h" +#include "error.h" +#include "h/mts.h" +#include "h/utils.h" +#include /* Purpose @@ -59,10 +62,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 +96,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 +206,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 +311,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,11 +327,14 @@ 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. */ void -m_getfld_state_reset (m_getfld_state_t *gstate) { +m_getfld_state_reset (m_getfld_state_t *gstate) +{ if (*gstate) { (*gstate)->state = FLD; } @@ -336,15 +344,28 @@ m_getfld_state_reset (m_getfld_state_t *gstate) { calls, m_getfld() must keep track of the file position. The caller must use this function to inform m_getfld(). */ void -m_getfld_track_filepos (m_getfld_state_t *gstate, FILE *iob) { +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; } -void m_getfld_state_destroy (m_getfld_state_t *gstate) { +/* m_getfld_track_filepos() with the existing iob. */ +void +m_getfld_track_filepos2(m_getfld_state_t *gstate) +{ + if (!*gstate) + die("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; if (s) { @@ -387,13 +408,14 @@ void m_getfld_state_destroy (m_getfld_state_t *gstate) { static void -enter_getfld (m_getfld_state_t *gstate, FILE *iob) { +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); + *gstate = m_getfld_state_init(iob); } s = *gstate; s->bytes_read = 0; @@ -446,8 +468,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,11 +478,13 @@ 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 -leave_getfld (m_getfld_state_t s) { +leave_getfld (m_getfld_state_t s) +{ s->total_bytes_read += s->bytes_read; if (s->track_filepos) { @@ -470,15 +494,16 @@ 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); + adios("getfld's iob", "failed to set offset: %" PRIdMAX, + (intmax_t)s->total_bytes_read); s->last_caller_pos = s->total_bytes_read; } } static size_t -read_more (m_getfld_state_t s) { +read_more (m_getfld_state_t s) +{ /* Retain at least edelimlen characters that have already been read, if at least edelimlen have been read, so that we can back up to them in m_Eom(). */ @@ -504,7 +529,8 @@ read_more (m_getfld_state_t s) { /* Return the next character consumed from the input, fetching more of * the input for the buffer if required, or EOF on end of file. */ static int -Getc (m_getfld_state_t s) { +Getc (m_getfld_state_t s) +{ if ((s->end - s->readpos < 1 && read_more (s) == 0) || s->readpos >= s->end) return EOF; @@ -513,15 +539,17 @@ 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, @@ -530,7 +558,7 @@ static void Ungetc(m_getfld_state_t s) { if (s->readpos == s->msg_buf) - adios(NULL, "Ungetc() at start of message buffer."); + die("Ungetc() at start of message buffer."); s->readpos--; s->bytes_read--; @@ -674,12 +702,10 @@ m_getfld (m_getfld_state_t *gstate, char name[NAMESZ], char *buf, int *bufsz, * characters up to the end of this field (newline * followed by non-blank) or bufsz-1 characters. */ - int finished; - cp = buf; max = *bufsz-1; n = 0; - for (finished = 0; ! finished; ) { + for (bool finished = false; !finished; ) { while (c != '\n' && c != EOF && n++ < max) { if ((c = Getc (s)) != EOF) *cp++ = c; @@ -699,14 +725,14 @@ m_getfld (m_getfld_state_t *gstate, char name[NAMESZ], char *buf, int *bufsz, --s->bytes_read; } s->state = FLDPLUS; - finished = 1; + finished = true; } else if (c != ' ' && c != '\t') { /* The next character is not folded whitespace, so prepare to move on to the next field. It's OK if c is EOF, it will be handled on the next call to m_getfld (). */ s->state = FLD; - finished = 1; + finished = true; } else { /* Folded header field, continues on the next line. */ } @@ -816,7 +842,7 @@ m_getfld (m_getfld_state_t *gstate, char name[NAMESZ], char *buf, int *bufsz, } default: - adios (NULL, "m_getfld() called with bogus state of %d", s->state); + die("m_getfld() called with bogus state of %d", s->state); } *cp = 0; @@ -826,6 +852,17 @@ 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) + die("m_getfld2 without gstate"); + + return m_getfld(gstate, name, buf, bufsz, (*gstate)->iob); +} + + void m_unknown(m_getfld_state_t *gstate, FILE *iob) { @@ -891,7 +928,7 @@ m_unknown(m_getfld_state_t *gstate, FILE *iob) s->edelimlen = c - 1; s->delimend = s->msg_delim + s->edelimlen; if (s->edelimlen <= 1) - adios (NULL, "maildrop delimiter must be at least 2 bytes"); + die("maildrop delimiter must be at least 2 bytes"); /* * build a Boyer-Moore end-position map for the matcher in m_getfld. @@ -899,7 +936,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; @@ -916,6 +953,17 @@ 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) + die("m_unknown2 without gstate"); + + m_unknown(gstate, (*gstate)->iob); +} + + /* * test for msg delimiter string */