Cleaned up a bit.

[nmh] / uip / sendsbr.c

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index dfd974f481694c9b9d6763cd450038ab2caa884f..a7dc0ea50fa3677baa2df09152aa052609fd67a9 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -603,7 +603,8 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay)
      * as well as locate the beginning of the message body.
      */
     for (compnum = 1, state = FLD;;) {
-       switch (state = m_getfld (state, name, buffer, sizeof(buffer), in)) {
+       int bufsz = sizeof buffer;
+       switch (state = m_getfld (state, name, buffer, &bufsz, in)) {
            case FLD:
            case FLDPLUS:
            case FLDEOF:
@@ -613,8 +614,10 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay)
                 * This header field is discarded.
                 */
                if (!mh_strcasecmp (name, "Message-ID")) {
-                   while (state == FLDPLUS)
-                       state = m_getfld (state, name, buffer, sizeof(buffer), in);
+                   while (state == FLDPLUS) {
+                       bufsz = sizeof buffer;
+                       state = m_getfld (state, name, buffer, &bufsz, in);
+                   }
                } else if (uprf (name, XXX_FIELD_PRF)
                        || !mh_strcasecmp (name, VRSN_FIELD)
                        || !mh_strcasecmp (name, "Subject")
@@ -638,7 +641,8 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay)
 
                    dp = add (concat (name, ":", buffer, NULL), dp);
                    while (state == FLDPLUS) {
-                       state = m_getfld (state, name, buffer, sizeof(buffer), in);
+                       bufsz = sizeof buffer;
+                       state = m_getfld (state, name, buffer, &bufsz, in);
                        dp = add (buffer, dp);
                    }
                } else {
@@ -648,7 +652,8 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay)
                     */
                    cp = add (concat (name, ":", buffer, NULL), cp);
                    while (state == FLDPLUS) {
-                       state = m_getfld (state, name, buffer, sizeof(buffer), in);
+                       bufsz = sizeof buffer;
+                       state = m_getfld (state, name, buffer, &bufsz, in);
                        cp = add (buffer, cp);
                    }
                }