format files

1 files changed, 621 insertions, 490 deletions

diff --git a/src/qmail-send.c b/src/qmail-send.c
index 76925d2..5305d95 100644
--- a/src/qmail-send.c
+++ b/src/qmail-send.c
@@ -1,41 +1,44 @@
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <string.h>
+#include <sys/types.h>
 #include <unistd.h>
 #include <utime.h>
-#include "error.h"
-#include "sig.h"
+
+#include <string.h>
+
+#include "alloc.h"
+#include "buffer.h"
+#include "byte.h"
+#include "case.h"
+#include "constmap.h"
 #include "direntry.h"
-#include "control.h"
-#include "select.h"
-#include "open.h"
-#include "seek.h"
+#include "error.h"
 #include "exit.h"
-#include "lock.h"
-#include "ndelay.h"
-#include "now.h"
-#include "getln.h"
-#include "buffer.h"
-#include "alloc.h"
+#include "fmt.h"
 #include "genalloc.h"
-#include "stralloc.h"
+#include "getln.h"
+#include "lock.h"
 #include "logmsg.h"
-#include "str.h"
-#include "byte.h"
-#include "fmt.h"
+#include "ndelay.h"
+#include "open.h"
 #include "scan.h"
-#include "case.h"
+#include "seek.h"
+#include "select.h"
+#include "sig.h"
+#include "str.h"
+#include "stralloc.h"
+
 #include "auto_qmail.h"
-#include "trigger.h"
+#include "control.h"
+#include "fmtqfn.h"
 #include "newfield.h"
-#include "quote.h"
+#include "now.h"
+#include "prioq.h"
 #include "qmail.h"
 #include "qsutil.h"
-#include "prioq.h"
-#include "constmap.h"
-#include "fmtqfn.h"
+#include "quote.h"
 #include "readsubdir.h"
 #include "sendtodo.h"
+#include "trigger.h"
 
 int lifetime = 604800;
 int bouncemaxbytes = 0;
@@ -56,30 +59,42 @@ char strnum2[FMT_ULONG];
 char strnum3[FMT_ULONG];
 
 #define CHANNELS 2
