/[pcre]/code/trunk/pcreposix.c
ViewVC logotype

Diff of /code/trunk/pcreposix.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 7 by nigel, Sat Feb 24 21:38:09 2007 UTC revision 1392 by ph10, Wed Nov 6 18:00:09 2013 UTC
# Line 2  Line 2 
2  *      Perl-Compatible Regular Expressions       *  *      Perl-Compatible Regular Expressions       *
3  *************************************************/  *************************************************/
4    
5  /*  /* PCRE is a library of functions to support regular expressions whose syntax
6  This is a library of functions to support regular expressions whose syntax  and semantics are as close as possible to those of the Perl 5 language.
 and semantics are as close as possible to those of the Perl 5 language. See  
 the file Tech.Notes for some information on the internals.  
   
 This module is a wrapper that provides a POSIX API to the underlying PCRE  
 functions.  
   
 Written by: Philip Hazel <ph10@cam.ac.uk>  
7    
8             Copyright (c) 1997 University of Cambridge                         Written by Philip Hazel
9               Copyright (c) 1997-2012 University of Cambridge
10    
11  -----------------------------------------------------------------------------  -----------------------------------------------------------------------------
12  Permission is granted to anyone to use this software for any purpose on any  Redistribution and use in source and binary forms, with or without
13  computer system, and to redistribute it freely, subject to the following  modification, are permitted provided that the following conditions are met:
 restrictions:  
   
 1. This software is distributed in the hope that it will be useful,  
    but WITHOUT ANY WARRANTY; without even the implied warranty of  
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
14    
15  2. The origin of this software must not be misrepresented, either by      * Redistributions of source code must retain the above copyright notice,
16     explicit claim or by omission.        this list of conditions and the following disclaimer.
17    
18  3. Altered versions must be plainly marked as such, and must not be      * Redistributions in binary form must reproduce the above copyright
19     misrepresented as being the original software.        notice, this list of conditions and the following disclaimer in the
20          documentation and/or other materials provided with the distribution.
21    
22        * Neither the name of the University of Cambridge nor the names of its
23          contributors may be used to endorse or promote products derived from
24          this software without specific prior written permission.
25    
26    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
27    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
28    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
29    ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
30    LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
31    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
32    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
33    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
34    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
35    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
36    POSSIBILITY OF SUCH DAMAGE.
37  -----------------------------------------------------------------------------  -----------------------------------------------------------------------------
38  */  */
39    
 #include "internal.h"  
 #include "pcreposix.h"  
 #include "stdlib.h"  
