ph10 2005/04/27 11:06:00 BST
Modified files:
exim-doc/doc-txt ChangeLog NewStuff
exim-src/src/transports appendfile.c
Log:
Quota values can be followed by G as well as K and M.
Revision Changes Path
1.125 +2 -0 exim/exim-doc/doc-txt/ChangeLog
1.36 +2 -0 exim/exim-doc/doc-txt/NewStuff
1.6 +2 -1 exim/exim-src/src/transports/appendfile.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- ChangeLog 27 Apr 2005 10:00:18 -0000 1.124
+++ ChangeLog 27 Apr 2005 10:06:00 -0000 1.125
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.124 2005/04/27 10:00:18 ph10 Exp $
+$Cambridge: exim/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
-------------------------------------------
@@ -236,6 +236,8 @@
connection it has accepted, or it never writes response data. The exiscan
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
Index: NewStuff
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/NewStuff,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- NewStuff 6 Apr 2005 14:40:23 -0000 1.35
+++ NewStuff 27 Apr 2005 10:06:00 -0000 1.36
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.35 2005/04/06 14:40:23 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.36 2005/04/27 10:06:00 ph10 Exp $
New Features in Exim
--------------------
@@ -146,6 +146,8 @@
However, when a Sieve filter is run, if sieve_useraddress is unset, the
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
Index: appendfile.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/transports/appendfile.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- appendfile.c 17 Feb 2005 11:58:27 -0000 1.5
+++ appendfile.c 27 Apr 2005 10:06:00 -0000 1.6
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/transports/appendfile.c,v 1.5 2005/02/17 11:58:27 ph10 Exp $ */
+/* $Cambridge: exim/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 @@
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;