-char *chanaddr[CHANNELS] = { "local/", "remote/" };
-char *chanstatusmsg[CHANNELS] = { " local ", " remote " };
-char *tochan[CHANNELS] = { " to local ", " to remote " };
-int chanfdout[CHANNELS] = { 1, 3 };
-int chanfdin[CHANNELS] = { 2, 4 };
-int chanskip[CHANNELS] = { 10, 20 };
-
-int flagexitasap = 0; void sigterm() { flagexitasap = 1; }
-int flagrunasap = 0; void sigalrm() { flagrunasap = 1; }
-int flagreadasap = 0; void sighup() { flagreadasap = 1; }
-
-void cleandied() 
-{ 
- log1s("alert: lost connection to qmail-clean ... exiting\n");
- flagexitasap = 1; 
+char *chanaddr[CHANNELS] = {"local/", "remote/"};
+char *chanstatusmsg[CHANNELS] = {" local ", " remote "};
+char *tochan[CHANNELS] = {" to local ", " to remote "};
+int chanfdout[CHANNELS] = {1, 3};
+int chanfdin[CHANNELS] = {2, 4};
+int chanskip[CHANNELS] = {10, 20};
+
+int flagexitasap = 0;
+void sigterm()
+{
+  flagexitasap = 1;
+}
+int flagrunasap = 0;
+void sigalrm()
+{
+  flagrunasap = 1;
+}
+int flagreadasap = 0;
+void sighup()
+{
+  flagreadasap = 1;
+}
+
+void cleandied()
+{
+  log1s("alert: lost connection to qmail-clean ... exiting\n");
+  flagexitasap = 1;
 }
 
 int flagspawnalive[CHANNELS];
 
-void spawndied(int c) 
-{ 
- log1s("alert: oh no! lost spawn connection! dying...\n");
- flagspawnalive[c] = 0; 
- flagexitasap = 1; 
+void spawndied(int c)
+{
+  log1s("alert: oh no! lost spawn connection! dying...\n");
+  flagspawnalive[c] = 0;
+  flagexitasap = 1;
 }
 
 #define REPORTMAX 10000
@@ -95,22 +110,43 @@ char fnmake_strnum[FMT_ULONG];
 
 void fnmake_init()
 {
- while (!stralloc_ready(&fn,FMTQFN)) nomem();
- while (!stralloc_ready(&fn2,FMTQFN)) nomem();
+  while (!stralloc_ready(&fn, FMTQFN)) nomem();
+  while (!stralloc_ready(&fn2, FMTQFN)) nomem();
 }
 
-void fnmake_info(unsigned long id) { fn.len = fmtqfn(fn.s,"info/",id,1); }
-void fnmake_todo(unsigned long id) { fn.len = fmtqfn(fn.s,"todo/",id,1); }
-void fnmake_mess(unsigned long id) { fn.len = fmtqfn(fn.s,"mess/",id,1); }
-void fnmake_foop(unsigned long id) { fn.len = fmtqfn(fn.s,"foop/",id,0); }
-void fnmake_split(unsigned long id) { fn.len = fmtqfn(fn.s,"",id,1); }
-void fnmake2_bounce(unsigned long id) { fn2.len = fmtqfn(fn2.s,"bounce/",id,0); }
-void fnmake_chanaddr(unsigned long id,int c) { fn.len = fmtqfn(fn.s,chanaddr[c],id,1); }
+void fnmake_info(unsigned long id)
+{
+  fn.len = fmtqfn(fn.s, "info/", id, 1);
+}
+void fnmake_todo(unsigned long id)
+{
+  fn.len = fmtqfn(fn.s, "todo/", id, 1);
+}
+void fnmake_mess(unsigned long id)
+{
+  fn.len = fmtqfn(fn.s, "mess/", id, 1);
+}
+void fnmake_foop(unsigned long id)
+{
+  fn.len = fmtqfn(fn.s, "foop/", id, 0);
+}
+void fnmake_split(unsigned long id)
+{
+  fn.len = fmtqfn(fn.s, "", id, 1);
+}
+void fnmake2_bounce(unsigned long id)
+{
+  fn2.len = fmtqfn(fn2.s, "bounce/", id, 0);
+}
+void fnmake_chanaddr(unsigned long id, int c)
+{
+  fn.len = fmtqfn(fn.s, chanaddr[c], id, 1);
+}
 
 
 /* this file is too long ----------------------------------------- REWRITING */
 
-void senderadd(stralloc *sa,char *sender,char *recip)
+void senderadd(stralloc *sa, char *sender, char *recip)
 {
   int i;
   int j;
@@ -118,27 +154,27 @@ void senderadd(stralloc *sa,char *sender,char *recip)
 
   i = str_len(sender);
   if (i >= 4)
-    if (str_equal(sender + i - 4,"-@[]")) {
-      j = byte_rchr(sender,i - 4,'@');
-      k = str_rchr(recip,'@');
+    if (str_equal(sender + i - 4, "-@[]")) {
+      j = byte_rchr(sender, i - 4, '@');
+      k = str_rchr(recip, '@');
       if (recip[k] && (j + 5 <= i)) {
         /* owner-@host-@[] -> owner-recipbox=reciphost@host */
-        while (!stralloc_catb(sa,sender,j)) nomem();
-        while (!stralloc_catb(sa,recip,k)) nomem();
-        while (!stralloc_cats(sa,"=")) nomem();
-        while (!stralloc_cats(sa,recip + k + 1)) nomem();
-        while (!stralloc_cats(sa,"@")) nomem();
-        while (!stralloc_catb(sa,sender + j + 1,i - 5 - j)) nomem();
+        while (!stralloc_catb(sa, sender, j)) nomem();
+        while (!stralloc_catb(sa, recip, k)) nomem();
+        while (!stralloc_cats(sa, "=")) nomem();
+        while (!stralloc_cats(sa, recip + k + 1)) nomem();
+        while (!stralloc_cats(sa, "@")) nomem();
+        while (!stralloc_catb(sa, sender + j + 1, i - 5 - j)) nomem();
         return;
       }
     }
-  while (!stralloc_cats(sa,sender)) nomem();
+  while (!stralloc_cats(sa, sender)) nomem();
 }
 
 
 /* this file is too long ---------------------------------------------- INFO */
 
-int getinfo(stralloc *sa,datetime_sec *dt,unsigned long id)
+int getinfo(stralloc *sa, datetime_sec *dt, unsigned long id)
 {
   int fdnumber;
   struct stat st;
@@ -150,15 +186,21 @@ int getinfo(stralloc *sa,datetime_sec *dt,unsigned long id)
   fnmake_info(id);
   fdnumber = open_read(fn.s);
   if (fdnumber == -1) return 0;
-  if (fstat(fdnumber,&st) == -1) { close(fdnumber); return 0; }
-  buffer_init(&b,read,fdnumber,buf,sizeof(buf));
-  if (getln(&b,&line,&match,'\0') == -1) { close(fdnumber); return 0; }
+  if (fstat(fdnumber, &st) == -1) {
+    close(fdnumber);
+    return 0;
+  }
+  buffer_init(&b, read, fdnumber, buf, sizeof(buf));
+  if (getln(&b, &line, &match, '\0') == -1) {
+    close(fdnumber);
+    return 0;
+  }
   close(fdnumber);
   if (!match) return 0;
   if (line.s[0] != 'F') return 0;
 
   *dt = st.st_mtime;
-  while (!stralloc_copys(sa,line.s + 1)) nomem();
+  while (!stralloc_copys(sa, line.s + 1)) nomem();
   while (!stralloc_0(sa)) nomem();
   return 1;
 }
@@ -166,21 +208,23 @@ int getinfo(stralloc *sa,datetime_sec *dt,unsigned long id)
 
 /* this file is too long ------------------------------------- COMMUNICATION */
 
-buffer toqc; char toqcbuf[1024];
-buffer fromqc; char fromqcbuf[1024];
-stralloc comm_buf[CHANNELS] = { {0}, {0} };
+buffer toqc;
+char toqcbuf[1024];
+buffer fromqc;
+char fromqcbuf[1024];
+stralloc comm_buf[CHANNELS] = {{0}, {0}};
 int comm_pos[CHANNELS];
 
 void comm_init()
 {
   int c;
 
-  buffer_init(&toqc,write,5,toqcbuf,sizeof(toqcbuf));
-  buffer_init(&fromqc,read,6,fromqcbuf,sizeof(fromqcbuf));
+  buffer_init(&toqc, write, 5, toqcbuf, sizeof(toqcbuf));
+  buffer_init(&fromqc, read, 6, fromqcbuf, sizeof(fromqcbuf));
   for (c = 0; c < CHANNELS; ++c)
     if (ndelay_on(chanfdout[c]) == -1)
-    /* this is so stupid: NDELAY semantics should be default on write */
-       spawndied(c); /* drastic, but better than risking deadlock */
+      /* this is so stupid: NDELAY semantics should be default on write */
+      spawndied(c); /* drastic, but better than risking deadlock */
 }
 
 int comm_canwrite(int c)
@@ -190,34 +234,33 @@ int comm_canwrite(int c)
   return 1;
 }
 
-void comm_write(int c,int delnum,unsigned long id,char *sender,char *recip)
+void comm_write(int c, int delnum, unsigned long id, char *sender, char *recip)
 {
   char ch;
 
   if (comm_buf[c].s && comm_buf[c].len) return;
-  while (!stralloc_copys(&comm_buf[c],"")) nomem();
+  while (!stralloc_copys(&comm_buf[c], "")) nomem();
   ch = delnum;
-  while (!stralloc_append(&comm_buf[c],&ch)) nomem();
+  while (!stralloc_append(&comm_buf[c], &ch)) nomem();
   fnmake_split(id);
-  while (!stralloc_cats(&comm_buf[c],fn.s)) nomem();
+  while (!stralloc_cats(&comm_buf[c], fn.s)) nomem();
   while (!stralloc_0(&comm_buf[c])) nomem();
-  senderadd(&comm_buf[c],sender,recip);
+  senderadd(&comm_buf[c], sender, recip);
   while (!stralloc_0(&comm_buf[c])) nomem();
-  while (!stralloc_cats(&comm_buf[c],recip)) nomem();
+  while (!stralloc_cats(&comm_buf[c], recip)) nomem();
   while (!stralloc_0(&comm_buf[c])) nomem();
   comm_pos[c] = 0;
 }
 
-void comm_selprep(int *nfds,fd_set *wfds)
+void comm_selprep(int *nfds, fd_set *wfds)
 {
   int c;
 
   for (c = 0; c < CHANNELS; ++c)
     if (flagspawnalive[c])
       if (comm_buf[c].s && comm_buf[c].len) {
-        FD_SET(chanfdout[c],wfds);
-        if (*nfds <= chanfdout[c])
-          *nfds = chanfdout[c] + 1;
+        FD_SET(chanfdout[c], wfds);
+        if (*nfds <= chanfdout[c]) *nfds = chanfdout[c] + 1;
       }
 }
 
@@ -228,23 +271,22 @@ void comm_do(fd_set *wfds)
   for (c = 0; c < CHANNELS; ++c)
     if (flagspawnalive[c])
       if (comm_buf[c].s && comm_buf[c].len)
-        if (FD_ISSET(chanfdout[c],wfds)) {
+        if (FD_ISSET(chanfdout[c], wfds)) {
           int w;
           int len;
           len = comm_buf[c].len;
 
-          w = write(chanfdout[c],comm_buf[c].s + comm_pos[c],len - comm_pos[c]);
+          w = write(chanfdout[c], comm_buf[c].s + comm_pos[c], len - comm_pos[c]);
           if (w <= 0) {
             if ((w == -1) && (errno == EPIPE))
               spawndied(c);
             else
-             continue; /* kernel select() bug; can't avoid busy-looping */
+              continue; /* kernel select() bug; can't avoid busy-looping */
           } else {
-           comm_pos[c] += w;
-          if (comm_pos[c] == len)
-            comm_buf[c].len = 0;
+            comm_pos[c] += w;
+            if (comm_pos[c] == len) comm_buf[c].len = 0;
           }
-        } 
+        }
 }
 
 
@@ -274,40 +316,45 @@ void cleanup_do()
 
   if (!flagcleanup) {
     if (recent < cleanuptime) return;
-    readsubdir_init(&cleanupdir,"mess",pausedir);
+    readsubdir_init(&cleanupdir, "mess", pausedir);
     flagcleanup = 1;
   }
 
-  switch (readsubdir_next(&cleanupdir,&id)) {
-    case 1:  break; 
+  switch (readsubdir_next(&cleanupdir, &id)) {
+    case 1:  break;
     case 0:  flagcleanup = 0; cleanuptime = recent + SLEEP_CLEANUP;
     default: return;
   }
 
   fnmake_mess(id);
-  if (stat(fn.s,&st) == -1) return; /* probably qmail-queue deleted it */
+  if (stat(fn.s, &st) == -1) return; /* probably qmail-queue deleted it */
   if (recent <= st.st_atime + OSSIFIED) return;
 
   fnmake_info(id);
-  if (stat(fn.s,&st) == 0) return;
+  if (stat(fn.s, &st) == 0) return;
   if (errno != ENOENT) return;
 
   fnmake_todo(id);
-  if (stat(fn.s,&st) == 0) return;
+  if (stat(fn.s, &st) == 0) return;
   if (errno != ENOENT) return;
 
   fnmake_foop(id);
-  if (buffer_putflush(&toqc,fn.s,fn.len) == -1) { cleandied(); return; }
-  if (buffer_get(&fromqc,&ch,1) != 1) { cleandied(); return; }
-  if (ch != '+')
-    log3s("warning: qmail-clean unable to clean up ",fn.s,"\n");
+  if (buffer_putflush(&toqc, fn.s, fn.len) == -1) {
+    cleandied();
+    return;
+  }
+  if (buffer_get(&fromqc, &ch, 1) != 1) {
+    cleandied();
+    return;
+  }
+  if (ch != '+') log3s("warning: qmail-clean unable to clean up ", fn.s, "\n");
 }
 
 
 /* this file is too long ----------------------------------- PRIORITY QUEUES */
 
 prioq pqdone = {0}; /* -todo +info; HOPEFULLY -local -remote */
-prioq pqchan[CHANNELS] = { {0}, {0} };
+prioq pqchan[CHANNELS] = {{0}, {0}};
 /* pqchan 0: -todo +info +local ?remote */
 /* pqchan 1: -todo +info ?local +remote */
 prioq pqfail = {0}; /* stat() failure; has to be pqadded again */
@@ -320,42 +367,51 @@ void pqadd(unsigned long id)
   struct stat st;
   int c;
 
-#define CHECKSTAT if (errno != ENOENT) goto FAIL;
+#define CHECKSTAT \
+  if (errno != ENOENT) goto FAIL;
 
   fnmake_info(id);
-  if (stat(fn.s,&st) == -1) {
+  if (stat(fn.s, &st) == -1) {
     CHECKSTAT
     return; /* someone yanking our chain */
   }
 
   fnmake_todo(id);
-  if (stat(fn.s,&st) != -1) return; /* look, ma, dad crashed writing info! */
+  if (stat(fn.s, &st) != -1) return; /* look, ma, dad crashed writing info! */
   CHECKSTAT
 
   for (c = 0; c < CHANNELS; ++c) {
-    fnmake_chanaddr(id,c);
-    if (stat(fn.s,&st) == -1) { flagchan[c] = 0; CHECKSTAT }
-    else { flagchan[c] = 1; pechan[c].id = id; pechan[c].dt = st.st_mtime; }
+    fnmake_chanaddr(id, c);
+    if (stat(fn.s, &st) == -1) {
+      flagchan[c] = 0;
+      CHECKSTAT
+    } else {
+      flagchan[c] = 1;
+      pechan[c].id = id;
+      pechan[c].dt = st.st_mtime;
+    }
   }
 
   for (c = 0; c < CHANNELS; ++c)
     if (flagchan[c])
-      while (!prioq_insert(&pqchan[c],&pechan[c])) nomem();
+      while (!prioq_insert(&pqchan[c], &pechan[c])) nomem();
 
-  for (c = 0; c < CHANNELS; ++c) 
+  for (c = 0; c < CHANNELS; ++c)
     if (flagchan[c]) break;
 
   if (c == CHANNELS) {
-    pe.id = id; pe.dt = now();
-    while (!prioq_insert(&pqdone,&pe)) nomem();
+    pe.id = id;
+    pe.dt = now();
+    while (!prioq_insert(&pqdone, &pe)) nomem();
   }
 
   return;
 
-  FAIL:
-  log3s("warning: unable to stat ",fn.s,"; will try again later\n");
-  pe.id = id; pe.dt = now() + SLEEP_SYSFAIL;
-  while (!prioq_insert(&pqfail,&pe)) nomem();
+FAIL:
+  log3s("warning: unable to stat ", fn.s, "; will try again later\n");
+  pe.id = id;
+  pe.dt = now() + SLEEP_SYSFAIL;
+  while (!prioq_insert(&pqfail, &pe)) nomem();
 }
 
 void pqstart()
@@ -364,9 +420,9 @@ void pqstart()
   int x;
   unsigned long id;
 
-  readsubdir_init(&rs,"info",pausedir);
+  readsubdir_init(&rs, "info", pausedir);
 
-  while ((x = readsubdir_next(&rs,&id)))
+  while ((x = readsubdir_next(&rs, &id)))
     if (x > 0) pqadd(id);
 }
 
