X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fdistsbr.c;h=2662c02dd9184c64d7f13f9f8b9271e415fb9b86;hp=a9a52b10e99f9d0d8646de855837c2a9f4de15fb;hb=3ba0e8cc826b51f7d8e2d1e3e04557857d13f334;hpb=ca0b3e830b86700d9e5e31b1784de2bdcaf58fc5 diff --git a/uip/distsbr.c b/uip/distsbr.c index a9a52b1..2662c02 100644 --- a/uip/distsbr.c +++ b/uip/distsbr.c @@ -9,6 +9,9 @@ #include #include #include +#include +#include +#include static int hdrfd = NOTOK; static int txtfd = NOTOK; @@ -16,88 +19,81 @@ static int txtfd = NOTOK; /* ** static prototypes */ -static void ready_msg(char *); +static int ready_msg(char *); 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; + 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) { - adios(backup, "unable to rename %s to",drft); + advise(backup, "unable to rename %s to",drft); + return NOTOK; } + + if (ready_msg(msgnam) != OK) { + return NOTOK; + } + if (!(ifp = fopen(backup, "r"))) { - adios(backup, "unable to read"); + advise(backup, "unable to read"); + return NOTOK; } if (!(ofp = fopen(drft, "w"))) { - adios(drft, "unable to create temporary file"); + fclose(ifp); + advise(drft, "unable to create temporary file"); + return NOTOK; } chmod(drft, m_gmprot()); - ready_msg(msgnam); lseek(hdrfd, (off_t) 0, SEEK_SET); /* msgnam not accurate */ cpydata(hdrfd, fileno(ofp), msgnam, drft); - state = FLD; - resent = NULL; + state = FLD2; while (1) { - switch (state = m_getfld(state, name, buffer, sizeof buffer, - ifp)) { - case FLD: - case FLDPLUS: - case FLDEOF: - if (!uprf(name, "resent")) { - advise(NULL, "Please re-edit draft to remove the ``%s'' header.", name); + 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; } - 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); - } - if (state == FLDEOF) { - goto process; - } + resent = 1; + fprintf(ofp, "%s: %s", f.name, f.value); break; - case BODY: - case BODYEOF: - for (dp = buffer; *dp; dp++) { + 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 FILEEOF: + case FILEEOF2: goto process; - case LENERR: - case FMTERR: + 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) { - adios(drft, "unable to rename %s to", backup); + advise(drft, "unable to rename %s to", backup); } return NOTOK; default: - adios(NULL, "getfld() returned %d", state); + advise(NULL, "getfld() returned %d", state); + return NOTOK; } } @@ -110,11 +106,10 @@ process: ; fclose(ofp); unlink(drft); if (rename(backup, drft) == NOTOK) { - adios(drft, "unable to rename %s to", backup); + advise(drft, "unable to rename %s to", backup); } return NOTOK; } - free(resent); if (txtfd != NOTOK) { lseek(txtfd, (off_t) 0, SEEK_SET); /* msgnam not accurate */ @@ -127,12 +122,14 @@ process: ; } -static void +static int ready_msg(char *msgnam) { - int state, out; - char name[NAMESZ], buffer[BUFSIZ], tmpfil[BUFSIZ]; - register FILE *ifp, *ofp; + enum state state; + struct field f = {{0}}; + char tmpfil[BUFSIZ]; + int out; + FILE *ifp, *ofp; char *cp = NULL; if (hdrfd != NOTOK) { @@ -144,74 +141,75 @@ ready_msg(char *msgnam) txtfd = NOTOK; } if (!(ifp = fopen(msgnam, "r"))) { - adios(msgnam, "unable to open message"); + advise(msgnam, "unable to open message"); + return NOTOK; } cp = m_mktemp2(NULL, "dist", &hdrfd, NULL); if (!cp) { - adios("distsbr", "unable to create temporary file"); + 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"))) { - adios(NULL, "no file descriptors -- you lose big"); + fclose(ifp); + advise(NULL, "no file descriptors -- you lose big"); + return NOTOK; } unlink(tmpfil); - state = FLD; + state = FLD2; while (1) { - state = m_getfld(state, name, buffer, sizeof buffer, ifp); + state = m_getfld2(state, &f, ifp); switch (state) { - case FLD: - case FLDPLUS: - case FLDEOF: - if (uprf(name, "resent")) { + case FLD2: + if (uprf(f.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; - } + fprintf(ofp, "%s: %s", f.name, f.value); break; - case BODY: - case BODYEOF: + case BODY2: fclose(ofp); cp = m_mktemp2(NULL, "dist", &txtfd, NULL); if (!cp) { - adios("distsbr", "unable to create temp file"); + 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"))) { - adios(NULL, "no file descriptors -- you lose"); + advise(NULL, "no file descriptors -- you lose"); + return NOTOK; } unlink(tmpfil); - fprintf(ofp, "\n%s", buffer); - while (state == BODY) { - state = m_getfld(state, name, buffer, - sizeof buffer, ifp); - fputs(buffer, ofp); + fputs("\n", ofp); + while (state == BODY2) { + fputs(f.value, ofp); + state = m_getfld2(state, &f, ifp); } - case FILEEOF: + /* FALL */ + + case FILEEOF2: goto process; - case LENERR: - case FMTERR: - adios(NULL, "format error in message %s", msgnam); + case LENERR2: + case FMTERR2: + case IOERR2: + advise(NULL, "format error in message %s", msgnam); + return NOTOK; default: - adios(NULL, "getfld() returned %d", state); + advise(NULL, "getfld() returned %d", state); + return NOTOK; } } process: ; fclose(ifp); fclose(ofp); + return OK; }