-
-/*
- * distsbr.c -- routines to do additional "dist-style" processing
+/* distsbr.c -- routines to do additional "dist-style" processing
*
- * $Id$
+ * 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 <h/mh.h>
#include <fcntl.h>
+#include <h/utils.h>
+#include "sbr/m_mktemp.h"
static int hdrfd = NOTOK;
static int txtfd = NOTOK;
distout (char *drft, char *msgnam, char *backup)
{
int state;
- register char *dp, *resent;
- char name[NAMESZ], buffer[BUFSIZ];
- register FILE *ifp, *ofp;
+ 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);
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);
- for (state = FLD, resent = NULL;;)
- switch (state =
- m_getfld (state, name, buffer, sizeof buffer, ifp)) {
+ gstate = m_getfld_state_init(ifp);
+ for (resent = NULL;;) {
+ int buffersz = sizeof buffer;
+ switch (state = m_getfld2(&gstate, name, buffer, &buffersz)) {
case FLD:
case FLDPLUS:
- case FLDEOF:
if (uprf (name, "distribute-"))
snprintf (name, sizeof(name), "%s%s", "Resent", &name[10]);
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)
resent = add (buffer, resent);
fprintf (ofp, "%s: %s", name, buffer);
while (state == FLDPLUS) {
- state = m_getfld (state, name,
- buffer, sizeof buffer, ifp);
+ buffersz = sizeof buffer;
+ state = m_getfld2(&gstate, name, buffer, &buffersz);
resent = add (buffer, resent);
fputs (buffer, ofp);
}
- if (state == FLDEOF)
- goto process;
break;
case BODY:
- case BODYEOF:
for (dp = buffer; *dp; dp++)
- if (!isspace (*dp)) {
- advise (NULL, BADTXT, "draft");
+ if (!isspace ((unsigned char) *dp)) {
+ inform(BADTXT, "draft");
goto leave_bad;
}
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);
}
+ }
process: ;
+ m_getfld_state_destroy (&gstate);
fclose (ifp);
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;
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);
}
ready_msg (char *msgnam)
{
int state, out;
- char name[NAMESZ], buffer[BUFSIZ], tmpfil[BUFSIZ];
- register FILE *ifp, *ofp;
-
- if (hdrfd != NOTOK)
- close (hdrfd), hdrfd = NOTOK;
- if (txtfd != NOTOK)
- close (txtfd), txtfd = NOTOK;
+ char name[NAMESZ], buffer[NMH_BUFSIZ], tmpfil[BUFSIZ];
+ FILE *ifp, *ofp;
+ char *cp = NULL;
+ m_getfld_state_t gstate;
+
+ 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");
- strncpy (tmpfil, m_tmpfil ("dist"), sizeof(tmpfil));
- if ((hdrfd = open (tmpfil, O_RDWR | O_CREAT | O_TRUNC, 0600)) == NOTOK)
- adios (tmpfil, "unable to re-open temporary file");
+ cp = m_mktemp2(NULL, "dist", &hdrfd, NULL);
+ if (cp == NULL) {
+ adios(NULL, "unable to create temporary file in %s", get_temp_dir());
+ }
+ 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);
+ (void) m_unlink (tmpfil);
- for (state = FLD;;)
- switch (state =
- m_getfld (state, name, buffer, sizeof buffer, ifp)) {
+ gstate = m_getfld_state_init(ifp);
+ for (;;) {
+ int buffersz = sizeof buffer;
+ switch (state = m_getfld2(&gstate, name, buffer, &buffersz)) {
case FLD:
case FLDPLUS:
- case FLDEOF:
if (uprf (name, "resent"))
fprintf (ofp, "Prev-");
fprintf (ofp, "%s: %s", name, buffer);
while (state == FLDPLUS) {
- state = m_getfld (state, name,
- buffer, sizeof buffer, ifp);
+ buffersz = sizeof buffer;
+ state = m_getfld2(&gstate, name, buffer, &buffersz);
fputs (buffer, ofp);
}
- if (state == FLDEOF)
- goto process;
break;
case BODY:
- case BODYEOF:
fclose (ofp);
- strncpy (tmpfil, m_tmpfil ("dist"), sizeof(tmpfil));
- if ((txtfd = open (tmpfil, O_RDWR | O_CREAT | O_TRUNC, 0600)) == NOTOK)
- adios (tmpfil, "unable to open temporary file");
+ cp = m_mktemp2(NULL, "dist", &txtfd, NULL);
+ if (cp == NULL) {
+ adios(NULL, "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);
+ (void) m_unlink (tmpfil);
fprintf (ofp, "\n%s", buffer);
while (state == BODY) {
- state = m_getfld (state, name,
- buffer, sizeof buffer, ifp);
+ buffersz = sizeof buffer;
+ state = m_getfld2(&gstate, name, buffer, &buffersz);
fputs (buffer, ofp);
}
case FILEEOF:
default:
adios (NULL, "getfld() returned %d", state);
}
+ }
process: ;
+ m_getfld_state_destroy (&gstate);
fclose (ifp);
fclose (ofp);
}
projects / nmh / blobdiff