@@ -377,12 +433,12 @@ void pqfinish()
   time_t ut[2]; /* XXX: more portable than utimbuf, but still worrisome */
 
   for (c = 0; c < CHANNELS; ++c)
-    while (prioq_min(&pqchan[c],&pe)) {
+    while (prioq_min(&pqchan[c], &pe)) {
       prioq_delmin(&pqchan[c]);
-      fnmake_chanaddr(pe.id,c);
+      fnmake_chanaddr(pe.id, c);
       ut[0] = ut[1] = pe.dt;
-      if (utime(fn.s,ut) == -1)
-        log3s("warning: unable to utime ",fn.s,"; message will be retried too soon\n");
+      if (utime(fn.s, ut) == -1)
+        log3s("warning: unable to utime ", fn.s, "; message will be retried too soon\n");
     }
 }
 
@@ -394,16 +450,14 @@ void pqrun()
   for (c = 0; c < CHANNELS; ++c)
     if (pqchan[c].p)
       if (pqchan[c].len)
-        for (i = 0; i < pqchan[c].len; ++i)
-	  pqchan[c].p[i].dt = recent;
+        for (i = 0; i < pqchan[c].len; ++i) pqchan[c].p[i].dt = recent;
 }
 
 
 /* this file is too long ---------------------------------------------- JOBS */
 
