X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/afee8ed17a56617618fb7f963b111d7cf0fb56e7..9291a5f82480f2458e04cb9ea7e6749bc952b308:/uip/distsbr.c diff --git a/uip/distsbr.c b/uip/distsbr.c index b5119fbe..4e931ecb 100644 --- a/uip/distsbr.c +++ b/uip/distsbr.c @@ -1,15 +1,18 @@ - -/* - * distsbr.c -- routines to do additional "dist-style" processing +/* distsbr.c -- routines to do additional "dist-style" processing * * This code is Copyright (c) 2002, by the authors of nmh. See the * COPYRIGHT file in the root directory of the nmh distribution for * complete copyright information. */ -#include +#include "h/mh.h" +#include "sbr/cpydata.h" +#include "sbr/uprf.h" +#include "sbr/m_backup.h" +#include "sbr/error.h" #include -#include +#include "h/utils.h" +#include "sbr/m_mktemp.h" static int hdrfd = NOTOK; static int txtfd = NOTOK; @@ -28,11 +31,10 @@ int distout (char *drft, char *msgnam, char *backup) { int state; - register unsigned char *dp; - register char *resent; - char name[NAMESZ], buffer[BUFSIZ]; - register FILE *ifp, *ofp; - m_getfld_state_t gstate = 0; + char *dp, *resent; + char name[NAMESZ], buffer[NMH_BUFSIZ]; + FILE *ifp, *ofp; + m_getfld_state_t gstate; if (rename (drft, strcpy (backup, m_backup (drft))) == NOTOK) adios (backup, "unable to rename %s to",drft); @@ -44,12 +46,13 @@ distout (char *drft, char *msgnam, char *backup) chmod (drft, m_gmprot ()); ready_msg (msgnam); - lseek (hdrfd, (off_t) 0, SEEK_SET); /* msgnam not accurate */ + lseek(hdrfd, 0, SEEK_SET); /* msgnam not accurate */ cpydata (hdrfd, fileno (ofp), msgnam, drft); + gstate = m_getfld_state_init(ifp); for (resent = NULL;;) { int buffersz = sizeof buffer; - switch (state = m_getfld (&gstate, name, buffer, &buffersz, ifp)) { + switch (state = m_getfld2(&gstate, name, buffer, &buffersz)) { case FLD: case FLDPLUS: if (uprf (name, "distribute-")) @@ -57,7 +60,7 @@ distout (char *drft, char *msgnam, char *backup) if (uprf (name, "distribution-")) snprintf (name, sizeof(name), "%s%s", "Resent", &name[12]); if (!uprf (name, "resent")) { - advise (NULL, BADHDR, "draft", name); + inform(BADHDR, "draft", name); goto leave_bad; } if (state == FLD) @@ -66,7 +69,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_getfld2(&gstate, name, buffer, &buffersz); resent = add (buffer, resent); fputs (buffer, ofp); } @@ -74,8 +77,8 @@ distout (char *drft, char *msgnam, char *backup) case BODY: for (dp = buffer; *dp; dp++) - if (!isspace (*dp)) { - advise (NULL, BADTXT, "draft"); + if (!isspace ((unsigned char) *dp)) { + inform(BADTXT, "draft"); goto leave_bad; } @@ -84,17 +87,17 @@ distout (char *drft, char *msgnam, char *backup) case LENERR: case FMTERR: - advise (NULL, BADRFT, "draft"); + inform(BADRFT, "draft"); leave_bad: ; fclose (ifp); fclose (ofp); - unlink (drft); + (void) m_unlink (drft); if (rename (backup, drft) == NOTOK) adios (drft, "unable to rename %s to", backup); return NOTOK; default: - adios (NULL, "getfld() returned %d", state); + die("getfld() returned %d", state); } } process: ; @@ -103,9 +106,9 @@ process: ; fflush (ofp); if (!resent) { - advise (NULL, BADMSG, "draft"); + inform(BADMSG, "draft"); fclose (ofp); - unlink (drft); + (void) m_unlink (drft); if (rename (backup, drft) == NOTOK) adios (drft, "unable to rename %s to", backup); return NOTOK; @@ -113,7 +116,7 @@ process: ; free (resent); if (txtfd != NOTOK) { - lseek (txtfd, (off_t) 0, SEEK_SET); /* msgnam not accurate */ + lseek(txtfd, 0, SEEK_SET); /* msgnam not accurate */ cpydata (txtfd, fileno (ofp), msgnam, drft); } @@ -127,33 +130,37 @@ static void ready_msg (char *msgnam) { int state, out; - char name[NAMESZ], buffer[BUFSIZ], tmpfil[BUFSIZ]; - register FILE *ifp, *ofp; + char name[NAMESZ], buffer[NMH_BUFSIZ], tmpfil[BUFSIZ]; + FILE *ifp, *ofp; char *cp = NULL; - m_getfld_state_t gstate = 0; + m_getfld_state_t gstate; - if (hdrfd != NOTOK) - close (hdrfd), hdrfd = NOTOK; - if (txtfd != NOTOK) - close (txtfd), txtfd = NOTOK; + if (hdrfd != NOTOK) { + close (hdrfd); + hdrfd = NOTOK; + } + if (txtfd != NOTOK) { + close (txtfd); + txtfd = NOTOK; + } if ((ifp = fopen (msgnam, "r")) == NULL) adios (msgnam, "unable to open message"); cp = m_mktemp2(NULL, "dist", &hdrfd, NULL); if (cp == NULL) { - adios("distsbr", "unable to create temporary file"); + die("unable to create temporary file in %s", get_temp_dir()); } - fchmod(hdrfd, 0600); strncpy(tmpfil, cp, sizeof(tmpfil)); if ((out = dup (hdrfd)) == NOTOK || (ofp = fdopen (out, "w")) == NULL) - adios (NULL, "no file descriptors -- you lose big"); - unlink (tmpfil); + die("no file descriptors -- you lose big"); + (void) m_unlink (tmpfil); + gstate = m_getfld_state_init(ifp); for (;;) { int buffersz = sizeof buffer; - switch (state = m_getfld (&gstate, name, buffer, &buffersz, ifp)) { + switch (state = m_getfld2(&gstate, name, buffer, &buffersz)) { case FLD: case FLDPLUS: if (uprf (name, "resent")) @@ -161,7 +168,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_getfld2(&gstate, name, buffer, &buffersz); fputs (buffer, ofp); } break; @@ -171,18 +178,19 @@ ready_msg (char *msgnam) cp = m_mktemp2(NULL, "dist", &txtfd, NULL); if (cp == NULL) { - adios("distsbr", "unable to create temporary file"); + die("unable to create temporary file in %s", + get_temp_dir()); } fchmod(txtfd, 0600); strncpy (tmpfil, cp, sizeof(tmpfil)); if ((out = dup (txtfd)) == NOTOK || (ofp = fdopen (out, "w")) == NULL) - adios (NULL, "no file descriptors -- you lose big"); - unlink (tmpfil); + die("no file descriptors -- you lose big"); + (void) m_unlink (tmpfil); fprintf (ofp, "\n%s", buffer); while (state == BODY) { buffersz = sizeof buffer; - state = m_getfld (&gstate, name, buffer, &buffersz, ifp); + state = m_getfld2(&gstate, name, buffer, &buffersz); fputs (buffer, ofp); } case FILEEOF: @@ -190,10 +198,10 @@ ready_msg (char *msgnam) case LENERR: case FMTERR: - adios (NULL, "format error in message %s", msgnam); + die("format error in message %s", msgnam); default: - adios (NULL, "getfld() returned %d", state); + die("getfld() returned %d", state); } } process: ;