From: Philip Hazel <ph10@hermes.cam.ac.uk>
Date: Wed, 27 Apr 2005 10:06:00 +0000 (+0000)
Subject: Quota values can be followed by G as well as K and M.
X-Git-Tag: exim-4_51~11
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=be22d70ed94d35cf07966eac6fd9032be4f6abab;p=exim.git

Quota values can be followed by G as well as K and M.
---

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 0470f493b..e8884a29f 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.124 2005/04/27 10:00:18 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.125 2005/04/27 10:06:00 ph10 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -237,6 +237,8 @@ PH/38 Installed a patch from Ian Freislich, with the agreement of Tom Kistner.
       spam.[ch] uses a 3600 second timeout on spamd socket reads, further, it
       blindly assumes that writes won't block so it may never time out."
 
+PH/39 Allow G after quota size as well as K and M.
+
 
 A note about Exim versions 4.44 and 4.50
 ----------------------------------------
diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index 16f494bb9..f2e4006b7 100644
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/NewStuff,v 1.35 2005/04/06 14:40:23 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/NewStuff,v 1.36 2005/04/27 10:06:00 ph10 Exp $
 
 New Features in Exim
 --------------------
@@ -147,6 +147,8 @@ PH/08 The redirect router has two new options, sieve_useraddress and
       entire original local part (including any prefix or suffix) is used for
       :user. An unset subaddress is treated as an empty subaddress.
 
+PH/09 Quota values can be followed by G as well as K and M.
+
 
 Version 4.50
 ------------
diff --git a/src/src/transports/appendfile.c b/src/src/transports/appendfile.c
index 27e87cf0b..43575d15b 100644
--- a/src/src/transports/appendfile.c
+++ b/src/src/transports/appendfile.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/transports/appendfile.c,v 1.5 2005/02/17 11:58:27 ph10 Exp $ */
+/* $Cambridge: exim/src/src/transports/appendfile.c,v 1.6 2005/04/27 10:06:00 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -286,12 +286,13 @@ for (i = 0; i < 5; i++)
 
     d = Ustrtod(s, &rest);
 
-    /* Handle following characters K, M, %, the latter being permitted
+    /* Handle following characters K, M, G, %, the latter being permitted
     for quota_warn_threshold only. A threshold with no quota setting is
     just ignored. */
 
     if (tolower(*rest) == 'k') { d *= 1024.0; rest++; }
     else if (tolower(*rest) == 'm') { d *= 1024.0*1024.0; rest++; }
+    else if (tolower(*rest) == 'g') { d *= 1024.0*1024.0*1024.0; rest++; }
     else if (*rest == '%' && i == 2)
       {
       if (ob->quota_value <= 0 && !ob->maildir_use_size_file) d = 0;