ph10 2005/09/28 11:46:48 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src expand.c globals.c
Log:
Make ${base62d: adjust for BASE_62, as ${base62: does.
Revision Changes Path
1.241 +8 -0 exim/exim-doc/doc-txt/ChangeLog
1.43 +5 -2 exim/exim-src/src/expand.c
1.39 +6 -0 exim/exim-src/src/globals.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- ChangeLog 26 Sep 2005 09:52:18 -0000 1.240
+++ ChangeLog 28 Sep 2005 10:46:48 -0000 1.241
@@ -1,7 +1,15 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.240 2005/09/26 09:52:18 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.241 2005/09/28 10:46:48 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
+
+Exim version 4.54
+-----------------
+
+PH/01 The ${base62: operator adjusted itself to base 36 when BASE_62 was
+ set to 36 (for Darwin and Cygwin), but the ${base62d: operator did not.
+ It now does.
+
Exim version 4.53
-----------------
Index: expand.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/expand.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- expand.c 13 Sep 2005 11:13:27 -0000 1.42
+++ expand.c 28 Sep 2005 10:46:48 -0000 1.43
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/expand.c,v 1.42 2005/09/13 11:13:27 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/expand.c,v 1.43 2005/09/28 10:46:48 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -4358,6 +4358,8 @@
continue;
}
+ /* Note that for Darwin and Cygwin, BASE_62 actually has the value 36 */
+
case EOP_BASE62D:
{
uschar buf[16];
@@ -4369,10 +4371,11 @@
if (t == NULL)
{
expand_string_message = string_sprintf("argument for base62d "
- "operator is \"%s\", which is not a base 62 number", sub);
+ "operator is \"%s\", which is not a base %d number", sub,
+ BASE_62);
goto EXPAND_FAILED;
}
- n = n * 62 + (t - base62_chars);
+ n = n * BASE_62 + (t - base62_chars);
}
(void)sprintf(CS buf, "%ld", n);
yield = string_cat(yield, &size, &ptr, buf, Ustrlen(buf));
Index: globals.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/globals.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- globals.c 13 Sep 2005 11:13:27 -0000 1.38
+++ globals.c 28 Sep 2005 10:46:48 -0000 1.39
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/globals.c,v 1.38 2005/09/13 11:13:27 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/globals.c,v 1.39 2005/09/28 10:46:48 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -333,8 +333,14 @@
#endif
BOOL background_daemon = TRUE;
+
+#if BASE_62 == 62
uschar *base62_chars=
US"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+#else
+uschar *base62_chars= US"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+#endif
+
uschar *bi_command = NULL;
uschar *big_buffer = NULL;
int big_buffer_size = BIG_BUFFER_SIZE;
