Rearranged whitespace (and comments) in all the code!
[mmh] / uip / distsbr.c
index afd4e41..a40d3e4 100644 (file)
@@ -1,4 +1,3 @@
-
 /*
  * distsbr.c -- routines to do additional "dist-style" processing
  *
 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!"
+#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
@@ -27,179 +26,179 @@ static void 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;
-
-    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;
-               }
-               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);
+       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;
+                               }
+                               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;
+                               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 (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);
+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);
+                       adios (drft, "unable to rename %s to", backup);
                return NOTOK;
+       }
+       free (resent);
 
-           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;
+       return OK;
 }
 
 
 static void
 ready_msg (char *msgnam)
 {
-    int state, out;
-    char name[NAMESZ], buffer[BUFSIZ], tmpfil[BUFSIZ];
-    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)
-       adios (msgnam, "unable to open message");
-
-    cp = m_mktemp2(NULL, "dist", &hdrfd, NULL);
-    if (cp == NULL) {
-        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)
-       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
+       int state, out;
+       char name[NAMESZ], buffer[BUFSIZ], tmpfil[BUFSIZ];
+       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)
+               adios (msgnam, "unable to open message");
+
+       cp = m_mktemp2(NULL, "dist", &hdrfd, NULL);
+       if (cp == NULL) {
+               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)
-                   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);
+               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);
                }
-           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);
+       fclose (ifp);
+       fclose (ofp);
 }