[exim-cvs] cvs commit: exim/exim-src/src expand.c

Page principale
Supprimer ce message
Répondre à ce message
Auteur: Philip Hazel
Date:  
À: exim-cvs
Sujet: [exim-cvs] cvs commit: exim/exim-src/src expand.c
ph10 2005/12/12 12:05:08 GMT

  Modified files:
    exim-src/src         expand.c 
  Log:
  Previous patch for $reply_address was incomplete and wrong. This fixes
  it.


  Revision  Changes    Path
  1.50      +3 -0      exim/exim-src/src/expand.c


  Index: expand.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/expand.c,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- expand.c    12 Dec 2005 11:02:44 -0000    1.49
  +++ expand.c    12 Dec 2005 12:05:08 -0000    1.50
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/expand.c,v 1.49 2005/12/12 11:02:44 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/expand.c,v 1.50 2005/12/12 12:05:08 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -1428,6 +1428,7 @@
       case vtype_reply:                          /* Get reply address */
       s = find_header(US"reply-to:", exists_only, newsize, TRUE,
         headers_charset);
  +    if (s != NULL) while (isspace(*s)) s++;
       if (s == NULL || *s == 0)
         {
         *newsize = 0;                            /* For the *s==0 case */
  @@ -1438,6 +1439,8 @@
         uschar *t;
         while (isspace(*s)) s++;
         for (t = s; *t != 0; t++) if (*t == '\n') *t = ' ';
  +      while (t > s && isspace(t[-1])) t--;
  +      *t = 0;
         }
       return (s == NULL)? US"" : s;