X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/adc0a3232c43033729dbc036f0757bddfba463bd..959dbc18d02cb81512ee2d0904b76e9287c95ee4:/uip/distsbr.c

diff --git a/uip/distsbr.c b/uip/distsbr.c
index 457536a3..d7a27120 100644
--- a/uip/distsbr.c
+++ b/uip/distsbr.c
@@ -28,11 +28,10 @@ int
 distout (char *drft, char *msgnam, char *backup)
 {
     int state;
-    register unsigned char *dp;
-    register char *resent;
+    char *dp, *resent;
     char name[NAMESZ], buffer[BUFSIZ];
     register FILE *ifp, *ofp;
-    m_getfld_state_t gstate;
+    m_getfld_state_t gstate = 0;
 
     if (rename (drft, strcpy (backup, m_backup (drft))) == NOTOK)
 	adios (backup, "unable to rename %s to",drft);
@@ -47,10 +46,9 @@ distout (char *drft, char *msgnam, char *backup)
     lseek (hdrfd, (off_t) 0, SEEK_SET); /* msgnam not accurate */
     cpydata (hdrfd, fileno (ofp), msgnam, drft);
 
-    m_getfld_state_init (&gstate);
     for (resent = NULL;;) {
 	int buffersz = sizeof buffer;
-	switch (state = m_getfld (gstate, name, buffer, &buffersz, ifp)) {
+	switch (state = m_getfld (&gstate, name, buffer, &buffersz, ifp)) {
 	    case FLD: 
 	    case FLDPLUS: 
 		if (uprf (name, "distribute-"))
@@ -67,7 +65,7 @@ distout (char *drft, char *msgnam, char *backup)
 		fprintf (ofp, "%s: %s", name, buffer);
 		while (state == FLDPLUS) {
 		    buffersz = sizeof buffer;
-		    state = m_getfld (gstate, name, buffer, &buffersz, ifp);
+		    state = m_getfld (&gstate, name, buffer, &buffersz, ifp);
 		    resent = add (buffer, resent);
 		    fputs (buffer, ofp);
 		}
@@ -75,7 +73,7 @@ distout (char *drft, char *msgnam, char *backup)
 
 	    case BODY: 
 		for (dp = buffer; *dp; dp++)
-		    if (!isspace (*dp)) {
+		    if (!isspace ((unsigned char) *dp)) {
 			advise (NULL, BADTXT, "draft");
 			goto leave_bad;
 		    }
@@ -131,7 +129,7 @@ ready_msg (char *msgnam)
     char name[NAMESZ], buffer[BUFSIZ], tmpfil[BUFSIZ];
     register FILE *ifp, *ofp;
     char *cp = NULL;
-    m_getfld_state_t gstate;
+    m_getfld_state_t gstate = 0;
 
     if (hdrfd != NOTOK)
 	close (hdrfd), hdrfd = NOTOK;
@@ -152,10 +150,9 @@ ready_msg (char *msgnam)
 	adios (NULL, "no file descriptors -- you lose big");
     unlink (tmpfil);
 
-    m_getfld_state_init (&gstate);
     for (;;) {
 	int buffersz = sizeof buffer;
-	switch (state = m_getfld (gstate, name, buffer, &buffersz, ifp)) {
+	switch (state = m_getfld (&gstate, name, buffer, &buffersz, ifp)) {
 	    case FLD: 
 	    case FLDPLUS: 
 		if (uprf (name, "resent"))
@@ -163,7 +160,7 @@ ready_msg (char *msgnam)
 		fprintf (ofp, "%s: %s", name, buffer);
 		while (state == FLDPLUS) {
 		    buffersz = sizeof buffer;
-		    state = m_getfld (gstate, name, buffer, &buffersz, ifp);
+		    state = m_getfld (&gstate, name, buffer, &buffersz, ifp);
 		    fputs (buffer, ofp);
 		}
 		break;
@@ -184,7 +181,7 @@ ready_msg (char *msgnam)
 		fprintf (ofp, "\n%s", buffer);
 		while (state == BODY) {
 		    buffersz = sizeof buffer;
-		    state = m_getfld (gstate, name, buffer, &buffersz, ifp);
+		    state = m_getfld (&gstate, name, buffer, &buffersz, ifp);
 		    fputs (buffer, ofp);
 		}
 	    case FILEEOF: