qmail/qmail-1.03-queuevar.patch

   1 diff -u --new-file qmail-1.03.orig/Makefile qmail-1.03/Makefile
   2 --- qmail-1.03.orig/Makefile    2005-07-05 14:54:32.069579216 -0300
   3 +++ qmail-1.03/Makefile 2005-07-05 14:54:51.955681101 -0300
   4 @@ -1458,12 +1458,12 @@
   5  trigger.o fmtqfn.o quote.o now.o readsubdir.o qmail.o date822fmt.o \
   6  datetime.a case.a ndelay.a getln.a wait.a seek.a fd.a sig.a open.a \
   7  lock.a stralloc.a alloc.a substdio.a error.a str.a fs.a auto_qmail.o \
   8 -auto_split.o
   9 +auto_split.o env.a
  10         ./load qmail-send qsutil.o control.o constmap.o newfield.o \
  11         prioq.o trigger.o fmtqfn.o quote.o now.o readsubdir.o \
  12         qmail.o date822fmt.o datetime.a case.a ndelay.a getln.a \
  13         wait.a seek.a fd.a sig.a open.a lock.a stralloc.a alloc.a \
  14 -       substdio.a error.a str.a fs.a auto_qmail.o auto_split.o
  15 +       substdio.a error.a str.a fs.a auto_qmail.o auto_split.o env.a
  16
  17  qmail-send.0: \
  18  qmail-send.8
  19 Common subdirectories: qmail-1.03.orig/qmail-rhinit and qmail-1.03/qmail-rhinit
  20 diff -u --new-file qmail-1.03.orig/qmail.c qmail-1.03/qmail.c
  21 --- qmail-1.03.orig/qmail.c     2005-07-05 14:54:32.085575276 -0300
  22 +++ qmail-1.03/qmail.c  2005-07-05 14:54:51.960679870 -0300
  23 @@ -6,8 +6,17 @@
  24  #include "fd.h"
  25  #include "qmail.h"
  26  #include "auto_qmail.h"
  27 +#include "env.h"
  28
  29 -static char *binqqargs[2] = { "bin/qmail-queue", 0 } ;
  30 +static char *binqqargs[2] = { 0, 0 } ;
  31 +
  32 +static void setup_qqargs()
  33 +{
  34 +  if(!binqqargs[0])
  35 +    binqqargs[0] = env_get("QMAILQUEUE");
  36 +  if(!binqqargs[0])
  37 +    binqqargs[0] = "bin/qmail-queue";
  38 +}
  39
  40  int qmail_open(qq)
  41  struct qmail *qq;
  42 @@ -15,6 +24,8 @@
  43    int pim[2];
  44    int pie[2];
  45
  46 +  setup_qqargs();
  47 +
  48    if (pipe(pim) == -1) return -1;
  49    if (pipe(pie) == -1) { close(pim[0]); close(pim[1]); return -1; }
  50