[exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog NewSt…

Pàgina inicial
Delete this message
Reply to this message
Autor: Philip Hazel
Data:  
A: exim-cvs
Assumpte: [exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog NewStuff exim/exim-src/src string.c exim/exim-test/confs 0002 exim/exim-test/scripts/0000-Basic 0002 exim/exim-test/stderr 0002 exim/exim-test
ph10 2007/02/26 14:07:05 GMT

  Modified files:
    exim-doc/doc-txt     ChangeLog NewStuff 
    exim-src/src         string.c 
    exim-test/confs      0002 
    exim-test/scripts/0000-Basic 0002 
    exim-test/stderr     0002 
    exim-test/stdout     0002 
  Log:
  MH's patch for allowing control characters as list separators.


  Revision  Changes    Path
  1.485     +2 -0      exim/exim-doc/doc-txt/ChangeLog
  1.143     +16 -0     exim/exim-doc/doc-txt/NewStuff
  1.13      +59 -31    exim/exim-src/src/string.c
  1.3       +1 -1      exim/exim-test/confs/0002
  1.13      +9 -0      exim/exim-test/scripts/0000-Basic/0002
  1.4       +4 -2      exim/exim-test/stderr/0002
  1.13      +12 -0     exim/exim-test/stdout/0002


  Index: ChangeLog
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
  retrieving revision 1.484
  retrieving revision 1.485
  diff -u -r1.484 -r1.485
  --- ChangeLog    20 Feb 2007 15:58:02 -0000    1.484
  +++ ChangeLog    26 Feb 2007 14:07:04 -0000    1.485
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.484 2007/02/20 15:58:02 ph10 Exp $
  +$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.485 2007/02/26 14:07:04 ph10 Exp $


   Change log file for Exim from version 4.21
   -------------------------------------------
  @@ -130,6 +130,8 @@
         arrive, invalidly. So now there are extra checks after an ACL has run for
         HELO/EHLO and after the predata ACL, and likewise for MAIL and RCPT when
         pipelining has not been advertised.
  +
  +PH/30 MH's patch to allow iscntrl() characters to be list separators.



Exim version 4.66

  Index: NewStuff
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/NewStuff,v
  retrieving revision 1.142
  retrieving revision 1.143
  diff -u -r1.142 -r1.143
  --- NewStuff    14 Feb 2007 15:33:40 -0000    1.142
  +++ NewStuff    26 Feb 2007 14:07:04 -0000    1.143
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.142 2007/02/14 15:33:40 ph10 Exp $
  +$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.143 2007/02/26 14:07:04 ph10 Exp $


New Features in Exim
--------------------
@@ -374,6 +374,22 @@

         continue  = <some expansion>
         condition = ${if eq{0}{<some expansion>}{true}{true}}
  +
  +18. It is now possible to use newline and other control characters (those with
  +    values less than 32, plus DEL) as separators in lists. Such separators must
  +    be provided literally at the time the list is processed, but the string
  +    expansion that happens first means that you can write them using normal
  +    escape sequences. For example, if a new-line separated list of domains is
  +    generated by a lookup, you can now process it directly by a line such as
  +    this:
  +
  +      domains = <\n ${lookup mysql{.....}}
  +
  +    This avoids having to change the list separator in such data. Unlike
  +    printing character separators, which can be included in list items by
  +    doubling, it is not possible to include a control character as data when it
  +    is set as the separator. Two such characters in succession are interpreted
  +    as enclosing an empty list item.



Version 4.66

  Index: string.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/string.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- string.c    7 Feb 2007 11:24:56 -0000    1.12
  +++ string.c    26 Feb 2007 14:07:04 -0000    1.13
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/string.c,v 1.12 2007/02/07 11:24:56 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/string.c,v 1.13 2007/02/26 14:07:04 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -764,19 +764,26 @@
   /* Leading and trailing space is removed from each item. The separator in the
   list is controlled by the int pointed to by the separator argument as follows:


  -  If its value is > 0 it is used as the delimiter.
  -    (If its value is actually > UCHAR_MAX there is only one item in the list.
  +  If the value is > 0 it is used as the separator. This is typically used for
  +  sublists such as slash-separated options. The value is always a printing
  +  character.
  +
  +    (If the value is actually > UCHAR_MAX there is only one item in the list.
       This is used for some cases when called via functions that sometimes
       plough through lists, and sometimes are given single items.)
  -  If its value is <= 0, the string is inspected for a leading <x, where
  -    x is an ispunct() value. If found, it is used as the delimiter. If not
  -    found: (a) if separator == 0, ':' is used
  -           (b) if separator <0, then -separator is used
  -    In all cases the value of the separator that is used is written back to
  -      the int so that it is used on subsequent calls as we progress through
  -      the list.


  -The separator can always be represented in the string by doubling.
  +  If the value is <= 0, the string is inspected for a leading <x, where x is an
  +  ispunct() or an iscntrl() character. If found, x is used as the separator. If
  +  not found:
  +
  +      (a) if separator == 0, ':' is used
  +      (b) if separator <0, -separator is used
  +
  +  In all cases the value of the separator that is used is written back to the
  +  int so that it is used on subsequent calls as we progress through the list.
  +
  +A literal ispunct() separator can be represented in an item by doubling, but
  +there is no way to include an iscntrl() separator as part of the data.


   Arguments:
     listptr    points to a pointer to the current start of the list; the
  @@ -793,20 +800,28 @@
   uschar *
   string_nextinlist(uschar **listptr, int *separator, uschar *buffer, int buflen)
   {
  -register int p = 0;
   register int sep = *separator;
   register uschar *s = *listptr;
  +BOOL sep_is_special;


if (s == NULL) return NULL;
-while (isspace(*s)) s++;
+
+/* This allows for a fixed specified separator to be an iscntrl() character,
+but at the time of implementation, this is never the case. However, it's best
+to be conservative. */
+
+while (isspace(*s) && *s != sep) s++;
+
+/* A change of separator is permitted, so look for a leading '<' followed by an
+allowed character. */

   if (sep <= 0)
     {
  -  if (*s == '<' && ispunct(s[1]))
  +  if (*s == '<' && (ispunct(s[1]) || iscntrl(s[1])))
       {
       sep = s[1];
       s += 2;
  -    while (isspace(*s)) s++;
  +    while (isspace(*s) && *s != sep) s++;
       }
     else
       {
  @@ -815,15 +830,22 @@
     *separator = sep;
     }


+/* An empty string has no list elements */
+
if (*s == 0) return NULL;

+/* Note whether whether or not the separator is an iscntrl() character. */
+
+sep_is_special = iscntrl(sep);
+
/* Handle the case when a buffer is provided. */

   if (buffer != NULL)
     {
  +  register int p = 0;
     for (; *s != 0; s++)
       {
  -    if (*s == sep && *(++s) != sep) break;
  +    if (*s == sep && (*(++s) != sep || sep_is_special)) break;
       if (p < buflen - 1) buffer[p++] = *s;
       }
     while (p > 0 && isspace(buffer[p-1])) p--;
  @@ -834,31 +856,37 @@


   else
     {
  +  int size = 0;
  +  int ptr = 0;
  +  uschar *ss;
  +
     /* We know that *s != 0 at this point. However, it might be pointing to a
  -  separator, which could indicate an empty string, or could be doubled to
  -  indicate a separator character as data at the start of a string. */
  +  separator, which could indicate an empty string, or (if an ispunct()
  +  character) could be doubled to indicate a separator character as data at the
  +  start of a string. Avoid getting working memory for an empty item. */


     if (*s == sep)
       {
       s++;
  -    if (*s != sep) buffer = string_copy(US"");
  +    if (*s != sep || sep_is_special)
  +      {
  +      *listptr = s;
  +      return string_copy(US"");
  +      }
       }


  -  if (buffer == NULL)
  +  /* Not an empty string; the first character is guaranteed to be a data
  +  character. */
  +
  +  for (;;)
       {
  -    int size = 0;
  -    int ptr = 0;
  -    uschar *ss;
  -    for (;;)
  -      {
  -      for (ss = s + 1; *ss != 0 && *ss != sep; ss++);
  -      buffer = string_cat(buffer, &size, &ptr, s, ss-s);
  -      s = ss;
  -      if (*s == 0 || *(++s) != sep) break;
  -      }
  -    while (ptr > 0 && isspace(buffer[ptr-1])) ptr--;
  -    buffer[ptr] = 0;
  +    for (ss = s + 1; *ss != 0 && *ss != sep; ss++);
  +    buffer = string_cat(buffer, &size, &ptr, s, ss-s);
  +    s = ss;
  +    if (*s == 0 || *(++s) != sep || sep_is_special) break;
       }
  +  while (ptr > 0 && isspace(buffer[ptr-1])) ptr--;
  +  buffer[ptr] = 0;
     }


/* Update the current pointer and return the new string */

  Index: 0002
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/confs/0002,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 0002    10 Feb 2006 14:25:43 -0000    1.2
  +++ 0002    26 Feb 2007 14:07:04 -0000    1.3
  @@ -33,7 +33,7 @@
     accept


connect1:
- deny hosts = partial-lsearch;DIR/aux-fixed/0002.lsearch
+ deny hosts = <\n partial-lsearch;DIR/aux-fixed/0002.lsearch \n 1.2.3.4

   connect2:
     deny  hosts = net-lsearch;DIR/aux-fixed/0002.lsearch


  Index: 0002
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/scripts/0000-Basic/0002,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- 0002    14 Feb 2007 14:59:02 -0000    1.12
  +++ 0002    26 Feb 2007 14:07:04 -0000    1.13
  @@ -59,6 +59,15 @@
   reduce: ${reduce {<, 1,2,3}{0}{${eval:$value+$item}}}
   reduce: ${reduce {3:0:9:4:6}{0}{${if >{$item}{$value}{$item}{$value}}}}


+# Tests with iscntrl() and illegal separators
+
+map: ${map{<\n a\n\nb\nc}{'$item'}}
+
+reduce: ${reduce {<n 1\n2\n3}{0}{${eval:$value+$item}}}
+reduce: ${reduce {<\n 1\n2\n3}{0}{${eval:$value+$item}}}
+reduce: ${reduce { <\n 1\n 2 \n 3 }{0}{${eval:$value+$item}}}
+reduce: ${reduce {<\x7f 1\x7f2\177 3}{0}{${eval:$value+$item}}}
+
# Operators

addrss: ${address:local-part@???}

  Index: 0002
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0002,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 0002    8 Mar 2006 10:49:18 -0000    1.3
  +++ 0002    26 Feb 2007 14:07:04 -0000    1.4
  @@ -154,7 +154,7 @@
   host in helo_accept_junk_hosts? no (option unset)
   using ACL "connect1"
   processing "deny"
  -check hosts = partial-lsearch;TESTSUITE/aux-fixed/0002.lsearch
  +check hosts = <\n partial-lsearch;TESTSUITE/aux-fixed/0002.lsearch \n 1.2.3.4
   sender host name required, to match against partial-lsearch;TESTSUITE/aux-fixed/0002.lsearch
   looking up host name for V4NET.0.0.1
   DNS lookup of 1.0.0.V4NET.in-addr.arpa (PTR) using fakens
  @@ -181,7 +181,9 @@
   file lookup required for ten-1.test.ex
     in TESTSUITE/aux-fixed/0002.lsearch
   lookup yielded: 
  -host in "partial-lsearch;TESTSUITE/aux-fixed/0002.lsearch"? yes (matched "partial-lsearch;TESTSUITE/aux-fixed/0002.lsearch")
  +host in "<
  + partial-lsearch;TESTSUITE/aux-fixed/0002.lsearch 
  + 1.2.3.4"? yes (matched "partial-lsearch;TESTSUITE/aux-fixed/0002.lsearch")
   deny: condition test succeeded
   SMTP>> 550 Administrative prohibition
   LOG: MAIN REJECT


  Index: 0002
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0002,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- 0002    14 Feb 2007 14:59:02 -0000    1.12
  +++ 0002    26 Feb 2007 14:07:04 -0000    1.13
  @@ -49,6 +49,18 @@
   > reduce: 6
   > reduce: 9

>
+> # Tests with iscntrl() and illegal separators
+>
+> map: 'a'
+''
+'b'
+'c'
+>
+> Failed: error in expression evaluation: expecting number or opening parenthesis (after processing "0+") inside "reduce" item
+> reduce: 6
+> reduce: 6
+> reduce: 6
+>
> # Operators
>
> addrss: local-part@???