- 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);
-
- cp = m_mktemp2(NULL, "dist", &txtfd, NULL);
- if (cp == NULL) {
- adios("distsbr", "unable to create temporary file");
- }
- 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);
- 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);
-
- default:
- adios (NULL, "getfld() returned %d", state);
+ 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;