X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/a97c3e637eaf2e2f4ecd8cb93b11795afb980988..420e2298044905daba7dc2a670e0f62863a0c404:/uip/forwsbr.c diff --git a/uip/forwsbr.c b/uip/forwsbr.c index 86255857..87006620 100644 --- a/uip/forwsbr.c +++ b/uip/forwsbr.c @@ -46,7 +46,7 @@ build_form (char *form, char *digest, int *dat, char *from, char *to, char *cc, char *fcc, char *subject, char *inputfile) { int in; - int fmtsize, state, char_read = 0; + int fmtsize, state; int i; register char *nfs; char *line, tmpfil[BUFSIZ], name[NAMESZ], **ap; @@ -87,7 +87,8 @@ build_form (char *form, char *digest, int *dat, char *from, char *to, */ for (state = FLD;;) { - state = m_getfld(state, name, msgbuf, sizeof(msgbuf), tmp); + int msg_count = sizeof msgbuf; + state = m_getfld(state, name, msgbuf, &msg_count, tmp); switch (state) { case FLD: case FLDPLUS: @@ -99,16 +100,15 @@ build_form (char *form, char *digest, int *dat, char *from, char *to, i = fmt_addcomptext(name, msgbuf); if (i != -1) { - char_read += msg_count; while (state == FLDPLUS) { - state = m_getfld(state, name, msgbuf, - sizeof(msgbuf), tmp); + msg_count = sizeof msgbuf; + state = m_getfld(state, name, msgbuf, &msg_count, tmp); fmt_appendcomp(i, name, msgbuf); - char_read += msg_count; } } while (state == FLDPLUS) - state = m_getfld(state, name, msgbuf, sizeof(msgbuf), tmp); + msg_count = sizeof msgbuf; + state = m_getfld(state, name, msgbuf, &msg_count, tmp); break; case LENERR: