projects / mmh / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Rework in dist tools: removed -file switch; don't fork(); refactoring.
[mmh] / uip / distsbr.c
diff --git a/uip/distsbr.c b/uip/distsbr.c
index 319e496..1ad8e42 100644 (file)
--- a/uip/distsbr.c
+++ b/uip/distsbr.c
@@ -13,11 +13,6 @@
 static int  hdrfd = NOTOK;
 static int  txtfd = NOTOK;
 
 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 prototypes
 */
@@ -32,91 +27,96 @@ distout(char *drft, char *msgnam, char *backup)
        char name[NAMESZ], buffer[BUFSIZ];
        register FILE *ifp, *ofp;
 
        char name[NAMESZ], buffer[BUFSIZ];
        register FILE *ifp, *ofp;
 
-       if (rename(drft, strcpy(backup, m_backup(drft))) == NOTOK)
+       if (rename(drft, strcpy(backup, m_backup(drft))) == NOTOK) {
                adios(backup, "unable to rename %s to",drft);
                adios(backup, "unable to rename %s to",drft);
-       if ((ifp = fopen(backup, "r")) == NULL)
+       }
+       if (!(ifp = fopen(backup, "r"))) {
                adios(backup, "unable to read");
                adios(backup, "unable to read");
+       }
 
 
-       if ((ofp = fopen(drft, "w")) == NULL)
+       if (!(ofp = fopen(drft, "w"))) {
                adios(drft, "unable to create temporary file");
                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);
 
        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;
-                               }
-                               if (state == FLD)
-                                       resent = add(":", add(name, resent));
+       state = FLD;
+       resent = NULL;
+       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);
+                               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);
                                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;
-                               break;
-
-                       case BODY:
-                       case BODYEOF:
-                               for (dp = buffer; *dp; dp++)
-                                       if (!isspace(*dp)) {
-                                               advise(NULL, BADTXT, "draft");
-                                               goto leave_bad;
-                                       }
-
-                       case FILEEOF:
+                               fputs(buffer, ofp);
+                       }
+                       if (state == FLDEOF) {
                                goto process;
                                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);
+                       }
+                       break;
+
+               case BODY:
+               case BODYEOF:
+                       for (dp = buffer; *dp; dp++) {
+                               if (!isspace(*dp)) {
+                                       advise(NULL, "Please re-edit draft to consist of headers only.");
+                                       goto leave_bad;
+                               }
+                       }
+
+               case FILEEOF:
+                       goto process;
+
+               case LENERR:
+               case FMTERR:
+                       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);
+                       }
+                       return NOTOK;
+
+               default:
+                       adios(NULL, "getfld() returned %d", state);
                }
                }
+       }
+
 process: ;
        fclose(ifp);
        fflush(ofp);
 
        if (!resent) {
 process: ;
        fclose(ifp);
        fflush(ofp);
 
        if (!resent) {
-               advise(NULL, BADMSG, "draft");
+               advise(NULL, "Please re-edit draft to include a ``Resent-To:'' header.");
                fclose(ofp);
                unlink(drft);
                fclose(ofp);
                unlink(drft);
-               if (rename(backup, drft) == NOTOK)
+               if (rename(backup, drft) == NOTOK) {
                        adios(drft, "unable to rename %s to", backup);
                        adios(drft, "unable to rename %s to", backup);
+               }
                return NOTOK;
        }
        free(resent);
 
        if (txtfd != NOTOK) {
                return NOTOK;
        }
        free(resent);
 
        if (txtfd != NOTOK) {
-               lseek(txtfd, (off_t) 0, SEEK_SET); /* msgnam not accurate */
+               lseek(txtfd, (off_t) 0, SEEK_SET);  /* msgnam not accurate */
                cpydata(txtfd, fileno(ofp), msgnam, drft);
        }
 
                cpydata(txtfd, fileno(ofp), msgnam, drft);
        }
 
@@ -134,75 +134,82 @@ ready_msg(char *msgnam)
        register FILE *ifp, *ofp;
        char *cp = NULL;
 
        register 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")) == NULL)
+       if (hdrfd != NOTOK) {
+               close(hdrfd);
+               hdrfd = NOTOK;
+       }
+       if (txtfd != NOTOK) {
+               close(txtfd);
+               txtfd = NOTOK;
+       }
+       if (!(ifp = fopen(msgnam, "r"))) {
                adios(msgnam, "unable to open message");
                adios(msgnam, "unable to open message");
+       }
 
        cp = m_mktemp2(NULL, "dist", &hdrfd, NULL);
 
        cp = m_mktemp2(NULL, "dist", &hdrfd, NULL);
-       if (cp == NULL) {
+       if (!cp) {
                adios("distsbr", "unable to create temporary file");
        }
        fchmod(hdrfd, 0600);
        strncpy(tmpfil, cp, sizeof(tmpfil));
                adios("distsbr", "unable to create temporary file");
        }
        fchmod(hdrfd, 0600);
        strncpy(tmpfil, cp, sizeof(tmpfil));
-       if ((out = dup(hdrfd)) == NOTOK
-                       || (ofp = fdopen(out, "w")) == NULL)
+       if ((out = dup(hdrfd)) == NOTOK || !(ofp = fdopen(out, "w"))) {
                adios(NULL, "no file descriptors -- you lose big");
                adios(NULL, "no file descriptors -- you lose big");
+       }
        unlink(tmpfil);
 
        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:
+       state = FLD;
+       while (1) {
+               state = m_getfld(state, name, buffer, sizeof buffer, ifp);
+               switch (state) {
+               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;
                                goto process;
-
-                       case LENERR:
-                       case FMTERR:
-                               adios(NULL, "format error in message %s",
-                                               msgnam);
-
-                       default:
-                               adios(NULL, "getfld() returned %d", state);
+                       }
+                       break;
+
+               case BODY:
+               case BODYEOF:
+                       fclose(ofp);
+
+                       cp = m_mktemp2(NULL, "dist", &txtfd, NULL);
+                       if (!cp) {
+                               adios("distsbr", "unable to create temp file");
+                       }
+                       fchmod(txtfd, 0600);
+                       strncpy(tmpfil, cp, sizeof(tmpfil));
+                       if ((out = dup(txtfd)) == NOTOK ||
+                                       !(ofp = fdopen(out, "w"))) {
+                               adios(NULL, "no file descriptors -- you lose");
+                       }
+                       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);
                }
                }
+       }
 process: ;
        fclose(ifp);
        fclose(ofp);
 process: ;
        fclose(ifp);
        fclose(ofp);
meillo's mail handler