X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fdistsbr.c;h=2662c02dd9184c64d7f13f9f8b9271e415fb9b86;hp=1b5f5e13c014f3469d0572801080c222bc682323;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=13f84dd50ca5754391dbd3296a5c7425f9363600 diff --git a/uip/distsbr.c b/uip/distsbr.c index 1b5f5e1..2662c02 100644 --- a/uip/distsbr.c +++ b/uip/distsbr.c @@ -1,200 +1,215 @@ - /* - * 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. - */ +** 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 #include +#include +#include +#include static int hdrfd = NOTOK; static int txtfd = NOTOK; -#define BADHDR "please re-edit %s to remove the ``%s'' header!" -#define BADTXT "please re-edit %s to consist of headers only!" -#define BADMSG "please re-edit %s to include a ``Resent-To:''!" -#define BADRFT "please re-edit %s and fix that header!" - /* - * static prototypes - */ -static void ready_msg(char *); +** static prototypes +*/ +static int ready_msg(char *); int -distout (char *drft, char *msgnam, char *backup) +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; - - if (rename (drft, strcpy (backup, m_backup (drft))) == NOTOK) - adios (backup, "unable to rename %s to",drft); - if ((ifp = fopen (backup, "r")) == NULL) - adios (backup, "unable to read"); - - if ((ofp = fopen (drft, "w")) == NULL) - adios (drft, "unable to create temporary file"); - chmod (drft, m_gmprot ()); - - ready_msg (msgnam); - lseek (hdrfd, (off_t) 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)) { - 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); - goto leave_bad; + enum state state; + struct field f = {{0}}; + unsigned char *dp; + int resent = 0; + FILE *ifp, *ofp; + + strcpy(backup, m_mktemp(toabsdir(invo_name), NULL, NULL)); + if (rename(drft, backup) == NOTOK) { + advise(backup, "unable to rename %s to",drft); + return NOTOK; + } + + if (ready_msg(msgnam) != OK) { + return NOTOK; + } + + if (!(ifp = fopen(backup, "r"))) { + advise(backup, "unable to read"); + return NOTOK; + } + + if (!(ofp = fopen(drft, "w"))) { + fclose(ifp); + advise(drft, "unable to create temporary file"); + return NOTOK; + } + chmod(drft, m_gmprot()); + + lseek(hdrfd, (off_t) 0, SEEK_SET); /* msgnam not accurate */ + cpydata(hdrfd, fileno(ofp), msgnam, drft); + + state = FLD2; + while (1) { + switch (state = m_getfld2(state, &f, ifp)) { + case FLD2: + if (!uprf(f.name, "resent")) { + advise(NULL, "Please re-edit draft to remove the ``%s'' header.", f.name); + goto leave_bad; + } + resent = 1; + fprintf(ofp, "%s: %s", f.name, f.value); + break; + + case BODY2: + for (dp = f.value; *dp; dp++) { + if (!isspace(*dp)) { + advise(NULL, "Please re-edit draft to consist of headers only."); + goto leave_bad; + } + } + + case FILEEOF2: + goto process; + + case LENERR2: + case FMTERR2: + case IOERR2: + advise(NULL, "Please re-edit draft and fix that header."); +leave_bad: ; + fclose(ifp); + fclose(ofp); + unlink(drft); + if (rename(backup, drft) == NOTOK) { + advise(drft, "unable to rename %s to", backup); + } + return NOTOK; + + default: + advise(NULL, "getfld() returned %d", state); + return NOTOK; } - if (state == FLD) - resent = add (":", add (name, resent)); - resent = add (buffer, resent); - fprintf (ofp, "%s: %s", name, buffer); - while (state == FLDPLUS) { - state = m_getfld (state, name, - buffer, sizeof buffer, ifp); - resent = add (buffer, resent); - fputs (buffer, ofp); + } + +process: ; + fclose(ifp); + fflush(ofp); + + if (!resent) { + advise(NULL, "Please re-edit draft to include a ``Resent-To:'' header."); + fclose(ofp); + unlink(drft); + if (rename(backup, drft) == NOTOK) { + advise(drft, "unable to rename %s to", backup); } - if (state == FLDEOF) - goto process; - break; - - case BODY: - case BODYEOF: - for (dp = buffer; *dp; dp++) - if (!isspace (*dp)) { - advise (NULL, BADTXT, "draft"); - goto leave_bad; - } - - case FILEEOF: - goto process; - - case LENERR: - case FMTERR: - advise (NULL, BADRFT, "draft"); - leave_bad: ; - fclose (ifp); - fclose (ofp); - unlink (drft); - if (rename (backup, drft) == NOTOK) - adios (drft, "unable to rename %s to", backup); return NOTOK; + } - default: - adios (NULL, "getfld() returned %d", state); + if (txtfd != NOTOK) { + lseek(txtfd, (off_t) 0, SEEK_SET); /* msgnam not accurate */ + cpydata(txtfd, fileno(ofp), msgnam, drft); } -process: ; - fclose (ifp); - fflush (ofp); - - if (!resent) { - advise (NULL, BADMSG, "draft"); - fclose (ofp); - 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 */ - cpydata (txtfd, fileno (ofp), msgnam, drft); - } - - fclose (ofp); - - return OK; + + fclose(ofp); + + return OK; } -static void -ready_msg (char *msgnam) +static int +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; - - 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"); - if ((out = dup (hdrfd)) == NOTOK - || (ofp = fdopen (out, "w")) == NULL) - adios (NULL, "no file descriptors -- you lose big"); - unlink (tmpfil); - - for (state = FLD;;) - switch (state = - m_getfld (state, name, buffer, sizeof buffer, ifp)) { - 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); - 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"); - if ((out = dup (txtfd)) == NOTOK - || (ofp = fdopen (out, "w")) == NULL) - adios (NULL, "no file descriptors -- you lose big"); - unlink (tmpfil); - fprintf (ofp, "\n%s", buffer); - while (state == BODY) { - state = m_getfld (state, name, - buffer, sizeof buffer, ifp); - fputs (buffer, ofp); - } - case FILEEOF: - goto process; - - case LENERR: - case FMTERR: - adios (NULL, "format error in message %s", msgnam); + enum state state; + struct field f = {{0}}; + char tmpfil[BUFSIZ]; + int out; + FILE *ifp, *ofp; + char *cp = NULL; + + if (hdrfd != NOTOK) { + close(hdrfd); + hdrfd = NOTOK; + } + if (txtfd != NOTOK) { + close(txtfd); + txtfd = NOTOK; + } + if (!(ifp = fopen(msgnam, "r"))) { + advise(msgnam, "unable to open message"); + return NOTOK; + } - default: - adios (NULL, "getfld() returned %d", state); + cp = m_mktemp2(NULL, "dist", &hdrfd, NULL); + if (!cp) { + fclose(ifp); + advise("distsbr", "unable to create temporary file"); + return NOTOK; + } + fchmod(hdrfd, 0600); + strncpy(tmpfil, cp, sizeof(tmpfil)); + if ((out = dup(hdrfd)) == NOTOK || !(ofp = fdopen(out, "w"))) { + fclose(ifp); + advise(NULL, "no file descriptors -- you lose big"); + return NOTOK; + } + unlink(tmpfil); + + state = FLD2; + while (1) { + state = m_getfld2(state, &f, ifp); + switch (state) { + case FLD2: + if (uprf(f.name, "resent")) { + fprintf(ofp, "Prev-"); + } + fprintf(ofp, "%s: %s", f.name, f.value); + break; + + case BODY2: + fclose(ofp); + + cp = m_mktemp2(NULL, "dist", &txtfd, NULL); + if (!cp) { + advise("distsbr", "unable to create temp file"); + return NOTOK; + } + fchmod(txtfd, 0600); + strncpy(tmpfil, cp, sizeof(tmpfil)); + if ((out = dup(txtfd)) == NOTOK || + !(ofp = fdopen(out, "w"))) { + advise(NULL, "no file descriptors -- you lose"); + return NOTOK; + } + unlink(tmpfil); + fputs("\n", ofp); + while (state == BODY2) { + fputs(f.value, ofp); + state = m_getfld2(state, &f, ifp); + } + /* FALL */ + + case FILEEOF2: + goto process; + + case LENERR2: + case FMTERR2: + case IOERR2: + advise(NULL, "format error in message %s", msgnam); + return NOTOK; + + default: + advise(NULL, "getfld() returned %d", state); + return NOTOK; + } } process: ; - fclose (ifp); - fclose (ofp); + fclose(ifp); + fclose(ofp); + return OK; }