# HG changeset patch
# User Heiko Schlittermann (I24) <hs@schlittermann.de>
# Date 1302690203 -7200
# Node ID 053ea8d7305d26e2524160b126c3b43c470d8cdf
# Parent  d9d5bb696645a8c081e4e6a1cf35636c056a3959
changed the order - moved the quota-no-check more to the top of the patches

diff -r d9d5bb696645 -r 053ea8d7305d series
--- a/series	Thu Apr 07 16:15:57 2011 +0200
+++ b/series	Wed Apr 13 12:23:23 2011 +0200
@@ -3,6 +3,6 @@
 src.bail-out-on-BOM #+4.74
 src.maildir_use_size_file #+4.74
 src.fixed_ensure_maildirsize #+4.74
+src.quota-no-check #+4.74
 src.lock_maildirsize #+4.74
-src.quota-no-check #+4.74
 src.overquota #+4.74
diff -r d9d5bb696645 -r 053ea8d7305d src.lock_maildirsize
--- a/src.lock_maildirsize	Thu Apr 07 16:15:57 2011 +0200
+++ b/src.lock_maildirsize	Wed Apr 13 12:23:23 2011 +0200
@@ -1,9 +1,9 @@
 # HG changeset patch
-# Parent 3cbad740cf65b90cb75768c7784ac22a8ee7622d
+# Parent 725ab374f90553e848d1c418c11003dab45ec07c
 
-diff -r 3cbad740cf65 src/transports/appendfile.c
---- a/src/transports/appendfile.c	Fri Apr 01 14:06:51 2011 +0200
-+++ b/src/transports/appendfile.c	Fri Apr 01 14:06:51 2011 +0200
+diff -r 725ab374f905 src/transports/appendfile.c
+--- a/src/transports/appendfile.c	Wed Apr 13 12:08:31 2011 +0200
++++ b/src/transports/appendfile.c	Wed Apr 13 12:08:39 2011 +0200
 @@ -13,6 +13,7 @@
  
  #ifdef SUPPORT_MAILDIR
@@ -12,8 +12,8 @@
  #endif
  
  
-@@ -239,6 +240,30 @@
-   TRUE            /* quota_is_inclusive */
+@@ -241,6 +242,30 @@
+   FALSE           /* quota_filecount_no_check */
  };
  
 +void hs12_lock(int fd, int type, const char* msg)
@@ -43,7 +43,7 @@
  
  
  /*************************************************
-@@ -278,8 +303,8 @@
+@@ -280,8 +305,8 @@
  gid = gid;
  
  if (ob->expand_maildir_use_size_file)
@@ -54,7 +54,7 @@
  
  /* Loop for quota, quota_filecount, quota_warn_threshold, mailbox_size,
  mailbox_filecount */
-@@ -841,7 +866,7 @@
+@@ -855,7 +880,7 @@
                sigalrm_seen set if there has been a timeout
  */
  
@@ -63,7 +63,7 @@
  apply_lock(int fd, int fcntltype, BOOL dofcntl, int fcntltime, BOOL doflock,
      int flocktime)
  {
-@@ -887,7 +912,6 @@
+@@ -901,7 +926,6 @@
  
  
  
@@ -71,7 +71,7 @@
  #ifdef SUPPORT_MBX
  /*************************************************
  *         Copy message into MBX mailbox          *
-@@ -2417,18 +2441,19 @@
+@@ -2433,18 +2457,19 @@
        {
        off_t size;
        int filecount;
@@ -94,7 +94,7 @@
        if (mailbox_size < 0) mailbox_size = size;
        if (mailbox_filecount < 0) mailbox_filecount = filecount;
        }
-@@ -3125,6 +3150,12 @@
+@@ -3154,6 +3179,12 @@
        uschar *renamename = newname;
        fd = -1;
  
@@ -107,7 +107,7 @@
        DEBUG(D_transport) debug_printf("renaming temporary file\n");
  
        /* If there is no rename name set, we are in a non-maildir, non-mailstore
-@@ -3245,6 +3276,7 @@
+@@ -3274,6 +3305,7 @@
            filename = dataname = NULL;   /* Prevents attempt to unlink at end */
            }
          }        /* maildir or mailstore */
@@ -115,7 +115,7 @@
        }          /* successful write + close */
      }            /* isdirectory */
    }              /* write success */
-@@ -3280,6 +3312,11 @@
+@@ -3309,6 +3341,11 @@
  detected, in order to get the file closed and the lock file tidied away. */
  
  RETURN:
@@ -127,10 +127,10 @@
  
  #ifdef SUPPORT_MBX
  if (mbx_lockfd >= 0)
-diff -r 3cbad740cf65 src/transports/appendfile.h
---- a/src/transports/appendfile.h	Fri Apr 01 14:06:51 2011 +0200
-+++ b/src/transports/appendfile.h	Fri Apr 01 14:06:51 2011 +0200
-@@ -95,5 +95,8 @@
+diff -r 725ab374f905 src/transports/appendfile.h
+--- a/src/transports/appendfile.h	Wed Apr 13 12:08:31 2011 +0200
++++ b/src/transports/appendfile.h	Wed Apr 13 12:08:39 2011 +0200
+@@ -97,5 +97,8 @@
  /* Function that is shared with tf_maildir.c */
  
  extern off_t  check_dir_size(uschar *, int *, const pcre *);
@@ -139,9 +139,9 @@
 +
  
  /* End of transports/appendfile.h */