40    
41    /* This module is a wrapper that provides a POSIX API to the underlying PCRE
42    functions. */
43    
44    
45    #ifdef HAVE_CONFIG_H
46    #include "config.h"
47    #endif
48    
49    
50    /* Ensure that the PCREPOSIX_EXP_xxx macros are set appropriately for
51    compiling these functions. This must come before including pcreposix.h, where
52    they are set for an application (using these functions) if they have not
53    previously been set. */
54    
55    #if defined(_WIN32) && !defined(PCRE_STATIC)
56    #  define PCREPOSIX_EXP_DECL extern __declspec(dllexport)
57    #  define PCREPOSIX_EXP_DEFN __declspec(dllexport)
58    #endif
59    
60    /* We include pcre.h before pcre_internal.h so that the PCRE library functions
61    are declared as "import" for Windows by defining PCRE_EXP_DECL as "import".
62    This is needed even though pcre_internal.h itself includes pcre.h, because it
63    does so after it has set PCRE_EXP_DECL to "export" if it is not already set. */
64    
65    #include "pcre.h"
66    #include "pcre_internal.h"
67    #include "pcreposix.h"
68    
69    
70  /* Corresponding tables of PCRE error messages and POSIX error codes. */  /* Table to translate PCRE compile time error codes into POSIX error codes. */
71    
72  static const char *estring[] = {  static const int eint[] = {
73    ERR1,  ERR2,  ERR3,  ERR4,  ERR5,  ERR6,  ERR7,  ERR8,  ERR9,  ERR10,    0,           /* no error */
74    ERR11, ERR12, ERR13, ERR14, ERR15, ERR16, ERR17, ERR18, ERR19, ERR20,    REG_EESCAPE, /* \ at end of pattern */
75    ERR21, ERR22, ERR23 };    REG_EESCAPE, /* \c at end of pattern */
76      REG_EESCAPE, /* unrecognized character follows \ */
77  static int eint[] = {    REG_BADBR,   /* numbers out of order in {} quantifier */
78    REG_EESCAPE, /* "\\ at end of pattern" */    /* 5 */
79    REG_EESCAPE, /* "\\c at end of pattern" */    REG_BADBR,   /* number too big in {} quantifier */
80    REG_EESCAPE, /* "unrecognized character follows \\" */    REG_EBRACK,  /* missing terminating ] for character class */
81    REG_BADBR,   /* "numbers out of order in {} quantifier" */    REG_ECTYPE,  /* invalid escape sequence in character class */
82    REG_BADBR,   /* "number too big in {} quantifier" */    REG_ERANGE,  /* range out of order in character class */
83    REG_EBRACK,  /* "missing terminating ] for character class" */    REG_BADRPT,  /* nothing to repeat */
84    REG_ECTYPE,  /* "invalid escape sequence in character class" */    /* 10 */
85    REG_ERANGE,  /* "range out of order in character class" */    REG_BADRPT,  /* operand of unlimited repeat could match the empty string */
86    REG_BADRPT,  /* "nothing to repeat" */    REG_ASSERT,  /* internal error: unexpected repeat */
87    REG_BADRPT,  /* "operand of unlimited repeat could match the empty string" */    REG_BADPAT,  /* unrecognized character after (? */
88    REG_ASSERT,  /* "internal error: unexpected repeat" */    REG_BADPAT,  /* POSIX named classes are supported only within a class */
89    REG_BADPAT,  /* "unrecognized character after (?" */    REG_EPAREN,  /* missing ) */
90    REG_ESIZE,   /* "too many capturing parenthesized sub-patterns" */    /* 15 */
91    REG_EPAREN,  /* "missing )" */    REG_ESUBREG, /* reference to non-existent subpattern */
92    REG_ESUBREG, /* "back reference to non-existent subpattern" */    REG_INVARG,  /* erroffset passed as NULL */
93    REG_INVARG,  /* "erroffset passed as NULL" */    REG_INVARG,  /* unknown option bit(s) set */
94    REG_INVARG,  /* "unknown option bit(s) set" */    REG_EPAREN,  /* missing ) after comment */
95    REG_EPAREN,  /* "missing ) after comment" */    REG_ESIZE,   /* parentheses nested too deeply */
96    REG_ESIZE,   /* "too many sets of parentheses" */    /* 20 */
97    REG_ESIZE,   /* "regular expression too large" */    REG_ESIZE,   /* regular expression too large */
98    REG_ESPACE,  /* "failed to get memory" */    REG_ESPACE,  /* failed to get memory */
99    REG_EPAREN,  /* "unmatched brackets" */    REG_EPAREN,  /* unmatched parentheses */
100    REG_ASSERT   /* "internal error: code overflow" */    REG_ASSERT,  /* internal error: code overflow */
101      REG_BADPAT,  /* unrecognized character after (?< */
102      /* 25 */
103      REG_BADPAT,  /* lookbehind assertion is not fixed length */
104      REG_BADPAT,  /* malformed number or name after (?( */
105      REG_BADPAT,  /* conditional group contains more than two branches */
106      REG_BADPAT,  /* assertion expected after (?( */
107      REG_BADPAT,  /* (?R or (?[+-]digits must be followed by ) */
108      /* 30 */
109      REG_ECTYPE,  /* unknown POSIX class name */
110      REG_BADPAT,  /* POSIX collating elements are not supported */
111      REG_INVARG,  /* this version of PCRE is not compiled with PCRE_UTF8 support */
112      REG_BADPAT,  /* spare error */
113      REG_BADPAT,  /* character value in \x{} or \o{} is too large */
114      /* 35 */
115      REG_BADPAT,  /* invalid condition (?(0) */
116      REG_BADPAT,  /* \C not allowed in lookbehind assertion */
117      REG_EESCAPE, /* PCRE does not support \L, \l, \N, \U, or \u */
118      REG_BADPAT,  /* number after (?C is > 255 */
119      REG_BADPAT,  /* closing ) for (?C expected */
120      /* 40 */
121      REG_BADPAT,  /* recursive call could loop indefinitely */
122      REG_BADPAT,  /* unrecognized character after (?P */
123      REG_BADPAT,  /* syntax error in subpattern name (missing terminator) */
124      REG_BADPAT,  /* two named subpatterns have the same name */
125      REG_BADPAT,  /* invalid UTF-8 string */
126      /* 45 */
127      REG_BADPAT,  /* support for \P, \p, and \X has not been compiled */
128      REG_BADPAT,  /* malformed \P or \p sequence */
129      REG_BADPAT,  /* unknown property name after \P or \p */
130      REG_BADPAT,  /* subpattern name is too long (maximum 32 characters) */
131      REG_BADPAT,  /* too many named subpatterns (maximum 10,000) */
132      /* 50 */
133      REG_BADPAT,  /* repeated subpattern is too long */
134      REG_BADPAT,  /* octal value is greater than \377 (not in UTF-8 mode) */
135      REG_BADPAT,  /* internal error: overran compiling workspace */
136      REG_BADPAT,  /* internal error: previously-checked referenced subpattern not found */
137      REG_BADPAT,  /* DEFINE group contains more than one branch */
138      /* 55 */
139      REG_BADPAT,  /* repeating a DEFINE group is not allowed */
140      REG_INVARG,  /* inconsistent NEWLINE options */
141      REG_BADPAT,  /* \g is not followed followed by an (optionally braced) non-zero number */
142      REG_BADPAT,  /* a numbered reference must not be zero */
143      REG_BADPAT,  /* an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT) */
144      /* 60 */
145      REG_BADPAT,  /* (*VERB) not recognized */
146      REG_BADPAT,  /* number is too big */
147      REG_BADPAT,  /* subpattern name expected */
148      REG_BADPAT,  /* digit expected after (?+ */
149      REG_BADPAT,  /* ] is an invalid data character in JavaScript compatibility mode */
150      /* 65 */
151      REG_BADPAT,  /* different names for subpatterns of the same number are not allowed */
152      REG_BADPAT,  /* (*MARK) must have an argument */
153      REG_INVARG,  /* this version of PCRE is not compiled with PCRE_UCP support */
154      REG_BADPAT,  /* \c must be followed by an ASCII character */
155      REG_BADPAT,  /* \k is not followed by a braced, angle-bracketed, or quoted name */
156      /* 70 */
157      REG_BADPAT,  /* internal error: unknown opcode in find_fixedlength() */
158      REG_BADPAT,  /* \N is not supported in a class */
159      REG_BADPAT,  /* too many forward references */
160      REG_BADPAT,  /* disallowed UTF-8/16/32 code point (>= 0xd800 && <= 0xdfff) */
161      REG_BADPAT,  /* invalid UTF-16 string (should not occur) */
162      /* 75 */
163      REG_BADPAT,  /* overlong MARK name */
164      REG_BADPAT,  /* character value in \u.... sequence is too large */
165      REG_BADPAT,  /* invalid UTF-32 string (should not occur) */
166      REG_BADPAT,  /* setting UTF is disabled by the application */
167      REG_BADPAT,  /* non-hex character in \\x{} (closing brace missing?) */
168      /* 80 */
169      REG_BADPAT,  /* non-octal character in \o{} (closing brace missing?) */
170      REG_BADPAT,  /* missing opening brace after \o */
171      REG_BADPAT,  /* parentheses too deeply nested */
172      REG_BADPAT   /* invalid range in character class */
173  };  };
174    
175  /* Table of texts corresponding to POSIX error codes */  /* Table of texts corresponding to POSIX error codes */
176    
177  static const char *pstring[] = {  static const char *const pstring[] = {
178    "",                                /* Dummy for value 0 */    "",                                /* Dummy for value 0 */
179    "internal error",                  /* REG_ASSERT */    "internal error",                  /* REG_ASSERT */
180    "invalid repeat counts in {}",     /* BADBR      */    "invalid repeat counts in {}",     /* BADBR      */
# Line 97  static const char *pstring[] = { Line 199  static const char *pstring[] = {
199    
200    
201  /*************************************************  /*************************************************
 *          Translate PCRE text code to int       *  
 *************************************************/  
   
 /* PCRE compile-time errors are given as strings defined as macros. We can just  
 look them up in a table to turn them into POSIX-style error codes. */  
   
 static int  
 pcre_posix_error_code(const char *s)  
 {  
 size_t i;  
 for (i = 0; i < sizeof(estring)/sizeof(char *); i++)  
   if (strcmp(s, estring[i]) == 0) return eint[i];  
 return REG_ASSERT;  
 }  
   
   
   
 /*************************************************  
202  *          Translate error code to string        *  *          Translate error code to string        *
203  *************************************************/  *************************************************/
204    
205  size_t  PCREPOSIX_EXP_DEFN size_t PCRE_CALL_CONVENTION
206  regerror(int errcode, const regex_t *preg, char *errbuf, size_t errbuf_size)  regerror(int errcode, const regex_t *preg, char *errbuf, size_t errbuf_size)
207  {  {
208  const char *message, *addmessage;  const char *message, *addmessage;
# Line 135  addlength = (preg != NULL && (int)preg-> Line 219  addlength = (preg != NULL && (int)preg->
219  if (errbuf_size > 0)  if (errbuf_size > 0)
220    {    {
221    if (addlength > 0 && errbuf_size >= length + addlength)    if (addlength > 0 && errbuf_size >= length + addlength)
222      sprintf(errbuf, "%s%s%-6d", message, addmessage, preg->re_erroffset);      sprintf(errbuf, "%s%s%-6d", message, addmessage, (int)preg->re_erroffset);
223    else    else
224      {      {
225      strncpy(errbuf, message, errbuf_size - 1);      strncpy(errbuf, message, errbuf_size - 1);
# Line 153  return length + addlength; Line 237  return length + addlength;
237  *           Free store held by a regex           *  *           Free store held by a regex           *
238  *************************************************/  *************************************************/
239    
240  void  PCREPOSIX_EXP_DEFN void PCRE_CALL_CONVENTION
241  regfree(regex_t *preg)  regfree(regex_t *preg)
242  {  {
243  (pcre_free)(preg->re_pcre);  (PUBL(free))(preg->re_pcre);
244  }  }
245    
246    
# Line 176  Returns:      0 on success Line 260  Returns:      0 on success
260                various non-zero codes on failure                various non-zero codes on failure
261  */  */
262    
263  int  PCREPOSIX_EXP_DEFN int PCRE_CALL_CONVENTION
264  regcomp(regex_t *preg, const char *pattern, int cflags)  regcomp(regex_t *preg, const char *pattern, int cflags)
265  {  {
266  const char *errorptr;  const char *errorptr;
267  int erroffset;  int erroffset;
268    int errorcode;
269  int options = 0;  int options = 0;
270    int re_nsub = 0;
271    
272  if ((cflags & REG_ICASE) != 0) options |= PCRE_CASELESS;  if ((cflags & REG_ICASE) != 0)    options |= PCRE_CASELESS;
273  if ((cflags & REG_NEWLINE) != 0) options |= PCRE_MULTILINE;  if ((cflags & REG_NEWLINE) != 0)  options |= PCRE_MULTILINE;
274    if ((cflags & REG_DOTALL) != 0)   options |= PCRE_DOTALL;
275    if ((cflags & REG_NOSUB) != 0)    options |= PCRE_NO_AUTO_CAPTURE;
276    if ((cflags & REG_UTF8) != 0)     options |= PCRE_UTF8;
277    if ((cflags & REG_UCP) != 0)      options |= PCRE_UCP;
278    if ((cflags & REG_UNGREEDY) != 0) options |= PCRE_UNGREEDY;
279    
280  preg->re_pcre = pcre_compile(pattern, options, &errorptr, &erroffset);  preg->re_pcre = pcre_compile2(pattern, options, &errorcode, &errorptr,
281      &erroffset, NULL);
282  preg->re_erroffset = erroffset;  preg->re_erroffset = erroffset;
283    
284  if (preg->re_pcre == NULL) return pcre_posix_error_code(errorptr);  /* Safety: if the error code is too big for the translation vector (which
285    should not happen, but we all make mistakes), return REG_BADPAT. */
286    
287    if (preg->re_pcre == NULL)
288      {
289      return (errorcode < (int)(sizeof(eint)/sizeof(const int)))?
290        eint[errorcode] : REG_BADPAT;
291      }
292    
293  preg->re_nsub = pcre_info(preg->re_pcre, NULL, NULL);  (void)pcre_fullinfo((const pcre *)preg->re_pcre, NULL, PCRE_INFO_CAPTURECOUNT,
294      &re_nsub);
295    preg->re_nsub = (size_t)re_nsub;
296  return 0;  return 0;
297  }  }
298    
# Line 202  return 0; Line 303  return 0;
303  *              Match a regular expression        *  *              Match a regular expression        *
304  *************************************************/  *************************************************/
305    
306  int  /* Unfortunately, PCRE requires 3 ints of working space for each captured
307  regexec(regex_t *preg, const char *string, size_t nmatch,  substring, so we have to get and release working store instead of just using
308    the POSIX structures as was done in earlier releases when PCRE needed only 2
309    ints. However, if the number of possible capturing brackets is small, use a
310    block of store on the stack, to reduce the use of malloc/free. The threshold is
311    in a macro that can be changed at configure time.
312    
313    If REG_NOSUB was specified at compile time, the PCRE_NO_AUTO_CAPTURE flag will
314    be set. When this is the case, the nmatch and pmatch arguments are ignored, and
315    the only result is yes/no/error. */
316    
317    PCREPOSIX_EXP_DEFN int PCRE_CALL_CONVENTION
318    regexec(const regex_t *preg, const char *string, size_t nmatch,
319    regmatch_t pmatch[], int eflags)    regmatch_t pmatch[], int eflags)
320  {  {
321  int rc;  int rc, so, eo;
322  int options = 0;  int options = 0;
323    int *ovector = NULL;
324    int small_ovector[POSIX_MALLOC_THRESHOLD * 3];
325    BOOL allocated_ovector = FALSE;
326    BOOL nosub =
327      (REAL_PCRE_OPTIONS((const pcre *)preg->re_pcre) & PCRE_NO_AUTO_CAPTURE) != 0;
328    
329  if ((eflags & REG_NOTBOL) != 0) options |= PCRE_NOTBOL;  if ((eflags & REG_NOTBOL) != 0) options |= PCRE_NOTBOL;
330  if ((eflags & REG_NOTEOL) != 0) options |= PCRE_NOTEOL;  if ((eflags & REG_NOTEOL) != 0) options |= PCRE_NOTEOL;
331    if ((eflags & REG_NOTEMPTY) != 0) options |= PCRE_NOTEMPTY;
332    
333    ((regex_t *)preg)->re_erroffset = (size_t)(-1);  /* Only has meaning after compile */
334    
335  preg->re_erroffset = -1;   /* Only has meaning after compile */  /* When no string data is being returned, or no vector has been passed in which
336    to put it, ensure that nmatch is zero. Otherwise, ensure the vector for holding
337    the return data is large enough. */
338    
339  rc = pcre_exec(preg->re_pcre, NULL, string, (int)strlen(string), options,  if (nosub || pmatch == NULL) nmatch = 0;
340    (int *)pmatch, nmatch * 2);  
341    else if (nmatch > 0)
342      {
343      if (nmatch <= POSIX_MALLOC_THRESHOLD)
344        {
345        ovector = &(small_ovector[0]);
346        }
347      else
348        {
349        if (nmatch > INT_MAX/(sizeof(int) * 3)) return REG_ESPACE;
350        ovector = (int *)malloc(sizeof(int) * nmatch * 3);
351        if (ovector == NULL) return REG_ESPACE;
352        allocated_ovector = TRUE;
353        }
354      }
355    
356  if (rc == 0) return 0;    /* All pmatch were filled in */  /* REG_STARTEND is a BSD extension, to allow for non-NUL-terminated strings.
357    The man page from OS X says "REG_STARTEND affects only the location of the
358    string, not how it is matched". That is why the "so" value is used to bump the
359    start location rather than being passed as a PCRE "starting offset". */
360    
361  if (rc > 0)  if ((eflags & REG_STARTEND) != 0)
362      {
363      so = pmatch[0].rm_so;
364      eo = pmatch[0].rm_eo;
365      }
366    else
367      {
368      so = 0;
369      eo = (int)strlen(string);
370      }
371    
372    rc = pcre_exec((const pcre *)preg->re_pcre, NULL, string + so, (eo - so),
373      0, options, ovector, (int)(nmatch * 3));
374    
375    if (rc == 0) rc = (int)nmatch;    /* All captured slots were filled in */
376    
377    /* Successful match */
378    
379    if (rc >= 0)
380    {    {
381    size_t i;    size_t i;
382    for (i = rc; i < nmatch; i++) pmatch[i].rm_so = pmatch[i].rm_eo = -1;    if (!nosub)
383        {
384        for (i = 0; i < (size_t)rc; i++)
385          {
386          pmatch[i].rm_so = ovector[i*2];
387          pmatch[i].rm_eo = ovector[i*2+1];
388          }
389        if (allocated_ovector) free(ovector);
390        for (; i < nmatch; i++) pmatch[i].rm_so = pmatch[i].rm_eo = -1;
391        }
392    return 0;    return 0;
393    }    }
394    
395  else switch(rc)  /* Unsuccessful match */
396    
397    if (allocated_ovector) free(ovector);
398    switch(rc)
399    {    {
400    /* ========================================================================== */
401      /* These cases are never obeyed. This is a fudge that causes a compile-time
402      error if the vector eint, which is indexed by compile-time error number, is
403      not the correct length. It seems to be the only way to do such a check at
404      compile time, as the sizeof() operator does not work in the C preprocessor.
405      As all the PCRE_ERROR_xxx values are negative, we can use 0 and 1. */
406    
407      case 0:
408      case (sizeof(eint)/sizeof(int) == ERRCOUNT):
409      return REG_ASSERT;
410    /* ========================================================================== */
411    
412    case PCRE_ERROR_NOMATCH: return REG_NOMATCH;    case PCRE_ERROR_NOMATCH: return REG_NOMATCH;
   case PCRE_ERROR_BADREF: return REG_ESUBREG;  
413    case PCRE_ERROR_NULL: return REG_INVARG;    case PCRE_ERROR_NULL: return REG_INVARG;
414    case PCRE_ERROR_BADOPTION: return REG_INVARG;    case PCRE_ERROR_BADOPTION: return REG_INVARG;
415    case PCRE_ERROR_BADMAGIC: return REG_INVARG;    case PCRE_ERROR_BADMAGIC: return REG_INVARG;
416    case PCRE_ERROR_UNKNOWN_NODE: return REG_ASSERT;    case PCRE_ERROR_UNKNOWN_NODE: return REG_ASSERT;
417    case PCRE_ERROR_NOMEMORY: return REG_ESPACE;    case PCRE_ERROR_NOMEMORY: return REG_ESPACE;
418      case PCRE_ERROR_MATCHLIMIT: return REG_ESPACE;
419      case PCRE_ERROR_BADUTF8: return REG_INVARG;
420      case PCRE_ERROR_BADUTF8_OFFSET: return REG_INVARG;
421      case PCRE_ERROR_BADMODE: return REG_INVARG;
422    default: return REG_ASSERT;    default: return REG_ASSERT;
423    }    }
424  }  }

Legend:
Removed from v.7  
changed lines
  Added in v.1392

  ViewVC Help
Powered by ViewVC 1.1.5