-struct job
-{
-  int refs;           /* if 0, this struct is unused */
+struct job {
+  int refs; /* if 0, this struct is unused */
   unsigned long id;
   int channel;
   datetime_sec retry;
@@ -420,7 +474,7 @@ void job_init()
 {
   int j;
 
-  while (!(jo = (struct job *) alloc(numjobs * sizeof(struct job)))) nomem();
+  while (!(jo = (struct job *)alloc(numjobs * sizeof(struct job)))) nomem();
   for (j = 0; j < numjobs; ++j) {
     jo[j].refs = 0;
     jo[j].sender.s = 0;
@@ -431,16 +485,16 @@ int job_avail()
 {
   int j;
 
-  for (j = 0; j < numjobs; ++j) 
+  for (j = 0; j < numjobs; ++j)
     if (!jo[j].refs) return 1;
   return 0;
 }
 
-int job_open(unsigned long id,int channel)
+int job_open(unsigned long id, int channel)
 {
   int j;
 
-  for (j = 0; j < numjobs; ++j) 
+  for (j = 0; j < numjobs; ++j)
     if (!jo[j].refs) break;
   if (j == numjobs) return -1;
   jo[j].refs = 1;
@@ -463,26 +517,27 @@ void job_close(int j)
   pe.dt = jo[j].retry;
 
   if (jo[j].flaghiteof && !jo[j].numtodo) {
-    fnmake_chanaddr(jo[j].id,jo[j].channel);
+    fnmake_chanaddr(jo[j].id, jo[j].channel);
     if (unlink(fn.s) == -1) {
-      log3s("warning: unable to unlink ",fn.s,"; will try again later\n");
+      log3s("warning: unable to unlink ", fn.s, "; will try again later\n");
       pe.dt = now() + SLEEP_SYSFAIL;
     } else {
-      for (c = 0; c < CHANNELS; ++c) if (c != jo[j].channel) {
-        fnmake_chanaddr(jo[j].id,c);
-        if (stat(fn.s,&st) == 0) return; /* more channels going */
-        if (errno != ENOENT) {
-          log3s("warning: unable to stat ",fn.s,"\n");
-	  break; /* this is the only reason for HOPEFULLY */
-	}
-    }
-    pe.dt = now();
-    while (!prioq_insert(&pqdone,&pe)) nomem();
-    return;
+      for (c = 0; c < CHANNELS; ++c)
+        if (c != jo[j].channel) {
+          fnmake_chanaddr(jo[j].id, c);
+          if (stat(fn.s, &st) == 0) return; /* more channels going */
+          if (errno != ENOENT) {
+            log3s("warning: unable to stat ", fn.s, "\n");
+            break; /* this is the only reason for HOPEFULLY */
+          }
+        }
+      pe.dt = now();
+      while (!prioq_insert(&pqdone, &pe)) nomem();
+      return;
     }
   }
 
-  while (!prioq_insert(&pqchan[jo[j].channel],&pe)) nomem();
+  while (!prioq_insert(&pqchan[jo[j].channel], &pe)) nomem();
 }
 
 
@@ -495,17 +550,17 @@ char *stripvdomprepend(char *recip)
   int domainlen;
   char *prepend;
 
-  i = str_rchr(recip,'@');
+  i = str_rchr(recip, '@');
   if (!recip[i]) return recip;
   domain = recip + i + 1;
   domainlen = str_len(domain);
 
   for (i = 0; i <= domainlen; ++i)
     if ((i == 0) || (i == domainlen) || (domain[i] == '.'))
-      if ((prepend = constmap(&mapvdoms,domain + i,domainlen - i))) {
+      if ((prepend = constmap(&mapvdoms, domain + i, domainlen - i))) {
         if (!*prepend) break;
         i = str_len(prepend);
-        if (str_diffn(recip,prepend,i)) break;
+        if (str_diffn(recip, prepend, i)) break;
         if (recip[i] != '-') break;
         return recip + i + 1;
       }
@@ -515,32 +570,30 @@ char *stripvdomprepend(char *recip)
 
 stralloc bouncetext = {0};
 
-void addbounce(unsigned long id,char *recip,char *report)
+void addbounce(unsigned long id, char *recip, char *report)
 {
   int fd;
   int pos;
   int w;
 
-  while (!stralloc_copys(&bouncetext,"<")) nomem();
-  while (!stralloc_cats(&bouncetext,stripvdomprepend(recip))) nomem();
+  while (!stralloc_copys(&bouncetext, "<")) nomem();
+  while (!stralloc_cats(&bouncetext, stripvdomprepend(recip))) nomem();
 
   for (pos = 0; pos < bouncetext.len; ++pos)
-    if (bouncetext.s[pos] == '\n')
-      bouncetext.s[pos] = '_';
+    if (bouncetext.s[pos] == '\n') bouncetext.s[pos] = '_';
 
-  while (!stralloc_cats(&bouncetext,">:\n")) nomem();
-  while (!stralloc_cats(&bouncetext,report)) nomem();
+  while (!stralloc_cats(&bouncetext, ">:\n")) nomem();
+  while (!stralloc_cats(&bouncetext, report)) nomem();
 
   if (report[0])
     if (report[str_len(report) - 1] != '\n')
-      while (!stralloc_cats(&bouncetext,"\n")) nomem();
+      while (!stralloc_cats(&bouncetext, "\n")) nomem();
 
   for (pos = bouncetext.len - 2; pos > 0; --pos)
     if (bouncetext.s[pos] == '\n')
-      if (bouncetext.s[pos - 1] == '\n')
-        bouncetext.s[pos] = '/';
+      if (bouncetext.s[pos - 1] == '\n') bouncetext.s[pos] = '/';
 
-  while (!stralloc_cats(&bouncetext,"\n")) nomem();
+  while (!stralloc_cats(&bouncetext, "\n")) nomem();
   fnmake2_bounce(id);
 
   for (;;) {
@@ -553,12 +606,11 @@ void addbounce(unsigned long id,char *recip,char *report)
   pos = 0;
 
   while (pos < bouncetext.len) {
-    w = write(fd,bouncetext.s + pos,bouncetext.len - pos);
+    w = write(fd, bouncetext.s + pos, bouncetext.len - pos);
     if (w <= 0) {
       log1s("alert: unable to append to bounce message; HELP! sleeping...\n");
       sleep(10);
-    }
-    else
+    } else
       pos += w;
   }
   close(fd);
@@ -582,11 +634,11 @@ int injectbounce(unsigned long id)
   int bytestogo;
   int bytestoget;
 
-  if (!getinfo(&sender,&birth,id)) return 0; /* XXX: print warning */
+  if (!getinfo(&sender, &birth, id)) return 0; /* XXX: print warning */
 
   /* owner-@host-@[] -> owner-@host */
   if (sender.len >= 5)
-    if (str_equal(sender.s + sender.len - 5,"-@[]")) {
+    if (str_equal(sender.s + sender.len - 5, "-@[]")) {
       sender.len -= 4;
       sender.s[sender.len - 1] = 0;
     }
@@ -594,109 +646,121 @@ int injectbounce(unsigned long id)
   fnmake2_bounce(id);
   fnmake_mess(id);
 
-  if (stat(fn2.s,&st) == -1) {
+  if (stat(fn2.s, &st) == -1) {
     if (errno == ENOENT) return 1;
-    log3s("warning: unable to stat ",fn2.s,"\n");
+    log3s("warning: unable to stat ", fn2.s, "\n");
     return 0;
   }
- 
-  if (str_equal(sender.s,"#@[]"))
-    log3s("triple bounce: discarding ",fn2.s,"\n");
-  else if (!*sender.s && *doublebounceto.s == '@') 
-    log3s("double bounce: discarding ",fn2.s,"\n");
+
+  if (str_equal(sender.s, "#@[]"))
+    log3s("triple bounce: discarding ", fn2.s, "\n");
+  else if (!*sender.s && *doublebounceto.s == '@')
+    log3s("double bounce: discarding ", fn2.s, "\n");
   else {
-    if (qmail_open(&qqt) == -1)
-      { log1s("warning: unable to start qmail-queue, will try later\n"); return 0; }
+    if (qmail_open(&qqt) == -1) {
+      log1s("warning: unable to start qmail-queue, will try later\n");
+      return 0;
+    }
     qp = qmail_qp(&qqt);
 
-    if (*sender.s) { bouncesender = ""; bouncerecip = sender.s; }
-    else { bouncesender = "#@[]"; bouncerecip = doublebounceto.s; }
+    if (*sender.s) {
+      bouncesender = "";
+      bouncerecip = sender.s;
+    } else {
+      bouncesender = "#@[]";
+      bouncerecip = doublebounceto.s;
+    }
 
     while (!newfield_datemake(now())) nomem();
-    qmail_put(&qqt,newfield_date.s,newfield_date.len);
-    qmail_puts(&qqt,"From: ");
-    while (!quote(&quoted,&bouncefrom)) nomem();
-    qmail_put(&qqt,quoted.s,quoted.len);
-    qmail_puts(&qqt,"@");
-    qmail_put(&qqt,bouncehost.s,bouncehost.len);
-    qmail_puts(&qqt,"\nTo: ");
-    while (!quote2(&quoted,bouncerecip)) nomem();
-    qmail_put(&qqt,quoted.s,quoted.len);
-    qmail_puts(&qqt,"\n\
+    qmail_put(&qqt, newfield_date.s, newfield_date.len);
+    qmail_puts(&qqt, "From: ");
+    while (!quote(&quoted, &bouncefrom)) nomem();
+    qmail_put(&qqt, quoted.s, quoted.len);
+    qmail_puts(&qqt, "@");
+    qmail_put(&qqt, bouncehost.s, bouncehost.len);
+    qmail_puts(&qqt, "\nTo: ");
+    while (!quote2(&quoted, bouncerecip)) nomem();
+    qmail_put(&qqt, quoted.s, quoted.len);
+    qmail_puts(
+        &qqt,
+        "\n\
 Subject: failure notice\n\
 \n\
 Hi. This is the qmail-send program at ");
-   qmail_put(&qqt,bouncehost.s,bouncehost.len);
-   qmail_puts(&qqt,*sender.s ? ".\n\
+    qmail_put(&qqt, bouncehost.s, bouncehost.len);
+    qmail_puts(
+        &qqt,
+        *sender.s ? ".\n\
 I'm afraid I wasn't able to deliver your message to the following addresses.\n\
 This is a permanent error; I've given up. Sorry it didn't work out.\n\
 \n\
-" : ".\n\
+"
+                  : ".\n\
 I tried to deliver a bounce message to this address, but the bounce bounced!\n\
 \n\
 ");
 
     fd = open_read(fn2.s);
     if (fd == -1)
-    qmail_fail(&qqt);
+      qmail_fail(&qqt);
     else {
-      buffer_init(&bi,read,fd,inbuf,sizeof(inbuf));
-      while ((r = buffer_get(&bi,buf,sizeof(buf))) > 0)
-        qmail_put(&qqt,buf,r);
+      buffer_init(&bi, read, fd, inbuf, sizeof(inbuf));
+      while ((r = buffer_get(&bi, buf, sizeof(buf))) > 0) qmail_put(&qqt, buf, r);
 
       close(fd);
       if (r == -1) qmail_fail(&qqt);
     }
 
-    qmail_puts(&qqt,*sender.s ? "--- Below this line is a copy of the message.\n\n" : "--- Below this line is the original bounce.\n\n");
-    qmail_puts(&qqt,"Return-Path: <");
-    while (!quote2(&quoted,sender.s)) nomem();
-    qmail_put(&qqt,quoted.s,quoted.len);
-    qmail_puts(&qqt,">\n");
+    qmail_puts(
+        &qqt,
+        *sender.s ? "--- Below this line is a copy of the message.\n\n"
+                  : "--- Below this line is the original bounce.\n\n");
+    qmail_puts(&qqt, "Return-Path: <");
+    while (!quote2(&quoted, sender.s)) nomem();
+    qmail_put(&qqt, quoted.s, quoted.len);
+    qmail_puts(&qqt, ">\n");
 
     fd = open_read(fn.s);
-    if (fd == -1) 
+    if (fd == -1)
       qmail_fail(&qqt);
     else {
       if (bouncemaxbytes) {
         bytestogo = bouncemaxbytes;
         bytestoget = (bytestogo < sizeof(buf)) ? bytestogo : sizeof(buf);
 
-        buffer_init(&bi,read,fd,inbuf,sizeof(inbuf));
+        buffer_init(&bi, read, fd, inbuf, sizeof(inbuf));
 
-        while (bytestoget > 0 && (r = buffer_get(&bi,buf,bytestoget)) > 0) {
-          qmail_put(&qqt,buf,r);
+        while (bytestoget > 0 && (r = buffer_get(&bi, buf, bytestoget)) > 0) {
+          qmail_put(&qqt, buf, r);
           bytestogo -= bytestoget;
           bytestoget = (bytestogo < sizeof(buf)) ? bytestogo : sizeof(buf);
         }
-        if (r > 0) 
-          qmail_puts(&qqt,"\n\n--- Rest of message truncated.\n");
-      } else {                      /* preserve default behavior */
-          buffer_init(&bi,read,fd,inbuf,sizeof(inbuf));
+        if (r > 0) qmail_puts(&qqt, "\n\n--- Rest of message truncated.\n");
+      } else { /* preserve default behavior */
+        buffer_init(&bi, read, fd, inbuf, sizeof(inbuf));
 
-          while ((r = buffer_get(&bi,buf,sizeof(buf))) > 0)
-           qmail_put(&qqt,buf,r);
+        while ((r = buffer_get(&bi, buf, sizeof(buf))) > 0) qmail_put(&qqt, buf, r);
       }
       close(fd);
       if (r == -1) qmail_fail(&qqt);
     }
 
-    qmail_from(&qqt,bouncesender);
-    qmail_to(&qqt,bouncerecip);
+    qmail_from(&qqt, bouncesender);
+    qmail_to(&qqt, bouncerecip);
 
-    if (*qmail_close(&qqt)) { 
+    if (*qmail_close(&qqt)) {
       log1s("warning: trouble injecting bounce message, will try later\n");
-      return 0; 
+      return 0;
     }
 
-    strnum2[fmt_ulong(strnum2,id)] = 0;
-    log2s("bounce msg ",strnum2);
-    strnum2[fmt_ulong(strnum2,qp)] = 0;
-    log3s(" qp ",strnum2,"\n");
+    strnum2[fmt_ulong(strnum2, id)] = 0;
+    log2s("bounce msg ", strnum2);
+    strnum2[fmt_ulong(strnum2, qp)] = 0;
+    log3s(" qp ", strnum2, "\n");
   }
 
   if (unlink(fn2.s) != 0) {
-    log3s("warning: unable to unlink ",fn2.s,"\n");
+    log3s("warning: unable to unlink ", fn2.s, "\n");
     return 0;
   }
 
@@ -715,8 +779,8 @@ struct del {
 };
 
 unsigned long masterdelid = 1;
-unsigned int concurrency[CHANNELS] = { 10, 20 };
-unsigned int concurrencyused[CHANNELS] = { 0, 0 };
+unsigned int concurrency[CHANNELS] = {10, 20};
+unsigned int concurrencyused[CHANNELS] = {0, 0};
 struct del *d[CHANNELS];
 stralloc dline[CHANNELS];
 char delbuf[2048];
@@ -727,10 +791,10 @@ void del_status()
 
   log1s("status:");
   for (c = 0; c < CHANNELS; ++c) {
-    strnum2[fmt_ulong(strnum2,(unsigned long) concurrencyused[c])] = 0;
-    strnum3[fmt_ulong(strnum3,(unsigned long) concurrency[c])] = 0;
-    log2s(chanstatusmsg[c],strnum2);
-    log2s("/",strnum3);
+    strnum2[fmt_ulong(strnum2, (unsigned long)concurrencyused[c])] = 0;
+    strnum3[fmt_ulong(strnum3, (unsigned long)concurrency[c])] = 0;
+    log2s(chanstatusmsg[c], strnum2);
+    log2s("/", strnum3);
   }
   if (flagexitasap) log1s(" exitasap");
   log1s("\n");
@@ -743,12 +807,13 @@ void del_init()
 
   for (c = 0; c < CHANNELS; ++c) {
     flagspawnalive[c] = 1;
-    while (!(d[c] = (struct del *) alloc(concurrency[c] * sizeof(struct del))))
-      nomem();
-    for (i = 0; i < concurrency[c]; ++i)
-      { d[c][i].used = 0; d[c][i].recip.s = 0; }
-   dline[c].s = 0;
-   while (!stralloc_copys(&dline[c],"")) nomem();
+    while (!(d[c] = (struct del *)alloc(concurrency[c] * sizeof(struct del)))) nomem();
+    for (i = 0; i < concurrency[c]; ++i) {
+      d[c][i].used = 0;
+      d[c][i].recip.s = 0;
+    }
+    dline[c].s = 0;
+    while (!stralloc_copys(&dline[c], "")) nomem();
   }
 
   del_status();
@@ -759,8 +824,8 @@ int del_canexit()
   int c;
 
   for (c = 0; c < CHANNELS; ++c)
-   if (flagspawnalive[c]) /* if dead, nothing we can do about its jobs */
-     if (concurrencyused[c]) return 0;
+    if (flagspawnalive[c]) /* if dead, nothing we can do about its jobs */
+      if (concurrencyused[c]) return 0;
   return 1;
 }
 
@@ -769,7 +834,7 @@ int del_avail(int c)
   return flagspawnalive[c] && comm_canwrite(c) && (concurrencyused[c] < concurrency[c]);
 }
 
-void del_start(int j,seek_pos mpos,char *recip)
+void del_start(int j, seek_pos mpos, char *recip)
 {
   int i;
   int c;
@@ -778,46 +843,63 @@ void del_start(int j,seek_pos mpos,char *recip)
   if (!flagspawnalive[c]) return;
   if (!comm_canwrite(c)) return;
 
-  for (i = 0; i < concurrency[c]; ++i) 
+  for (i = 0; i < concurrency[c]; ++i)
     if (!d[c][i].used) break;
   if (i == concurrency[c]) return;
 
-  if (!stralloc_copys(&d[c][i].recip,recip)) { nomem(); return; }
-  if (!stralloc_0(&d[c][i].recip)) { nomem(); return; }
-  d[c][i].j = j; ++jo[j].refs;
+  if (!stralloc_copys(&d[c][i].recip, recip)) {
+    nomem();
+    return;
+  }
+  if (!stralloc_0(&d[c][i].recip)) {
+    nomem();
+    return;
+  }
+  d[c][i].j = j;
+  ++jo[j].refs;
   d[c][i].delid = masterdelid++;
   d[c][i].mpos = mpos;
-  d[c][i].used = 1; ++concurrencyused[c];
+  d[c][i].used = 1;
+  ++concurrencyused[c];
 
-  comm_write(c,i,jo[j].id,jo[j].sender.s,recip);
+  comm_write(c, i, jo[j].id, jo[j].sender.s, recip);
 
-  strnum2[fmt_ulong(strnum2,d[c][i].delid)] = 0;
-  strnum3[fmt_ulong(strnum3,jo[j].id)] = 0;
-  log2s("starting delivery ",strnum2);
-  log3s(": msg ",strnum3,tochan[c]);
+  strnum2[fmt_ulong(strnum2, d[c][i].delid)] = 0;
+  strnum3[fmt_ulong(strnum3, jo[j].id)] = 0;
+  log2s("starting delivery ", strnum2);
+  log3s(": msg ", strnum3, tochan[c]);
   logsafe(recip);
   log1s("\n");
   del_status();
 }
 
-void markdone(int c,unsigned long id,seek_pos pos)
+void markdone(int c, unsigned long id, seek_pos pos)
 {
   struct stat st;
   int fd;
 
-  fnmake_chanaddr(id,c);
+  fnmake_chanaddr(id, c);
 
   for (;;) {
     fd = open_write(fn.s);
     if (fd == -1) break;
-    if (fstat(fd,&st) == -1) { close(fd); break; }
-    if (seek_set(fd,pos) == -1) { close(fd); break; }
-    if (write(fd,"D",1) != 1) { close(fd); break; }
+    if (fstat(fd, &st) == -1) {
+      close(fd);
+      break;
+    }
+    if (seek_set(fd, pos) == -1) {
+      close(fd);
+      break;
+    }
+    if (write(fd, "D", 1) != 1) {
+      close(fd);
+      break;
+    }
     /* further errors -> double delivery without us knowing about it, oh well */
     close(fd);
     return;
   }
-  log3s("warning: trouble marking ",fn.s,"; message will be delivered twice!\n");
+  log3s("warning: trouble marking ", fn.s, "; message will be delivered twice!\n");
 }
 
 void del_dochan(int c)
@@ -826,78 +908,80 @@ void del_dochan(int c)
   char ch;
   int i;
   int delnum;
- 
-  r = read(chanfdin[c],delbuf,sizeof(delbuf));
+
+  r = read(chanfdin[c], delbuf, sizeof(delbuf));
   if (r == -1) return;
-  if (r == 0) { spawndied(c); return; }
+  if (r == 0) {
+    spawndied(c);
+    return;
+  }
 
   for (i = 0; i < r; ++i) {
     ch = delbuf[i];
-    while (!stralloc_append(&dline[c],&ch)) nomem();
-    
-    if (dline[c].len > REPORTMAX)
-      dline[c].len = REPORTMAX;
-      /* qmail-lspawn and qmail-rspawn are responsible for keeping it short */
-      /* but from a security point of view, we don't trust rspawn */
+    while (!stralloc_append(&dline[c], &ch)) nomem();
+
+    if (dline[c].len > REPORTMAX) dline[c].len = REPORTMAX;
+    /* qmail-lspawn and qmail-rspawn are responsible for keeping it short */
+    /* but from a security point of view, we don't trust rspawn */
 
     if (!ch && (dline[c].len > 1)) {
-      delnum = (unsigned int) (unsigned char) dline[c].s[0];
+      delnum = (unsigned int)(unsigned char)dline[c].s[0];
       if ((delnum < 0) || (delnum >= concurrency[c]) || !d[c][delnum].used)
         log1s("warning: internal error: delivery report out of range\n");
       else {
-        strnum3[fmt_ulong(strnum3,d[c][delnum].delid)] = 0;
+        strnum3[fmt_ulong(strnum3, d[c][delnum].delid)] = 0;
         if (dline[c].s[1] == 'Z')
-	    if (jo[d[c][delnum].j].flagdying) {
-	      dline[c].s[1] = 'D';
-	      --dline[c].len;
-	      while (!stralloc_cats(&dline[c],"I'm not going to try again; this message has been in the queue too long.\n")) nomem();
-	      while (!stralloc_0(&dline[c])) nomem();
-	    }
+          if (jo[d[c][delnum].j].flagdying) {
+            dline[c].s[1] = 'D';
+            --dline[c].len;
+            while (!stralloc_cats(
+                &dline[c], "I'm not going to try again; this message has been in the queue too long.\n"))
+              nomem();
+            while (!stralloc_0(&dline[c])) nomem();
+          }
 
         switch (dline[c].s[1]) {
           case 'K':
-            log3s("delivery ",strnum3,": success: ");
+            log3s("delivery ", strnum3, ": success: ");
             logsafe(dline[c].s + 2);
             log1s("\n");
-            markdone(c,jo[d[c][delnum].j].id,d[c][delnum].mpos);
+            markdone(c, jo[d[c][delnum].j].id, d[c][delnum].mpos);
             --jo[d[c][delnum].j].numtodo;
-           break;
-         case 'Z':
-           log3s("delivery ",strnum3,": deferral: ");
-           logsafe(dline[c].s + 2);
-           log1s("\n");
-           break;
-         case 'D':
-           log3s("delivery ",strnum3,": failure: ");
-           logsafe(dline[c].s + 2);
-           log1s("\n");
-           addbounce(jo[d[c][delnum].j].id,d[c][delnum].recip.s,dline[c].s + 2);
-           markdone(c,jo[d[c][delnum].j].id,d[c][delnum].mpos);
-           --jo[d[c][delnum].j].numtodo;
-           break;
-         default:
-           log3s("delivery ",strnum3,": report mangled, will defer\n");
-       }
-        
-      job_close(d[c][delnum].j);
-      d[c][delnum].used = 0; --concurrencyused[c];
+            break;
+          case 'Z':
+            log3s("delivery ", strnum3, ": deferral: ");
+            logsafe(dline[c].s + 2);
+            log1s("\n");
+            break;
+          case 'D':
+            log3s("delivery ", strnum3, ": failure: ");
+            logsafe(dline[c].s + 2);
+            log1s("\n");
+            addbounce(jo[d[c][delnum].j].id, d[c][delnum].recip.s, dline[c].s + 2);
+            markdone(c, jo[d[c][delnum].j].id, d[c][delnum].mpos);
+            --jo[d[c][delnum].j].numtodo;
+            break;
+          default: log3s("delivery ", strnum3, ": report mangled, will defer\n");
+        }
+
+        job_close(d[c][delnum].j);
+        d[c][delnum].used = 0;
+        --concurrencyused[c];
         del_status();
-     
       }
       dline[c].len = 0;
     }
   }
 }
 
-void del_selprep(int *nfds,fd_set *rfds)
+void del_selprep(int *nfds, fd_set *rfds)
 {
   int c;
 
   for (c = 0; c < CHANNELS; ++c)
     if (flagspawnalive[c]) {
-      FD_SET(chanfdin[c],rfds);
-      if (*nfds <= chanfdin[c])
-        *nfds = chanfdin[c] + 1;
+      FD_SET(chanfdin[c], rfds);
+      if (*nfds <= chanfdin[c]) *nfds = chanfdin[c] + 1;
     }
 }
 
@@ -907,23 +991,20 @@ void del_do(fd_set *rfds)
 
   for (c = 0; c < CHANNELS; ++c)
     if (flagspawnalive[c])
-      if (FD_ISSET(chanfdin[c],rfds))
-        del_dochan(c);
+      if (FD_ISSET(chanfdin[c], rfds)) del_dochan(c);
 }
 
 
 /* this file is too long -------------------------------------------- PASSES */
 
-struct
-{
+struct {
   unsigned long id; /* if 0, need a new pass */
   int j;            /* defined if id; job number */
   int fd;           /* defined if id; reading from {local,remote} */
   seek_pos mpos;    /* defined if id; mark position */
   buffer b;
   char buf[128];
-}
-pass[CHANNELS];
+} pass[CHANNELS];
 
 void pass_init()
 {
@@ -937,24 +1018,25 @@ void pass_selprep(datetime_sec *wakeup)
   int c;
   struct prioq_elt pe;
   if (flagexitasap) return;
- 
+
   for (c = 0; c < CHANNELS; ++c)
     if (pass[c].id)
-      if (del_avail(c))
-       { *wakeup = 0; return; }
-  
+      if (del_avail(c)) {
+        *wakeup = 0;
+        return;
+      }
+
   if (job_avail())
     for (c = 0; c < CHANNELS; ++c)
       if (!pass[c].id)
-        if (prioq_min(&pqchan[c],&pe))
+        if (prioq_min(&pqchan[c], &pe))
           if (*wakeup > pe.dt) *wakeup = pe.dt;
-  
-  if (prioq_min(&pqfail,&pe))
-    if (*wakeup > pe.dt)
-      *wakeup = pe.dt;
 
-  if (prioq_min(&pqdone,&pe))
-    if (*wakeup > pe.dt)*wakeup = pe.dt;
+  if (prioq_min(&pqfail, &pe))
+    if (*wakeup > pe.dt) *wakeup = pe.dt;
+
+  if (prioq_min(&pqdone, &pe))
+    if (*wakeup > pe.dt) *wakeup = pe.dt;
 }
 
 static datetime_sec squareroot(datetime_sec x) /* result^2 <= x < (result + 1)^2 ;  assuming: >= 0 */
@@ -964,20 +1046,26 @@ static datetime_sec squareroot(datetime_sec x) /* result^2 <= x < (result + 1)^2
   datetime_sec y21;
   int j;
 
-  y = 0; yy = 0;
+  y = 0;
+  yy = 0;
   for (j = 15; j >= 0; --j) {
     y21 = (y << (j + 1)) + (1 << (j + j));
-    if (y21 <= x - yy) { y += (1 << j); yy += y21; }
+    if (y21 <= x - yy) {
+      y += (1 << j);
+      yy += y21;
+    }
   }
   return y;
 }
 
-datetime_sec nextretry(datetime_sec birth,int c)
+datetime_sec nextretry(datetime_sec birth, int c)
 {
   int n;
 
-  if (birth > recent) n = 0;
-  else n = squareroot(recent - birth); /* no need to add fuzz to recent */
+  if (birth > recent)
+    n = 0;
+  else
+    n = squareroot(recent - birth); /* no need to add fuzz to recent */
 
   n += chanskip[c];
   return birth + n * n;
@@ -994,28 +1082,31 @@ void pass_dochan(int c)
 
   if (!pass[c].id) {
     if (!job_avail()) return;
-    if (!prioq_min(&pqchan[c],&pe)) return;
+    if (!prioq_min(&pqchan[c], &pe)) return;
     if (pe.dt > recent) return;
-    fnmake_chanaddr(pe.id,c);
+    fnmake_chanaddr(pe.id, c);
 
     prioq_delmin(&pqchan[c]);
     pass[c].mpos = 0;
     pass[c].fd = open_read(fn.s);
     if (pass[c].fd == -1) goto trouble;
-    if (!getinfo(&line,&birth,pe.id)) { close(pass[c].fd); goto trouble; }
+    if (!getinfo(&line, &birth, pe.id)) {
+      close(pass[c].fd);
+      goto trouble;
+    }
     pass[c].id = pe.id;
-    buffer_init(&pass[c].b,read,pass[c].fd,pass[c].buf,sizeof(pass[c].buf));
-    pass[c].j = job_open(pe.id,c);
-    jo[pass[c].j].retry = nextretry(birth,c);
+    buffer_init(&pass[c].b, read, pass[c].fd, pass[c].buf, sizeof(pass[c].buf));
+    pass[c].j = job_open(pe.id, c);
+    jo[pass[c].j].retry = nextretry(birth, c);
     jo[pass[c].j].flagdying = (recent > birth + lifetime);
-    while (!stralloc_copy(&jo[pass[c].j].sender,&line)) nomem();
+    while (!stralloc_copy(&jo[pass[c].j].sender, &line)) nomem();
   }
 
   if (!del_avail(c)) return;
 
-  if (getln(&pass[c].b,&line,&match,'\0') == -1) {
-    fnmake_chanaddr(pass[c].id,c);
-    log3s("warning: trouble reading ",fn.s,"; will try again later\n");
+  if (getln(&pass[c].b, &line, &match, '\0') == -1) {
+    fnmake_chanaddr(pass[c].id, c);
+    log3s("warning: trouble reading ", fn.s, "; will try again later\n");
     close(pass[c].fd);
     job_close(pass[c].j);
     pass[c].id = 0;
@@ -1033,26 +1124,25 @@ void pass_dochan(int c)
   switch (line.s[0]) {
     case 'T':
       ++jo[pass[c].j].numtodo;
-      del_start(pass[c].j,pass[c].mpos,line.s + 1);
-      break;
-    case 'D':
+      del_start(pass[c].j, pass[c].mpos, line.s + 1);
       break;
+    case 'D': break;
     default:
-      fnmake_chanaddr(pass[c].id,c);
-      log3s("warning: unknown record type in ",fn.s,"!\n");
+      fnmake_chanaddr(pass[c].id, c);
+      log3s("warning: unknown record type in ", fn.s, "!\n");
       close(pass[c].fd);
       job_close(pass[c].j);
       pass[c].id = 0;
       return;
-   }
+  }
 
   pass[c].mpos += line.len;
   return;
 
-  trouble:
-  log3s("warning: trouble opening ",fn.s,"; will try again later\n");
+trouble:
+  log3s("warning: trouble opening ", fn.s, "; will try again later\n");
   pe.dt = recent + SLEEP_SYSFAIL;
-  while (!prioq_insert(&pqchan[c],&pe)) nomem();
+  while (!prioq_insert(&pqchan[c], &pe)) nomem();
 }
 
 void messdone(unsigned long id)
@@ -1063,53 +1153,59 @@ void messdone(unsigned long id)
   struct stat st;
 
   for (c = 0; c < CHANNELS; ++c) {
-    fnmake_chanaddr(id,c);
-    if (stat(fn.s,&st) == 0) return; /* false alarm; consequence of HOPEFULLY */
+    fnmake_chanaddr(id, c);
+    if (stat(fn.s, &st) == 0) return; /* false alarm; consequence of HOPEFULLY */
     if (errno != ENOENT) {
-      log3s("warning: unable to stat ",fn.s,"; will try again later\n");
+      log3s("warning: unable to stat ", fn.s, "; will try again later\n");
       goto FAIL;
     }
   }
 
   fnmake_todo(id);
-  if (stat(fn.s,&st) == 0) return;
+  if (stat(fn.s, &st) == 0) return;
   if (errno != ENOENT) {
-    log3s("warning: unable to stat ",fn.s,"; will try again later\n");
+    log3s("warning: unable to stat ", fn.s, "; will try again later\n");
     goto FAIL;
-   }
- 
+  }
+
   fnmake_info(id);
-  if (stat(fn.s,&st) == -1) {
+  if (stat(fn.s, &st) == -1) {
     if (errno == ENOENT) return;
-    log3s("warning: unable to stat ",fn.s,"; will try again later\n");
+    log3s("warning: unable to stat ", fn.s, "; will try again later\n");
     goto FAIL;
   }
- 
- /* -todo +info -local -remote ?bounce */
-  if (!injectbounce(id))
-    goto FAIL; /* injectbounce() produced error message */
 
-  strnum3[fmt_ulong(strnum3,id)] = 0;
-  log3s("end msg ",strnum3,"\n");
+  /* -todo +info -local -remote ?bounce */
+  if (!injectbounce(id)) goto FAIL; /* injectbounce() produced error message */
+
+  strnum3[fmt_ulong(strnum3, id)] = 0;
+  log3s("end msg ", strnum3, "\n");
 
- /* -todo +info -local -remote -bounce */
+  /* -todo +info -local -remote -bounce */
   fnmake_info(id);
   if (unlink(fn.s) == -1) {
-    log3s("warning: unable to unlink ",fn.s,"; will try again later\n");
+    log3s("warning: unable to unlink ", fn.s, "; will try again later\n");
     goto FAIL;
   }
 
- /* -todo -info -local -remote -bounce; we can relax */
+  /* -todo -info -local -remote -bounce; we can relax */
   fnmake_foop(id);
-  if (buffer_putflush(&toqc,fn.s,fn.len) == -1) { cleandied(); return; }
-  if (buffer_get(&fromqc,&ch,1) != 1) { cleandied(); return; }
-  if (ch != '+') log3s("warning: qmail-clean unable to clean up ",fn.s,"\n");
+  if (buffer_putflush(&toqc, fn.s, fn.len) == -1) {
+    cleandied();
+    return;
+  }
+  if (buffer_get(&fromqc, &ch, 1) != 1) {
+    cleandied();
+    return;
+  }
+  if (ch != '+') log3s("warning: qmail-clean unable to clean up ", fn.s, "\n");
 
   return;
 
-  FAIL:
-  pe.id = id; pe.dt = now() + SLEEP_SYSFAIL;
-  while (!prioq_insert(&pqdone,&pe)) nomem();
+FAIL:
+  pe.id = id;
+  pe.dt = now() + SLEEP_SYSFAIL;
+  while (!prioq_insert(&pqdone, &pe)) nomem();
 }
 
 void pass_do()
@@ -1117,20 +1213,19 @@ void pass_do()
   int c;
   struct prioq_elt pe;
 
-  for (c = 0; c < CHANNELS; ++c) 
-    pass_dochan(c);
+  for (c = 0; c < CHANNELS; ++c) pass_dochan(c);
 
-  if (prioq_min(&pqfail,&pe))
+  if (prioq_min(&pqfail, &pe))
     if (pe.dt <= recent) {
       prioq_delmin(&pqfail);
       pqadd(pe.id);
     }
 
-  if (prioq_min(&pqdone,&pe))
+  if (prioq_min(&pqdone, &pe))
     if (pe.dt <= recent) {
       prioq_delmin(&pqdone);
       messdone(pe.id);
-     }
+    }
 }
 
 
@@ -1142,10 +1237,11 @@ int todofdin;
 int todofdout;
 int flagtodoalive;
 
-void tododied() { 
- log1s("alert: lost connection to qmail-todo ... exiting\n");
- flagexitasap = 1; 
- flagtodoalive = 0;
+void tododied()
+{
+  log1s("alert: lost connection to qmail-todo ... exiting\n");
+  flagexitasap = 1;
+  flagtodoalive = 0;
 }
 
 void todo_init()
@@ -1154,72 +1250,64 @@ void todo_init()
   todofdin = 8;
   flagtodoalive = 1;
   /* sync with external todo */
-  if (write(todofdout,"S",1) != 1) tododied();
-  
+  if (write(todofdout, "S", 1) != 1) tododied();
+
   return;
 }
 
-void todo_selprep(int *nfds,fd_set *rfds,datetime_sec *wakeup)
+void todo_selprep(int *nfds, fd_set *rfds, datetime_sec *wakeup)
 {
   if (flagexitasap) {
     if (flagtodoalive) {
-      write(todofdout,"X",1);
+      write(todofdout, "X", 1);
     }
   }
   if (flagtodoalive) {
-    FD_SET(todofdin,rfds);
-    if (*nfds <= todofdin)
-      *nfds = todofdin + 1;
+    FD_SET(todofdin, rfds);
+    if (*nfds <= todofdin) *nfds = todofdin + 1;
   }
 }
 
-void todo_del(char* s)
+void todo_del(char *s)
 {
- int flagchan[CHANNELS];
- struct prioq_elt pe;
- unsigned long id;
- unsigned int len;
- int c;
-
- for (c = 0; c < CHANNELS; ++c) 
-  flagchan[c] = 0;
-
- switch (*s++) {
-  case 'L':
-    flagchan[0] = 1;
-    break;
-  case 'R':
-    flagchan[1] = 1;
-    break;
-  case 'B':
-    flagchan[0] = 1;
-    flagchan[1] = 1;
-    break;
-  case 'X':
-    break;
-  default:
+  int flagchan[CHANNELS];
+  struct prioq_elt pe;
+  unsigned long id;
+  unsigned int len;
+  int c;
+
+  for (c = 0; c < CHANNELS; ++c) flagchan[c] = 0;
+
+  switch (*s++) {
+    case 'L': flagchan[0] = 1; break;
+    case 'R': flagchan[1] = 1; break;
+    case 'B':
+      flagchan[0] = 1;
+      flagchan[1] = 1;
+      break;
+    case 'X': break;
+    default:  log1s("warning: qmail-send unable to understand qmail-todo\n"); return;
+  }
+
+  len = scan_ulong(s, &id);
+  if (!len || s[len]) {
     log1s("warning: qmail-send unable to understand qmail-todo\n");
     return;
- }
- 
- len = scan_ulong(s,&id);
- if (!len || s[len]) {
-  log1s("warning: qmail-send unable to understand qmail-todo\n");
-  return;
- }
+  }
 
- pe.id = id; pe.dt = now();
- for (c = 0; c < CHANNELS; ++c)
-   if (flagchan[c])
-     while (!prioq_insert(&pqchan[c],&pe)) nomem();
+  pe.id = id;
+  pe.dt = now();
+  for (c = 0; c < CHANNELS; ++c)
+    if (flagchan[c])
+      while (!prioq_insert(&pqchan[c], &pe)) nomem();
 
- for (c = 0; c < CHANNELS; ++c) 
-  if (flagchan[c]) break;
+  for (c = 0; c < CHANNELS; ++c)
+    if (flagchan[c]) break;
 
- if (c == CHANNELS)
-   while (!prioq_insert(&pqdone,&pe)) nomem();
+  if (c == CHANNELS)
+    while (!prioq_insert(&pqdone, &pe)) nomem();
 
- return;
+  return;
 }
 
 void todo_do(fd_set *rfds)
@@ -1227,11 +1315,11 @@ void todo_do(fd_set *rfds)
   int r;
   char ch;
   int i;
-  
+
   if (!flagtodoalive) return;
-  if (!FD_ISSET(todofdin,rfds)) return;
+  if (!FD_ISSET(todofdin, rfds)) return;
 
-  r = read(todofdin,todobuf,sizeof(todobuf));
+  r = read(todofdin, todobuf, sizeof(todobuf));
   if (r == -1) return;
   if (r == 0) {
     if (flagexitasap)
@@ -1243,28 +1331,23 @@ void todo_do(fd_set *rfds)
 
   for (i = 0; i < r; ++i) {
     ch = todobuf[i];
-    while (!stralloc_append(&todoline,&ch)) nomem();
-    if (todoline.len > REPORTMAX)
-      todoline.len = REPORTMAX;
-      /* qmail-todo is responsible for keeping it short */
+    while (!stralloc_append(&todoline, &ch)) nomem();
+    if (todoline.len > REPORTMAX) todoline.len = REPORTMAX;
+    /* qmail-todo is responsible for keeping it short */
     if (!ch && (todoline.len > 1)) {
       switch (todoline.s[0]) {
-	case 'D':
-	  if (flagexitasap) break;
-	  todo_del(todoline.s + 1);
-	  break;
-	case 'L':
-	  log1s(todoline.s + 1);
-	  break;
-	case 'X':
-	  if (flagexitasap)
-	    flagtodoalive = 0;
-	  else
-	    tododied();
-	  break;
-	default:
-	  log1s("warning: qmail-send unable to understand qmail-todo: report mangled\n");
-	  break;
+        case 'D':
+          if (flagexitasap) break;
+          todo_del(todoline.s + 1);
+          break;
+        case 'L': log1s(todoline.s + 1); break;
+        case 'X':
+          if (flagexitasap)
+            flagtodoalive = 0;
+          else
+            tododied();
+          break;
+        default: log1s("warning: qmail-send unable to understand qmail-todo: report mangled\n"); break;
       }
       todoline.len = 0;
     }
@@ -1273,34 +1356,42 @@ void todo_do(fd_set *rfds)
 
 /* this file is too long ---------------------------------------------- MAIN */
 
-int getcontrols() 
-{ 
+int getcontrols()
+{
   if (control_init() == -1) return 0;
-  if (control_readint(&lifetime,"control/queuelifetime") == -1) return 0;
-  if (control_readint(&concurrency[0],"control/concurrencylocal") == -1) return 0;
-  if (control_readint(&concurrency[1],"control/concurrencyremote") == -1) return 0;
-  if (control_rldef(&envnoathost,"control/envnoathost",1,"envnoathost") != 1) return 0;
-  if (control_rldef(&bouncefrom,"control/bouncefrom",0,"MAILER-DAEMON") != 1) return 0;
-  if (control_rldef(&bouncehost,"control/bouncehost",1,"bouncehost") != 1) return 0;
-  if (control_readint(&bouncemaxbytes,"control/bouncemaxbytes") == -1) return 0;   
-  if (control_rldef(&doublebouncehost,"control/doublebouncehost",1,"doublebouncehost") != 1) return 0;
-  if (control_rldef(&doublebounceto,"control/doublebounceto",0,"postmaster") != 1) return 0;
-  if (!stralloc_cats(&doublebounceto,"@")) return 0;
-  if (!stralloc_cat(&doublebounceto,&doublebouncehost)) return 0;
+  if (control_readint(&lifetime, "control/queuelifetime") == -1) return 0;
+  if (control_readint(&concurrency[0], "control/concurrencylocal") == -1) return 0;
+  if (control_readint(&concurrency[1], "control/concurrencyremote") == -1) return 0;
+  if (control_rldef(&envnoathost, "control/envnoathost", 1, "envnoathost") != 1) return 0;
+  if (control_rldef(&bouncefrom, "control/bouncefrom", 0, "MAILER-DAEMON") != 1) return 0;
+  if (control_rldef(&bouncehost, "control/bouncehost", 1, "bouncehost") != 1) return 0;
+  if (control_readint(&bouncemaxbytes, "control/bouncemaxbytes") == -1) return 0;
+  if (control_rldef(&doublebouncehost, "control/doublebouncehost", 1, "doublebouncehost") != 1) return 0;
+  if (control_rldef(&doublebounceto, "control/doublebounceto", 0, "postmaster") != 1) return 0;
+  if (!stralloc_cats(&doublebounceto, "@")) return 0;
+  if (!stralloc_cat(&doublebounceto, &doublebouncehost)) return 0;
   if (!stralloc_0(&doublebounceto)) return 0;
-  if (control_readfile(&locals,"control/locals",1) != 1) return 0;
-  if (!constmap_init(&maplocals,locals.s,locals.len,0)) return 0;
-  switch (control_readfile(&percenthack,"control/percenthack",0)) {
+  if (control_readfile(&locals, "control/locals", 1) != 1) return 0;
+  if (!constmap_init(&maplocals, locals.s, locals.len, 0)) return 0;
+  switch (control_readfile(&percenthack, "control/percenthack", 0)) {
     case -1: return 0;
-    case  0: if (!constmap_init(&mappercenthack,"",0,0)) return 0; break;
-    case  1: if (!constmap_init(&mappercenthack,percenthack.s,percenthack.len,0)) return 0; break;
+    case 0:
+      if (!constmap_init(&mappercenthack, "", 0, 0)) return 0;
+      break;
+    case 1:
+      if (!constmap_init(&mappercenthack, percenthack.s, percenthack.len, 0)) return 0;
+      break;
   }
-  switch (control_readfile(&vdoms,"control/virtualdomains",0)) {
+  switch (control_readfile(&vdoms, "control/virtualdomains", 0)) {
     case -1: return 0;
-    case  0: if (!constmap_init(&mapvdoms,"",0,1)) return 0; break;
-    case  1: if (!constmap_init(&mapvdoms,vdoms.s,vdoms.len,1)) return 0; break;
+    case 0:
+      if (!constmap_init(&mapvdoms, "", 0, 1)) return 0;
+      break;
+    case 1:
+      if (!constmap_init(&mapvdoms, vdoms.s, vdoms.len, 1)) return 0;
+      break;
   }
-  return 1; 
+  return 1;
 }
 
 stralloc newlocals = {0};
@@ -1310,25 +1401,40 @@ void regetcontrols()
 {
   int r;
 
-  if (control_readfile(&newlocals,"control/locals",1) != 1) { log1s("alert: unable to reread control/locals\n"); return; }
-  if (control_readint(&concurrency[0],"control/concurrencylocal") == -1) { log1s("alert: unable to reread control/concurrencylocal\n"); return; }
-  if (control_readint(&concurrency[1],"control/concurrencyremote") == -1) { log1s("alert: unable to reread control/concurrencyremote\n"); return; }
-  if (control_readint(&lifetime,"control/queuelifetime") == -1) { log1s("alert: unable to reread control/queuelifetime\n"); return; }
+  if (control_readfile(&newlocals, "control/locals", 1) != 1) {
+    log1s("alert: unable to reread control/locals\n");
+    return;
+  }
+  if (control_readint(&concurrency[0], "control/concurrencylocal") == -1) {
+    log1s("alert: unable to reread control/concurrencylocal\n");
+    return;
+  }
+  if (control_readint(&concurrency[1], "control/concurrencyremote") == -1) {
+    log1s("alert: unable to reread control/concurrencyremote\n");
+    return;
+  }
+  if (control_readint(&lifetime, "control/queuelifetime") == -1) {
+    log1s("alert: unable to reread control/queuelifetime\n");
+    return;
+  }
 
-  r = control_readfile(&newvdoms,"control/virtualdomains",0);
-  if (r == -1) { log1s("alert: unable to reread control/virtualdomains\n"); return; }
+  r = control_readfile(&newvdoms, "control/virtualdomains", 0);
+  if (r == -1) {
+    log1s("alert: unable to reread control/virtualdomains\n");
+    return;
+  }
 
   constmap_free(&maplocals);
   constmap_free(&mapvdoms);
 
-  while (!stralloc_copy(&locals,&newlocals)) nomem();
-  while (!constmap_init(&maplocals,locals.s,locals.len,0)) nomem();
+  while (!stralloc_copy(&locals, &newlocals)) nomem();
+  while (!constmap_init(&maplocals, locals.s, locals.len, 0)) nomem();
 
   if (r) {
-    while (!stralloc_copy(&vdoms,&newvdoms)) nomem();
-    while (!constmap_init(&mapvdoms,vdoms.s,vdoms.len,1)) nomem();
+    while (!stralloc_copy(&vdoms, &newvdoms)) nomem();
+    while (!constmap_init(&mapvdoms, vdoms.s, vdoms.len, 1)) nomem();
   } else
-    while (!constmap_init(&mapvdoms,"",0,1)) nomem();
+    while (!constmap_init(&mapvdoms, "", 0, 1)) nomem();
 }
 
 void reread()
@@ -1337,7 +1443,7 @@ void reread()
     log1s("alert: unable to reread controls: unable to switch to home directory\n");
     return;
   }
-  write(todofdout,"H",1);
+  write(todofdout, "H", 1);
   regetcontrols();
 
   while (chdir("queue") == -1) {
@@ -1359,9 +1465,18 @@ int main()
   int r;
   char ch;
 
-  if (chdir(auto_qmail) == -1) { log1s("alert: cannot start: unable to switch to home directory\n"); _exit(110); }
-  if (!getcontrols()) { log1s("alert: cannot start: unable to read controls\n"); _exit(111); }
-  if (chdir("queue") == -1) { log1s("alert: cannot start: unable to switch to queue directory\n"); _exit(110); }
+  if (chdir(auto_qmail) == -1) {
+    log1s("alert: cannot start: unable to switch to home directory\n");
+    _exit(110);
+  }
+  if (!getcontrols()) {
+    log1s("alert: cannot start: unable to read controls\n");
+    _exit(111);
+  }
+  if (chdir("queue") == -1) {
+    log1s("alert: cannot start: unable to switch to queue directory\n");
+    _exit(110);
+  }
   sig_pipeignore();
   sig_termcatch(sigterm);
   sig_alarmcatch(sigalrm);
@@ -1370,18 +1485,26 @@ int main()
   umask(077);
 
   fd = open_write("lock/sendmutex");
-  if (fd == -1) { log1s("alert: cannot start: unable to open mutex\n"); _exit(111); }
-  if (lock_exnb(fd) == -1) { log1s("alert: cannot start: qmail-send is already running\n"); _exit(111); }
+  if (fd == -1) {
+    log1s("alert: cannot start: unable to open mutex\n");
+    _exit(111);
+  }
+  if (lock_exnb(fd) == -1) {
+    log1s("alert: cannot start: qmail-send is already running\n");
+    _exit(111);
+  }
 
   numjobs = 0;
-  for (c = 0;c < CHANNELS;++c) {
-    do
-      r = read(chanfdin[c],&ch,1);
+  for (c = 0; c < CHANNELS; ++c) {
+    do r = read(chanfdin[c], &ch, 1);
 
     while ((r == -1) && (errno == EINTR));
-    if (r < 1) { log1s("alert: cannot start: hath the daemon spawn no fire?\n"); _exit(111); }
+    if (r < 1) {
+      log1s("alert: cannot start: hath the daemon spawn no fire?\n");
+      _exit(111);
+    }
 
-    u = (unsigned int) (unsigned char) ch;
+    u = (unsigned int)(unsigned char)ch;
     if (concurrency[c] > u) concurrency[c] = u;
     numjobs += concurrency[c];
   }
@@ -1400,25 +1523,33 @@ int main()
   while (!flagexitasap || !del_canexit() || flagtodoalive) {
     recent = now();
 
-    if (flagrunasap) { flagrunasap = 0; pqrun(); }
-    if (flagreadasap) { flagreadasap = 0; reread(); }
+    if (flagrunasap) {
+      flagrunasap = 0;
+      pqrun();
+    }
+    if (flagreadasap) {
+      flagreadasap = 0;
+      reread();
+    }
 
     wakeup = recent + SLEEP_FOREVER;
     FD_ZERO(&rfds);
     FD_ZERO(&wfds);
     nfds = 1;
 
-    comm_selprep(&nfds,&wfds);
-    del_selprep(&nfds,&rfds);
+    comm_selprep(&nfds, &wfds);
+    del_selprep(&nfds, &rfds);
     pass_selprep(&wakeup);
-    todo_selprep(&nfds,&rfds,&wakeup);
+    todo_selprep(&nfds, &rfds, &wakeup);
     cleanup_selprep(&wakeup);
 
-    if (wakeup <= recent) tv.tv_sec = 0;
-    else tv.tv_sec = wakeup - recent + SLEEP_FUZZ;
+    if (wakeup <= recent)
+      tv.tv_sec = 0;
+    else
+      tv.tv_sec = wakeup - recent + SLEEP_FUZZ;
     tv.tv_usec = 0;
 
-    if (select(nfds,&rfds,&wfds,(fd_set *) 0,&tv) == -1)
+    if (select(nfds, &rfds, &wfds, (fd_set *)0, &tv) == -1)
       if (errno == EINTR)
         ;
       else
@@ -1433,7 +1564,7 @@ int main()
       cleanup_do();
     }
   }
- 
+
   pqfinish();
   log1s("status: exiting\n");
   _exit(0);