-diff -r 3cbad740cf65 src/transports/tf_maildir.c
---- a/src/transports/tf_maildir.c	Fri Apr 01 14:06:51 2011 +0200
-+++ b/src/transports/tf_maildir.c	Fri Apr 01 14:06:51 2011 +0200
+diff -r 725ab374f905 src/transports/tf_maildir.c
+--- a/src/transports/tf_maildir.c	Wed Apr 13 12:08:31 2011 +0200
++++ b/src/transports/tf_maildir.c	Wed Apr 13 12:08:39 2011 +0200
 @@ -367,13 +367,16 @@
  
  Returns:           >=0  a file descriptor for an open maildirsize file
@@ -248,9 +248,9 @@
  DEBUG(D_transport) debug_printf("returning maildir size=" OFF_T_FMT
    " filecount=%d\n", size, filecount);
  *returned_size = size;
-diff -r 3cbad740cf65 src/transports/tf_maildir.h
---- a/src/transports/tf_maildir.h	Fri Apr 01 14:06:51 2011 +0200
-+++ b/src/transports/tf_maildir.h	Fri Apr 01 14:06:51 2011 +0200
+diff -r 725ab374f905 src/transports/tf_maildir.h
+--- a/src/transports/tf_maildir.h	Wed Apr 13 12:08:31 2011 +0200
++++ b/src/transports/tf_maildir.h	Wed Apr 13 12:08:39 2011 +0200
 @@ -16,7 +16,7 @@
                  uschar *);
  extern int    maildir_ensure_sizefile(uschar *,
diff -r d9d5bb696645 -r 053ea8d7305d src.quota-no-check
--- a/src.quota-no-check	Thu Apr 07 16:15:57 2011 +0200
+++ b/src.quota-no-check	Wed Apr 13 12:23:23 2011 +0200
@@ -1,9 +1,9 @@
 # HG changeset patch
-# Parent 4b02e3191467ca0f3dbad9fd5ed1a8e5e61d3f0a
+# Parent 124a35dbf1399ba64efa3391306e18d9971d3d8b
 
-diff -r 4b02e3191467 doc/spec.txt
---- a/doc/spec.txt	Fri Apr 01 16:36:30 2011 +0200
-+++ b/doc/spec.txt	Thu Apr 07 15:38:24 2011 +0200
+diff -r 124a35dbf139 doc/spec.txt
+--- a/doc/spec.txt	Wed Apr 13 12:08:14 2011 +0200
++++ b/doc/spec.txt	Wed Apr 13 12:08:31 2011 +0200
 @@ -18340,6 +18340,9 @@
  large file support (Linux and FreeBSD have this), mailboxes larger than 2G can
  be handled.
@@ -24,10 +24,10 @@
  +--------------------------------------------------------------+
  |quota_is_inclusive|Use: appendfile|Type: boolean|Default: true|
  +--------------------------------------------------------------+
-diff -r 4b02e3191467 src/transports/appendfile.c
---- a/src/transports/appendfile.c	Fri Apr 01 16:36:30 2011 +0200
-+++ b/src/transports/appendfile.c	Thu Apr 07 15:38:24 2011 +0200
-@@ -237,7 +237,9 @@
+diff -r 124a35dbf139 src/transports/appendfile.c
+--- a/src/transports/appendfile.c	Wed Apr 13 12:08:14 2011 +0200
++++ b/src/transports/appendfile.c	Wed Apr 13 12:08:31 2011 +0200
+@@ -236,7 +236,9 @@
    FALSE,          /* mailstore_format */
    FALSE,          /* mbx_format */
    FALSE,          /* quota_warn_threshold_is_percent */
@@ -37,8 +37,8 @@
 +  FALSE           /* quota_filecount_no_check */
  };
  
- void hs12_lock(int fd, int type, const char* msg)
-@@ -312,6 +314,7 @@
+ 
+@@ -287,6 +289,7 @@
  for (i = 0; i < 5; i++)
    {
    double d;
@@ -46,7 +46,7 @@
    uschar *which = NULL;
  
    if (q == NULL) d = default_value; else
-@@ -348,12 +351,21 @@
+@@ -323,12 +326,21 @@
        rest++;
        }
  
@@ -69,7 +69,7 @@
        return FAIL;
        }
      }
-@@ -365,12 +377,14 @@
+@@ -340,12 +352,14 @@
      case 0:
      if (d >= 2.0*1024.0*1024.0*1024.0 && sizeof(off_t) <= 4) which = US"quota";
      ob->quota_value = (off_t)d;
@@ -84,7 +84,7 @@
      q = ob->quota_warn_threshold;
      break;
  
-@@ -1406,10 +1420,12 @@
+@@ -1382,10 +1396,12 @@
  DEBUG(D_transport)
    {
    debug_printf("appendfile: mode=%o notify_comsat=%d quota=" OFF_T_FMT
@@ -97,7 +97,7 @@
      ob->quota_warn_threshold_value,
      ob->quota_warn_threshold_is_percent? "%" : "",
      isdirectory? "directory" : "file",
-@@ -2773,18 +2789,31 @@
+@@ -2748,18 +2764,31 @@
      }
    if (mailbox_size + (ob->quota_is_inclusive? message_size:0) > ob->quota_value)
      {
@@ -139,9 +139,9 @@
      }
    }
  
-diff -r 4b02e3191467 src/transports/appendfile.h
---- a/src/transports/appendfile.h	Fri Apr 01 16:36:30 2011 +0200
-+++ b/src/transports/appendfile.h	Thu Apr 07 15:38:24 2011 +0200
+diff -r 124a35dbf139 src/transports/appendfile.h
+--- a/src/transports/appendfile.h	Wed Apr 13 12:08:14 2011 +0200
++++ b/src/transports/appendfile.h	Wed Apr 13 12:08:31 2011 +0200
 @@ -72,6 +72,8 @@
    BOOL  mbx_format;
    BOOL  quota_warn_threshold_is_percent;