src.quota-no-check
changeset 24 053ea8d7305d
parent 22 aab32b922fa2
child 25 9b0dcedaddc2
--- 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;