* complete copyright information.
*/
-#include <h/mh.h>
-#include <h/mts.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "m_getfld.h"
+#include "error.h"
+#include "h/mts.h"
+#include "h/utils.h"
#include <inttypes.h>
/*
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
/* 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;
}
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) {
*gstate = m_getfld_state_init(iob);
}
}
/* m_getfld_track_filepos() with the existing iob. */
-void m_getfld_track_filepos2(m_getfld_state_t *gstate)
+void
+m_getfld_track_filepos2(m_getfld_state_t *gstate)
{
if (!*gstate)
- adios(NULL, "m_getfld_track_filepos2 without 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) {
+void
+m_getfld_state_destroy (m_getfld_state_t *gstate)
+{
m_getfld_state_t s = *gstate;
if (s) {
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;
}
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) {
}
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(). */
/* 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;
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--;
* 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;
--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. */
}
}
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;
/* m_getfld() with the existing iob. */
-int m_getfld2(m_getfld_state_t *gstate, char name[NAMESZ], char *buf, int *bufsz)
+int
+m_getfld2(m_getfld_state_t *gstate, char name[NAMESZ], char *buf, int *bufsz)
{
if (!*gstate)
- adios(NULL, "m_getfld2 without gstate");
+ die("m_getfld2 without gstate");
return m_getfld(gstate, name, buf, bufsz, (*gstate)->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.
* 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;
/* m_unknown() with the existing iob. */
-void m_unknown2(m_getfld_state_t *gstate)
+void
+m_unknown2(m_getfld_state_t *gstate)
{
if (!*gstate)
- adios(NULL, "m_unknown2 without gstate");
+ die("m_unknown2 without gstate");
m_unknown(gstate, (*gstate)->iob);
}
projects / nmh / blobdiff