ph10 2005/08/23 09:46:33 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src ACKNOWLEDGMENTS
exim-src/src expand.c
Log:
Add % operator to ${eval expansion.
Revision Changes Path
1.209 +2 -0 exim/exim-doc/doc-txt/ChangeLog
1.32 +2 -1 exim/exim-src/ACKNOWLEDGMENTS
1.41 +4 -2 exim/exim-src/src/expand.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- ChangeLog 22 Aug 2005 15:28:20 -0000 1.208
+++ ChangeLog 23 Aug 2005 08:46:33 -0000 1.209
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.208 2005/08/22 15:28:20 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.209 2005/08/23 08:46:33 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -111,6 +111,8 @@
commands, but it was not correctly comparing the address with the actual
client host address. Thus, it would show the EHLO address in Received:
header lines when this was not necessary.
+
+PH/27 Added the % operator to ${eval:}.
Exim version 4.52
Index: ACKNOWLEDGMENTS
===================================================================
RCS file: /home/cvs/exim/exim-src/ACKNOWLEDGMENTS,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ACKNOWLEDGMENTS 22 Aug 2005 10:49:04 -0000 1.31
+++ ACKNOWLEDGMENTS 23 Aug 2005 08:46:33 -0000 1.32
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.31 2005/08/22 10:49:04 ph10 Exp $
+$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.32 2005/08/23 08:46:33 ph10 Exp $
EXIM ACKNOWLEDGEMENTS
@@ -20,7 +20,7 @@
Philip Hazel
Lists created: 20 November 2002
-Last updated: 29 July 2005
+Last updated: 23 August 2005
THE OLD LIST
@@ -151,6 +151,7 @@
HMAC computations
Better error messages for BDB
Sheldon Hearn Suggested patch for smtp_accept_max_nonmail_hosts
+Jakob Hirsch Patch for % operator
Kjetil Torgrim Homme Patch for require_files problem on NFS file systems
Tom Hughes Suggested patch for $n bug in pipe command from filter
Pierre Humblet Continued Cygwin support
Index: expand.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/expand.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- expand.c 8 Aug 2005 09:57:29 -0000 1.40
+++ expand.c 23 Aug 2005 08:46:33 -0000 1.41
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/expand.c,v 1.40 2005/08/08 09:57:29 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/expand.c,v 1.41 2005/08/23 08:46:33 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -2749,12 +2749,14 @@
int x = eval_term(&s, decimal, error);
if (*error == NULL)
{
- while (*s == '*' || *s == '/')
+ while (*s == '*' || *s == '/' || *s == '%')
{
int op = *s++;
int y = eval_term(&s, decimal, error);
if (*error != NULL) break;
- if (op == '*') x *= y; else x /= y;
+ if (op == '*') x *= y;
+ else if (op == '/') x /= y;
+ else x %= y;
}
}
*sptr = s;
