/[pcre]/code/branches/pcre16/pcretest.c
ViewVC logotype

Diff of /code/branches/pcre16/pcretest.c

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

revision 455 by ph10, Sat Sep 26 19:12:32 2009 UTC revision 641 by ph10, Mon Jul 25 16:56:54 2011 UTC
# Line 79  input mode under Windows. */ Line 79  input mode under Windows. */
79  #define fileno _fileno  #define fileno _fileno
80  #endif  #endif
81    
82    /* A user sent this fix for Borland Builder 5 under Windows. */
83    
84    #ifdef __BORLANDC__
85    #define _setmode(handle, mode) setmode(handle, mode)
86    #endif
87    
88    /* Not Windows */
89    
90  #else  #else
91  #include <sys/time.h>          /* These two includes are needed */  #include <sys/time.h>          /* These two includes are needed */
92  #include <sys/resource.h>      /* for setrlimit(). */  #include <sys/resource.h>      /* for setrlimit(). */
# Line 118  external symbols to prevent clashes. */ Line 126  external symbols to prevent clashes. */
126    
127  /* We also need the pcre_printint() function for printing out compiled  /* We also need the pcre_printint() function for printing out compiled
128  patterns. This function is in a separate file so that it can be included in  patterns. This function is in a separate file so that it can be included in
129  pcre_compile.c when that module is compiled with debugging enabled.  pcre_compile.c when that module is compiled with debugging enabled. It needs to
130    know which case is being compiled. */
 The definition of the macro PRINTABLE, which determines whether to print an  
 output character as-is or as a hex value when showing compiled patterns, is  
 contained in this file. We uses it here also, in cases when the locale has not  
 been explicitly changed, so as to get consistent output from systems that  
 differ in their output from isprint() even in the "C" locale. */  
131    
132    #define COMPILING_PCRETEST
133  #include "pcre_printint.src"  #include "pcre_printint.src"
134    
135  #define PRINTHEX(c) (locale_set? isprint(c) : PRINTABLE(c))  /* The definition of the macro PRINTABLE, which determines whether to print an
136    output character as-is or as a hex value when showing compiled patterns, is
137    contained in the printint.src file. We uses it here also, in cases when the
138    locale has not been explicitly changed, so as to get consistent output from
139    systems that differ in their output from isprint() even in the "C" locale. */
140    
141    #define PRINTHEX(c) (locale_set? isprint(c) : PRINTABLE(c))
142    
143  /* It is possible to compile this test program without including support for  /* It is possible to compile this test program without including support for
144  testing the POSIX interface, though this is not available via the standard  testing the POSIX interface, though this is not available via the standard
# Line 188  static uschar *buffer = NULL; Line 197  static uschar *buffer = NULL;
197  static uschar *dbuffer = NULL;  static uschar *dbuffer = NULL;
198  static uschar *pbuffer = NULL;  static uschar *pbuffer = NULL;
199    
200    /* Textual explanations for runtime error codes */
201    
202    static const char *errtexts[] = {
203      NULL,  /* 0 is no error */
204      NULL,  /* NOMATCH is handled specially */
205      "NULL argument passed",
206      "bad option value",
207      "magic number missing",
208      "unknown opcode - pattern overwritten?",
209      "no more memory",
210      NULL,  /* never returned by pcre_exec() or pcre_dfa_exec() */
211      "match limit exceeded",
212      "callout error code",
213      NULL,  /* BADUTF8 is handled specially */
214      "bad UTF-8 offset",
215      NULL,  /* PARTIAL is handled specially */
216      "not used - internal error",
217      "internal error - pattern overwritten?",
218      "bad count value",
219      "item unsupported for DFA matching",
220      "backreference condition or recursion test not supported for DFA matching",
221      "match limit not supported for DFA matching",
222      "workspace size exceeded in DFA matching",
223      "too much recursion for DFA matching",
224      "recursion limit exceeded",
225      "not used - internal error",
226      "invalid combination of newline options",
227      "bad offset value",
228      NULL  /* SHORTUTF8 is handled specially */
229    };
230    
231    
232    /*************************************************
233    *         Alternate character tables             *
234    *************************************************/
235    
236    /* By default, the "tables" pointer when calling PCRE is set to NULL, thereby
237    using the default tables of the library. However, the T option can be used to
238    select alternate sets of tables, for different kinds of testing. Note also that
239    the L (locale) option also adjusts the tables. */
240    
241    /* This is the set of tables distributed as default with PCRE. It recognizes
242    only ASCII characters. */
243    
244    static const unsigned char tables0[] = {
245    
246    /* This table is a lower casing table. */
247    
248        0,  1,  2,  3,  4,  5,  6,  7,
249        8,  9, 10, 11, 12, 13, 14, 15,
250       16, 17, 18, 19, 20, 21, 22, 23,
251       24, 25, 26, 27, 28, 29, 30, 31,
252       32, 33, 34, 35, 36, 37, 38, 39,
253       40, 41, 42, 43, 44, 45, 46, 47,
254       48, 49, 50, 51, 52, 53, 54, 55,
255       56, 57, 58, 59, 60, 61, 62, 63,
256       64, 97, 98, 99,100,101,102,103,
257      104,105,106,107,108,109,110,111,
258      112,113,114,115,116,117,118,119,
259      120,121,122, 91, 92, 93, 94, 95,
260       96, 97, 98, 99,100,101,102,103,
261      104,105,106,107,108,109,110,111,
262      112,113,114,115,116,117,118,119,
263      120,121,122,123,124,125,126,127,
264      128,129,130,131,132,133,134,135,
265      136,137,138,139,140,141,142,143,
266      144,145,146,147,148,149,150,151,
267      152,153,154,155,156,157,158,159,
268      160,161,162,163,164,165,166,167,
269      168,169,170,171,172,173,174,175,
270      176,177,178,179,180,181,182,183,
271      184,185,186,187,188,189,190,191,
272      192,193,194,195,196,197,198,199,
273      200,201,202,203,204,205,206,207,
274      208,209,210,211,212,213,214,215,
275      216,217,218,219,220,221,222,223,
276      224,225,226,227,228,229,230,231,
277      232,233,234,235,236,237,238,239,
278      240,241,242,243,244,245,246,247,
279      248,249,250,251,252,253,254,255,
280    
281    /* This table is a case flipping table. */
282    
283        0,  1,  2,  3,  4,  5,  6,  7,
284        8,  9, 10, 11, 12, 13, 14, 15,
285       16, 17, 18, 19, 20, 21, 22, 23,
286       24, 25, 26, 27, 28, 29, 30, 31,
287       32, 33, 34, 35, 36, 37, 38, 39,
288       40, 41, 42, 43, 44, 45, 46, 47,
289       48, 49, 50, 51, 52, 53, 54, 55,
290       56, 57, 58, 59, 60, 61, 62, 63,
291       64, 97, 98, 99,100,101,102,103,
292      104,105,106,107,108,109,110,111,
293      112,113,114,115,116,117,118,119,
294      120,121,122, 91, 92, 93, 94, 95,
295       96, 65, 66, 67, 68, 69, 70, 71,
296       72, 73, 74, 75, 76, 77, 78, 79,
297       80, 81, 82, 83, 84, 85, 86, 87,
298       88, 89, 90,123,124,125,126,127,
299      128,129,130,131,132,133,134,135,
300      136,137,138,139,140,141,142,143,
301      144,145,146,147,148,149,150,151,
302      152,153,154,155,156,157,158,159,
303      160,161,162,163,164,165,166,167,
304      168,169,170,171,172,173,174,175,
305      176,177,178,179,180,181,182,183,
306      184,185,186,187,188,189,190,191,
307      192,193,194,195,196,197,198,199,
308      200,201,202,203,204,205,206,207,
309      208,209,210,211,212,213,214,215,
310      216,217,218,219,220,221,222,223,
311      224,225,226,227,228,229,230,231,
312      232,233,234,235,236,237,238,239,
313      240,241,242,243,244,245,246,247,
314      248,249,250,251,252,253,254,255,
315    
316    /* This table contains bit maps for various character classes. Each map is 32
317    bytes long and the bits run from the least significant end of each byte. The
318    classes that have their own maps are: space, xdigit, digit, upper, lower, word,
319    graph, print, punct, and cntrl. Other classes are built from combinations. */
320    
321      0x00,0x3e,0x00,0x00,0x01,0x00,0x00,0x00,
322      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
323      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
324      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
325    
326      0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,
327      0x7e,0x00,0x00,0x00,0x7e,0x00,0x00,0x00,
328      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
329      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
330    
331      0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,
332      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
333      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
334      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
335    
336      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
337      0xfe,0xff,0xff,0x07,0x00,0x00,0x00,0x00,
338      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
339      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
340    
341      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
342      0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0x07,
343      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
344      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
345    
346      0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,
347      0xfe,0xff,0xff,0x87,0xfe,0xff,0xff,0x07,
348      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
349      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
350    
351      0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,
352      0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,
353      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
354      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
355    
356      0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,
357      0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,
358      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
359      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
360    
361      0x00,0x00,0x00,0x00,0xfe,0xff,0x00,0xfc,
362      0x01,0x00,0x00,0xf8,0x01,0x00,0x00,0x78,
363      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
364      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
365    
366      0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,
367      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,
368      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
369      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
370    
371    /* This table identifies various classes of character by individual bits:
372      0x01   white space character
373      0x02   letter
374      0x04   decimal digit
375      0x08   hexadecimal digit
376      0x10   alphanumeric or '_'
377      0x80   regular expression metacharacter or binary zero
378    */
379    
380      0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */
381      0x00,0x01,0x01,0x00,0x01,0x01,0x00,0x00, /*   8- 15 */
382      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  16- 23 */
383      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  24- 31 */
384      0x01,0x00,0x00,0x00,0x80,0x00,0x00,0x00, /*    - '  */
385      0x80,0x80,0x80,0x80,0x00,0x00,0x80,0x00, /*  ( - /  */
386      0x1c,0x1c,0x1c,0x1c,0x1c,0x1c,0x1c,0x1c, /*  0 - 7  */
387      0x1c,0x1c,0x00,0x00,0x00,0x00,0x00,0x80, /*  8 - ?  */
388      0x00,0x1a,0x1a,0x1a,0x1a,0x1a,0x1a,0x12, /*  @ - G  */
389      0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  H - O  */
390      0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  P - W  */
391      0x12,0x12,0x12,0x80,0x80,0x00,0x80,0x10, /*  X - _  */
392      0x00,0x1a,0x1a,0x1a,0x1a,0x1a,0x1a,0x12, /*  ` - g  */
393      0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  h - o  */
394      0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  p - w  */
395      0x12,0x12,0x12,0x80,0x80,0x00,0x00,0x00, /*  x -127 */
396      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 128-135 */
397      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 136-143 */
398      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 144-151 */
399      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 152-159 */
400      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 160-167 */
401      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 168-175 */
402      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 176-183 */
403      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 184-191 */
404      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 192-199 */
405      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 200-207 */
406      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 208-215 */
407      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 216-223 */
408      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 224-231 */
409      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 232-239 */
410      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */
411      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */
412    
413    /* This is a set of tables that came orginally from a Windows user. It seems to
414    be at least an approximation of ISO 8859. In particular, there are characters
415    greater than 128 that are marked as spaces, letters, etc. */
416    
417    static const unsigned char tables1[] = {
418    0,1,2,3,4,5,6,7,
419    8,9,10,11,12,13,14,15,
420    16,17,18,19,20,21,22,23,
421    24,25,26,27,28,29,30,31,
422    32,33,34,35,36,37,38,39,
423    40,41,42,43,44,45,46,47,
424    48,49,50,51,52,53,54,55,
425    56,57,58,59,60,61,62,63,
426    64,97,98,99,100,101,102,103,
427    104,105,106,107,108,109,110,111,
428    112,113,114,115,116,117,118,119,
429    120,121,122,91,92,93,94,95,
430    96,97,98,99,100,101,102,103,
431    104,105,106,107,108,109,110,111,
432    112,113,114,115,116,117,118,119,
433    120,121,122,123,124,125,126,127,
434    128,129,130,131,132,133,134,135,
435    136,137,138,139,140,141,142,143,
436    144,145,146,147,148,149,150,151,
437    152,153,154,155,156,157,158,159,
438    160,161,162,163,164,165,166,167,
439    168,169,170,171,172,173,174,175,
440    176,177,178,179,180,181,182,183,
441    184,185,186,187,188,189,190,191,
442    224,225,226,227,228,229,230,231,
443    232,233,234,235,236,237,238,239,
444    240,241,242,243,244,245,246,215,
445    248,249,250,251,252,253,254,223,
446    224,225,226,227,228,229,230,231,
447    232,233,234,235,236,237,238,239,
448    240,241,242,243,244,245,246,247,
449    248,249,250,251,252,253,254,255,
450    0,1,2,3,4,5,6,7,
451    8,9,10,11,12,13,14,15,
452    16,17,18,19,20,21,22,23,
453    24,25,26,27,28,29,30,31,
454    32,33,34,35,36,37,38,39,
455    40,41,42,43,44,45,46,47,
456    48,49,50,51,52,53,54,55,
457    56,57,58,59,60,61,62,63,
458    64,97,98,99,100,101,102,103,
459    104,105,106,107,108,109,110,111,
460    112,113,114,115,116,117,118,119,
461    120,121,122,91,92,93,94,95,
462    96,65,66,67,68,69,70,71,
463    72,73,74,75,76,77,78,79,
464    80,81,82,83,84,85,86,87,
465    88,89,90,123,124,125,126,127,
466    128,129,130,131,132,133,134,135,
467    136,137,138,139,140,141,142,143,
468    144,145,146,147,148,149,150,151,
469    152,153,154,155,156,157,158,159,
470    160,161,162,163,164,165,166,167,
471    168,169,170,171,172,173,174,175,
472    176,177,178,179,180,181,182,183,
473    184,185,186,187,188,189,190,191,
474    224,225,226,227,228,229,230,231,
475    232,233,234,235,236,237,238,239,
476    240,241,242,243,244,245,246,215,
477    248,249,250,251,252,253,254,223,
478    192,193,194,195,196,197,198,199,
479    200,201,202,203,204,205,206,207,
480    208,209,210,211,212,213,214,247,
481    216,217,218,219,220,221,222,255,
482    0,62,0,0,1,0,0,0,
483    0,0,0,0,0,0,0,0,
484    32,0,0,0,1,0,0,0,
485    0,0,0,0,0,0,0,0,
486    0,0,0,0,0,0,255,3,
487    126,0,0,0,126,0,0,0,
488    0,0,0,0,0,0,0,0,
489    0,0,0,0,0,0,0,0,
490    0,0,0,0,0,0,255,3,
491    0,0,0,0,0,0,0,0,
492    0,0,0,0,0,0,12,2,
493    0,0,0,0,0,0,0,0,
494    0,0,0,0,0,0,0,0,
495    254,255,255,7,0,0,0,0,
496    0,0,0,0,0,0,0,0,
497    255,255,127,127,0,0,0,0,
498    0,0,0,0,0,0,0,0,
499    0,0,0,0,254,255,255,7,
500    0,0,0,0,0,4,32,4,
501    0,0,0,128,255,255,127,255,
502    0,0,0,0,0,0,255,3,
503    254,255,255,135,254,255,255,7,
504    0,0,0,0,0,4,44,6,
505    255,255,127,255,255,255,127,255,
506    0,0,0,0,254,255,255,255,
507    255,255,255,255,255,255,255,127,
508    0,0,0,0,254,255,255,255,
509    255,255,255,255,255,255,255,255,
510    0,2,0,0,255,255,255,255,
511    255,255,255,255,255,255,255,127,
512    0,0,0,0,255,255,255,255,
513    255,255,255,255,255,255,255,255,
514    0,0,0,0,254,255,0,252,
515    1,0,0,248,1,0,0,120,
516    0,0,0,0,254,255,255,255,
517    0,0,128,0,0,0,128,0,
518    255,255,255,255,0,0,0,0,
519    0,0,0,0,0,0,0,128,
520    255,255,255,255,0,0,0,0,
521    0,0,0,0,0,0,0,0,
522    128,0,0,0,0,0,0,0,
523    0,1,1,0,1,1,0,0,
524    0,0,0,0,0,0,0,0,
525    0,0,0,0,0,0,0,0,
526    1,0,0,0,128,0,0,0,
527    128,128,128,128,0,0,128,0,
528    28,28,28,28,28,28,28,28,
529    28,28,0,0,0,0,0,128,
530    0,26,26,26,26,26,26,18,
531    18,18,18,18,18,18,18,18,
532    18,18,18,18,18,18,18,18,
533    18,18,18,128,128,0,128,16,
534    0,26,26,26,26,26,26,18,
535    18,18,18,18,18,18,18,18,
536    18,18,18,18,18,18,18,18,
537    18,18,18,128,128,0,0,0,
538    0,0,0,0,0,1,0,0,
539    0,0,0,0,0,0,0,0,
540    0,0,0,0,0,0,0,0,
541    0,0,0,0,0,0,0,0,
542    1,0,0,0,0,0,0,0,
543    0,0,18,0,0,0,0,0,
544    0,0,20,20,0,18,0,0,
545    0,20,18,0,0,0,0,0,
546    18,18,18,18,18,18,18,18,
547    18,18,18,18,18,18,18,18,
548    18,18,18,18,18,18,18,0,
549    18,18,18,18,18,18,18,18,
550    18,18,18,18,18,18,18,18,
551    18,18,18,18,18,18,18,18,
552    18,18,18,18,18,18,18,0,
553    18,18,18,18,18,18,18,18
554    };
555    
556    
557    
558    
559    #ifndef HAVE_STRERROR
560    /*************************************************
561    *     Provide strerror() for non-ANSI libraries  *
562    *************************************************/
563    
564    /* Some old-fashioned systems still around (e.g. SunOS4) don't have strerror()
565    in their libraries, but can provide the same facility by this simple
566    alternative function. */
567    
568    extern int   sys_nerr;
569    extern char *sys_errlist[];
570    
571    char *
572    strerror(int n)
573    {
574    if (n < 0 || n >= sys_nerr) return "unknown error number";
575    return sys_errlist[n];
576    }
577    #endif /* HAVE_STRERROR */
578    
579    
580    
581    
582  /*************************************************  /*************************************************
# Line 220  uschar *here = start; Line 609  uschar *here = start;
609    
610  for (;;)  for (;;)
611    {    {
612    int rlen = buffer_size - (here - buffer);    int rlen = (int)(buffer_size - (here - buffer));
613    
614    if (rlen > 1000)    if (rlen > 1000)
615      {      {
# Line 250  for (;;) Line 639  for (;;)
639      /* Read the next line by normal means, prompting if the file is stdin. */      /* Read the next line by normal means, prompting if the file is stdin. */
640    
641        {        {
642        if (f == stdin) printf(prompt);        if (f == stdin) printf("%s", prompt);
643        if (fgets((char *)here, rlen,  f) == NULL)        if (fgets((char *)here, rlen,  f) == NULL)
644          return (here == start)? NULL : start;          return (here == start)? NULL : start;
645        }        }
# Line 740  return 0; Line 1129  return 0;
1129  *         Check newline indicator                *  *         Check newline indicator                *
1130  *************************************************/  *************************************************/
1131    
1132  /* This is used both at compile and run-time to check for <xxx> escapes, where  /* This is used both at compile and run-time to check for <xxx> escapes. Print
1133  xxx is LF, CR, CRLF, ANYCRLF, or ANY. Print a message and return 0 if there is  a message and return 0 if there is no match.
 no match.  
1134    
1135  Arguments:  Arguments:
1136    p           points after the leading '<'    p           points after the leading '<'
# Line 798  printf(" -p use POSIX interface\n Line 1186  printf(" -p use POSIX interface\n
1186  #endif  #endif
1187  printf("  -q       quiet: do not output PCRE version number at start\n");  printf("  -q       quiet: do not output PCRE version number at start\n");
1188  printf("  -S <n>   set stack size to <n> megabytes\n");  printf("  -S <n>   set stack size to <n> megabytes\n");
1189  printf("  -s       output store (memory) used information\n"  printf("  -s       force each pattern to be studied\n"
1190         "  -t       time compilation and execution\n");         "  -t       time compilation and execution\n");
1191  printf("  -t <n>   time compilation and execution, repeating <n> times\n");  printf("  -t <n>   time compilation and execution, repeating <n> times\n");
1192  printf("  -tm      time execution (matching) only\n");  printf("  -tm      time execution (matching) only\n");
# Line 826  int timeit = 0; Line 1214  int timeit = 0;
1214  int timeitm = 0;  int timeitm = 0;
1215  int showinfo = 0;  int showinfo = 0;
1216  int showstore = 0;  int showstore = 0;
1217    int force_study = 0;
1218  int quiet = 0;  int quiet = 0;
1219  int size_offsets = 45;  int size_offsets = 45;
1220  int size_offsets_max;  int size_offsets_max;
# Line 874  while (argc > 1 && argv[op][0] == '-') Line 1263  while (argc > 1 && argv[op][0] == '-')
1263    {    {
1264    unsigned char *endptr;    unsigned char *endptr;
1265    
1266    if (strcmp(argv[op], "-s") == 0 || strcmp(argv[op], "-m") == 0)    if (strcmp(argv[op], "-m") == 0) showstore = 1;
1267      showstore = 1;    else if (strcmp(argv[op], "-s") == 0) force_study = 1;
1268    else if (strcmp(argv[op], "-q") == 0) quiet = 1;    else if (strcmp(argv[op], "-q") == 0) quiet = 1;
1269    else if (strcmp(argv[op], "-b") == 0) debug = 1;    else if (strcmp(argv[op], "-b") == 0) debug = 1;
1270    else if (strcmp(argv[op], "-i") == 0) showinfo = 1;    else if (strcmp(argv[op], "-i") == 0) showinfo = 1;
# Line 909  while (argc > 1 && argv[op][0] == '-') Line 1298  while (argc > 1 && argv[op][0] == '-')
1298        ((stack_size = get_value((unsigned char *)argv[op+1], &endptr)),        ((stack_size = get_value((unsigned char *)argv[op+1], &endptr)),
1299          *endptr == 0))          *endptr == 0))
1300      {      {
1301  #if defined(_WIN32) || defined(WIN32)  #if defined(_WIN32) || defined(WIN32) || defined(__minix)
1302      printf("PCRE: -S not supported on this OS\n");      printf("PCRE: -S not supported on this OS\n");
1303      exit(1);      exit(1);
1304  #else  #else
# Line 1039  while (!done) Line 1428  while (!done)
1428  #endif  #endif
1429    
1430    const char *error;    const char *error;
1431      unsigned char *markptr;
1432    unsigned char *p, *pp, *ppp;    unsigned char *p, *pp, *ppp;
1433    unsigned char *to_file = NULL;    unsigned char *to_file = NULL;
1434    const unsigned char *tables = NULL;    const unsigned char *tables = NULL;
1435    unsigned long int true_size, true_study_size = 0;    unsigned long int true_size, true_study_size = 0;
1436    size_t size, regex_gotten_store;    size_t size, regex_gotten_store;
1437      int do_allcaps = 0;
1438      int do_mark = 0;
1439    int do_study = 0;    int do_study = 0;
1440      int no_force_study = 0;
1441    int do_debug = debug;    int do_debug = debug;
1442    int do_G = 0;    int do_G = 0;
1443    int do_g = 0;    int do_g = 0;
1444    int do_showinfo = showinfo;    int do_showinfo = showinfo;
1445    int do_showrest = 0;    int do_showrest = 0;
1446      int do_showcaprest = 0;
1447    int do_flip = 0;    int do_flip = 0;
1448    int erroroffset, len, delimiter, poffset;    int erroroffset, len, delimiter, poffset;
1449    
# Line 1111  while (!done) Line 1505  while (!done)
1505          }          }
1506        }        }
1507    
1508      fprintf(outfile, "Compiled regex%s loaded from %s\n",      fprintf(outfile, "Compiled pattern%s loaded from %s\n",
1509        do_flip? " (byte-inverted)" : "", p);        do_flip? " (byte-inverted)" : "", p);
1510    
1511      /* Need to know if UTF-8 for printing data strings */      /* Need to know if UTF-8 for printing data strings */
# Line 1119  while (!done) Line 1513  while (!done)
1513      new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options);      new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options);
1514      use_utf8 = (get_options & PCRE_UTF8) != 0;      use_utf8 = (get_options & PCRE_UTF8) != 0;
1515    
1516      /* Now see if there is any following study data */      /* Now see if there is any following study data. */
1517    
1518      if (true_study_size != 0)      if (true_study_size != 0)
1519        {        {
# Line 1161  while (!done) Line 1555  while (!done)
1555      }      }
1556    
1557    pp = p;    pp = p;
1558    poffset = p - buffer;    poffset = (int)(p - buffer);
1559    
1560    for(;;)    for(;;)
1561      {      {
# Line 1215  while (!done) Line 1609  while (!done)
1609        case 's': options |= PCRE_DOTALL; break;        case 's': options |= PCRE_DOTALL; break;
1610        case 'x': options |= PCRE_EXTENDED; break;        case 'x': options |= PCRE_EXTENDED; break;
1611    
1612        case '+': do_showrest = 1; break;        case '+':
1613          if (do_showrest) do_showcaprest = 1; else do_showrest = 1;
1614          break;
1615    
1616          case '=': do_allcaps = 1; break;
1617        case 'A': options |= PCRE_ANCHORED; break;        case 'A': options |= PCRE_ANCHORED; break;
1618        case 'B': do_debug = 1; break;        case 'B': do_debug = 1; break;
1619        case 'C': options |= PCRE_AUTO_CALLOUT; break;        case 'C': options |= PCRE_AUTO_CALLOUT; break;
# Line 1225  while (!done) Line 1623  while (!done)
1623        case 'G': do_G = 1; break;        case 'G': do_G = 1; break;
1624        case 'I': do_showinfo = 1; break;        case 'I': do_showinfo = 1; break;
1625        case 'J': options |= PCRE_DUPNAMES; break;        case 'J': options |= PCRE_DUPNAMES; break;
1626          case 'K': do_mark = 1; break;
1627        case 'M': log_store = 1; break;        case 'M': log_store = 1; break;
1628        case 'N': options |= PCRE_NO_AUTO_CAPTURE; break;        case 'N': options |= PCRE_NO_AUTO_CAPTURE; break;
1629    
# Line 1232  while (!done) Line 1631  while (!done)
1631        case 'P': do_posix = 1; break;        case 'P': do_posix = 1; break;
1632  #endif  #endif
1633    
1634        case 'S': do_study = 1; break;        case 'S':
1635          if (do_study == 0) do_study = 1; else
1636            {
1637            do_study = 0;
1638            no_force_study = 1;
1639            }
1640          break;
1641    
1642        case 'U': options |= PCRE_UNGREEDY; break;        case 'U': options |= PCRE_UNGREEDY; break;
1643          case 'W': options |= PCRE_UCP; break;
1644        case 'X': options |= PCRE_EXTRA; break;        case 'X': options |= PCRE_EXTRA; break;
1645          case 'Y': options |= PCRE_NO_START_OPTIMISE; break;
1646        case 'Z': debug_lengths = 0; break;        case 'Z': debug_lengths = 0; break;
1647        case '8': options |= PCRE_UTF8; use_utf8 = 1; break;        case '8': options |= PCRE_UTF8; use_utf8 = 1; break;
1648        case '?': options |= PCRE_NO_UTF8_CHECK; break;        case '?': options |= PCRE_NO_UTF8_CHECK; break;
1649    
1650          case 'T':
1651          switch (*pp++)
1652            {
1653            case '0': tables = tables0; break;
1654            case '1': tables = tables1; break;
1655    
1656            case '\r':
1657            case '\n':
1658            case ' ':
1659            case 0:
1660            fprintf(outfile, "** Missing table number after /T\n");
1661            goto SKIP_DATA;
1662    
1663            default:
1664            fprintf(outfile, "** Bad table number \"%c\" after /T\n", pp[-1]);
1665            goto SKIP_DATA;
1666            }
1667          break;
1668    
1669        case 'L':        case 'L':
1670        ppp = pp;        ppp = pp;
1671        /* The '\r' test here is so that it works on Windows. */        /* The '\r' test here is so that it works on Windows. */
# Line 1264  while (!done) Line 1691  while (!done)
1691    
1692        case '<':        case '<':
1693          {          {
1694          if (strncmp((char *)pp, "JS>", 3) == 0)          if (strncmpic(pp, (uschar *)"JS>", 3) == 0)
1695            {            {
1696            options |= PCRE_JAVASCRIPT_COMPAT;            options |= PCRE_JAVASCRIPT_COMPAT;
1697            pp += 3;            pp += 3;
# Line 1305  while (!done) Line 1732  while (!done)
1732      if ((options & PCRE_DOTALL) != 0) cflags |= REG_DOTALL;      if ((options & PCRE_DOTALL) != 0) cflags |= REG_DOTALL;
1733      if ((options & PCRE_NO_AUTO_CAPTURE) != 0) cflags |= REG_NOSUB;      if ((options & PCRE_NO_AUTO_CAPTURE) != 0) cflags |= REG_NOSUB;
1734      if ((options & PCRE_UTF8) != 0) cflags |= REG_UTF8;      if ((options & PCRE_UTF8) != 0) cflags |= REG_UTF8;
1735      if ((options & PCRE_UNGREEDY) != 0) cflags |= REG_UNGREEDY;      if ((options & PCRE_UCP) != 0) cflags |= REG_UCP;
1736        if ((options & PCRE_UNGREEDY) != 0) cflags |= REG_UNGREEDY;
1737    
1738      rc = regcomp(&preg, (char *)p, cflags);      rc = regcomp(&preg, (char *)p, cflags);
1739    
# Line 1394  while (!done) Line 1822  while (!done)
1822      true_size = ((real_pcre *)re)->size;      true_size = ((real_pcre *)re)->size;
1823      regex_gotten_store = gotten_store;      regex_gotten_store = gotten_store;
1824    
1825      /* If /S was present, study the regexp to generate additional info to      /* If -s or /S was present, study the regex to generate additional info to
1826      help with the matching. */      help with the matching, unless the pattern has the SS option, which
1827        suppresses the effect of /S (used for a few test patterns where studying is
1828        never sensible). */
1829    
1830      if (do_study)      if (do_study || (force_study && !no_force_study))
1831        {        {
1832        if (timeit > 0)        if (timeit > 0)
1833          {          {
# Line 1419  while (!done) Line 1849  while (!done)
1849          true_study_size = ((pcre_study_data *)(extra->study_data))->size;          true_study_size = ((pcre_study_data *)(extra->study_data))->size;
1850        }        }
1851    
1852        /* If /K was present, we set up for handling MARK data. */
1853    
1854        if (do_mark)
1855          {
1856          if (extra == NULL)
1857            {
1858            extra = (pcre_extra *)malloc(sizeof(pcre_extra));
1859            extra->flags = 0;
1860            }
1861          extra->mark = &markptr;
1862          extra->flags |= PCRE_EXTRA_MARK;
1863          }
1864    
1865      /* If the 'F' option was present, we flip the bytes of all the integer      /* If the 'F' option was present, we flip the bytes of all the integer
1866      fields in the regex data block and the study block. This is to make it      fields in the regex data block and the study block. This is to make it
1867      possible to test PCRE's handling of byte-flipped patterns, e.g. those      possible to test PCRE's handling of byte-flipped patterns, e.g. those
# Line 1538  while (!done) Line 1981  while (!done)
1981        if (do_flip) all_options = byteflip(all_options, sizeof(all_options));        if (do_flip) all_options = byteflip(all_options, sizeof(all_options));
1982    
1983        if (get_options == 0) fprintf(outfile, "No options\n");        if (get_options == 0) fprintf(outfile, "No options\n");
1984          else fprintf(outfile, "Options:%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",          else fprintf(outfile, "Options:%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
1985            ((get_options & PCRE_ANCHORED) != 0)? " anchored" : "",            ((get_options & PCRE_ANCHORED) != 0)? " anchored" : "",
1986            ((get_options & PCRE_CASELESS) != 0)? " caseless" : "",            ((get_options & PCRE_CASELESS) != 0)? " caseless" : "",
1987            ((get_options & PCRE_EXTENDED) != 0)? " extended" : "",            ((get_options & PCRE_EXTENDED) != 0)? " extended" : "",
# Line 1552  while (!done) Line 1995  while (!done)
1995            ((get_options & PCRE_UNGREEDY) != 0)? " ungreedy" : "",            ((get_options & PCRE_UNGREEDY) != 0)? " ungreedy" : "",
1996            ((get_options & PCRE_NO_AUTO_CAPTURE) != 0)? " no_auto_capture" : "",            ((get_options & PCRE_NO_AUTO_CAPTURE) != 0)? " no_auto_capture" : "",
1997            ((get_options & PCRE_UTF8) != 0)? " utf8" : "",            ((get_options & PCRE_UTF8) != 0)? " utf8" : "",
1998              ((get_options & PCRE_UCP) != 0)? " ucp" : "",
1999            ((get_options & PCRE_NO_UTF8_CHECK) != 0)? " no_utf8_check" : "",            ((get_options & PCRE_NO_UTF8_CHECK) != 0)? " no_utf8_check" : "",
2000              ((get_options & PCRE_NO_START_OPTIMIZE) != 0)? " no_start_optimize" : "",
2001            ((get_options & PCRE_DUPNAMES) != 0)? " dupnames" : "");            ((get_options & PCRE_DUPNAMES) != 0)? " dupnames" : "");
2002    
2003        if (jchanged) fprintf(outfile, "Duplicate name status changes\n");        if (jchanged) fprintf(outfile, "Duplicate name status changes\n");
# Line 1620  while (!done) Line 2065  while (!done)
2065        /* Don't output study size; at present it is in any case a fixed        /* Don't output study size; at present it is in any case a fixed
2066        value, but it varies, depending on the computer architecture, and        value, but it varies, depending on the computer architecture, and
2067        so messes up the test suite. (And with the /F option, it might be        so messes up the test suite. (And with the /F option, it might be
2068        flipped.) */        flipped.) If study was forced by an external -s, don't show this
2069          information unless -i or -d was also present. This means that, except
2070          when auto-callouts are involved, the output from runs with and without
2071          -s should be identical. */
2072    
2073        if (do_study)        if (do_study || (force_study && showinfo && !no_force_study))
2074          {          {
2075          if (extra == NULL)          if (extra == NULL)
2076            fprintf(outfile, "Study returned NULL\n");            fprintf(outfile, "Study returned NULL\n");
# Line 1630  while (!done) Line 2078  while (!done)
2078            {            {
2079            uschar *start_bits = NULL;            uschar *start_bits = NULL;
2080            int minlength;            int minlength;
2081    
2082            new_info(re, extra, PCRE_INFO_MINLENGTH, &minlength);            new_info(re, extra, PCRE_INFO_MINLENGTH, &minlength);
2083            fprintf(outfile, "Subject length lower bound = %d\n", minlength);            fprintf(outfile, "Subject length lower bound = %d\n", minlength);
2084    
2085            new_info(re, extra, PCRE_INFO_FIRSTTABLE, &start_bits);            new_info(re, extra, PCRE_INFO_FIRSTTABLE, &start_bits);
2086            if (start_bits == NULL)            if (start_bits == NULL)
2087              fprintf(outfile, "No set of starting bytes\n");              fprintf(outfile, "No set of starting bytes\n");
# Line 1700  while (!done) Line 2148  while (!done)
2148            }            }
2149          else          else
2150            {            {
2151            fprintf(outfile, "Compiled regex written to %s\n", to_file);            fprintf(outfile, "Compiled pattern written to %s\n", to_file);
2152    
2153              /* If there is study data, write it, but verify the writing only
2154              if the studying was requested by /S, not just by -s. */
2155    
2156            if (extra != NULL)            if (extra != NULL)
2157              {              {
2158              if (fwrite(extra->study_data, 1, true_study_size, f) <              if (fwrite(extra->study_data, 1, true_study_size, f) <
# Line 1710  while (!done) Line 2162  while (!done)
2162                  strerror(errno));                  strerror(errno));
2163                }                }
2164              else fprintf(outfile, "Study data written to %s\n", to_file);              else fprintf(outfile, "Study data written to %s\n", to_file);
   
2165              }              }
2166            }            }
2167          fclose(f);          fclose(f);
# Line 1718  while (!done) Line 2169  while (!done)
2169    
2170        new_free(re);        new_free(re);
2171        if (extra != NULL) new_free(extra);        if (extra != NULL) new_free(extra);
2172        if (tables != NULL) new_free((void *)tables);        if (locale_set)
2173            {
2174            new_free((void *)tables);
2175            setlocale(LC_CTYPE, "C");
2176            locale_set = 0;
2177            }
2178        continue;  /* With next regex */        continue;  /* With next regex */
2179        }        }
2180      }        /* End of non-POSIX compile */      }        /* End of non-POSIX compile */
# Line 1740  while (!done) Line 2196  while (!done)
2196      int getlist = 0;      int getlist = 0;
2197      int gmatched = 0;      int gmatched = 0;
2198      int start_offset = 0;      int start_offset = 0;
2199        int start_offset_sign = 1;
2200      int g_notempty = 0;      int g_notempty = 0;
2201      int use_dfa = 0;      int use_dfa = 0;
2202    
# Line 1767  while (!done) Line 2224  while (!done)
2224        {        {
2225        if (extend_inputline(infile, buffer + len, "data> ") == NULL)        if (extend_inputline(infile, buffer + len, "data> ") == NULL)
2226          {          {
2227          if (len > 0) break;          if (len > 0)    /* Reached EOF without hitting a newline */
2228              {
2229              fprintf(outfile, "\n");
2230              break;
2231              }
2232          done = 1;          done = 1;
2233          goto CONTINUE;          goto CONTINUE;
2234          }          }
# Line 1868  while (!done) Line 2329  while (!done)
2329          continue;          continue;
2330    
2331          case '>':          case '>':
2332            if (*p == '-')
2333              {
2334              start_offset_sign = -1;
2335              p++;
2336              }
2337          while(isdigit(*p)) start_offset = start_offset * 10 + *p++ - '0';          while(isdigit(*p)) start_offset = start_offset * 10 + *p++ - '0';
2338            start_offset *= start_offset_sign;
2339          continue;          continue;
2340    
2341          case 'A':  /* Option setting */          case 'A':  /* Option setting */
# Line 1941  while (!done) Line 2408  while (!done)
2408  #endif  #endif
2409            use_dfa = 1;            use_dfa = 1;
2410          continue;          continue;
2411    #endif
2412    
2413    #if !defined NODFA
2414          case 'F':          case 'F':
2415          options |= PCRE_DFA_SHORTEST;          options |= PCRE_DFA_SHORTEST;
2416          continue;          continue;
# Line 1977  while (!done) Line 2446  while (!done)
2446          case 'N':          case 'N':
2447          if ((options & PCRE_NOTEMPTY) != 0)          if ((options & PCRE_NOTEMPTY) != 0)
2448            options = (options & ~PCRE_NOTEMPTY) | PCRE_NOTEMPTY_ATSTART;            options = (options & ~PCRE_NOTEMPTY) | PCRE_NOTEMPTY_ATSTART;
2449          else          else
2450            options |= PCRE_NOTEMPTY;            options |= PCRE_NOTEMPTY;
2451          continue;          continue;
2452    
# Line 2001  while (!done) Line 2470  while (!done)
2470          continue;          continue;
2471    
2472          case 'P':          case 'P':
2473          options |= ((options & PCRE_PARTIAL_SOFT) == 0)?          options |= ((options & PCRE_PARTIAL_SOFT) == 0)?
2474            PCRE_PARTIAL_SOFT : PCRE_PARTIAL_HARD;            PCRE_PARTIAL_SOFT : PCRE_PARTIAL_HARD;
2475          continue;          continue;
2476    
# Line 2061  while (!done) Line 2530  while (!done)
2530        *q++ = c;        *q++ = c;
2531        }        }
2532      *q = 0;      *q = 0;
2533      len = q - dbuffer;      len = (int)(q - dbuffer);
2534    
2535      /* Move the data to the end of the buffer so that a read over the end of      /* Move the data to the end of the buffer so that a read over the end of
2536      the buffer will be seen by valgrind, even if it doesn't cause a crash. If      the buffer will be seen by valgrind, even if it doesn't cause a crash. If
# Line 2124  while (!done) Line 2593  while (!done)
2593              (void)pchars(dbuffer + pmatch[i].rm_so,              (void)pchars(dbuffer + pmatch[i].rm_so,
2594                pmatch[i].rm_eo - pmatch[i].rm_so, outfile);                pmatch[i].rm_eo - pmatch[i].rm_so, outfile);
2595              fprintf(outfile, "\n");              fprintf(outfile, "\n");
2596              if (i == 0 && do_showrest)              if (do_showcaprest || (i == 0 && do_showrest))
2597                {                {
2598                fprintf(outfile, " 0+ ");                fprintf(outfile, "%2d+ ", (int)i);
2599                (void)pchars(dbuffer + pmatch[i].rm_eo, len - pmatch[i].rm_eo,                (void)pchars(dbuffer + pmatch[i].rm_eo, len - pmatch[i].rm_eo,
2600                  outfile);                  outfile);
2601                fprintf(outfile, "\n");                fprintf(outfile, "\n");
# Line 2144  while (!done) Line 2613  while (!done)
2613    
2614      for (;; gmatched++)    /* Loop for /g or /G */      for (;; gmatched++)    /* Loop for /g or /G */
2615        {        {
2616          markptr = NULL;
2617    
2618        if (timeitm > 0)        if (timeitm > 0)
2619          {          {
2620          register int i;          register int i;
# Line 2265  while (!done) Line 2736  while (!done)
2736              do_g = do_G = FALSE;        /* Break g/G loop */              do_g = do_G = FALSE;        /* Break g/G loop */
2737              }              }
2738            }            }
2739    
2740            /* do_allcaps requests showing of all captures in the pattern, to check
2741            unset ones at the end. */
2742    
2743            if (do_allcaps)
2744              {
2745              new_info(re, NULL, PCRE_INFO_CAPTURECOUNT, &count);
2746              count++;   /* Allow for full match */
2747              if (count * 2 > use_size_offsets) count = use_size_offsets/2;
2748              }
2749    
2750            /* Output the captured substrings */
2751    
2752          for (i = 0; i < count * 2; i += 2)          for (i = 0; i < count * 2; i += 2)
2753            {            {
2754            if (use_offsets[i] < 0)            if (use_offsets[i] < 0)
2755                {
2756                if (use_offsets[i] != -1)
2757                  fprintf(outfile, "ERROR: bad negative value %d for offset %d\n",
2758                    use_offsets[i], i);
2759                if (use_offsets[i+1] != -1)
2760                  fprintf(outfile, "ERROR: bad negative value %d for offset %d\n",
2761                    use_offsets[i+1], i+1);
2762              fprintf(outfile, "%2d: <unset>\n", i/2);              fprintf(outfile, "%2d: <unset>\n", i/2);
2763                }
2764            else            else
2765              {              {
2766              fprintf(outfile, "%2d: ", i/2);              fprintf(outfile, "%2d: ", i/2);
2767              (void)pchars(bptr + use_offsets[i],              (void)pchars(bptr + use_offsets[i],
2768                use_offsets[i+1] - use_offsets[i], outfile);                use_offsets[i+1] - use_offsets[i], outfile);
2769              fprintf(outfile, "\n");              fprintf(outfile, "\n");
2770              if (i == 0)              if (do_showcaprest || (i == 0 && do_showrest))
2771                {                {
2772                if (do_showrest)                fprintf(outfile, "%2d+ ", i/2);
2773                  {                (void)pchars(bptr + use_offsets[i+1], len - use_offsets[i+1],
2774                  fprintf(outfile, " 0+ ");                  outfile);
2775                  (void)pchars(bptr + use_offsets[i+1], len - use_offsets[i+1],                fprintf(outfile, "\n");
                   outfile);  
                 fprintf(outfile, "\n");  
                 }  
2776                }                }
2777              }              }
2778            }            }
2779    
2780            if (markptr != NULL) fprintf(outfile, "MK: %s\n", markptr);
2781    
2782          for (i = 0; i < 32; i++)          for (i = 0; i < 32; i++)
2783            {            {
2784            if ((copystrings & (1 << i)) != 0)            if ((copystrings & (1 << i)) != 0)
# Line 2372  while (!done) Line 2862  while (!done)
2862    
2863        else if (count == PCRE_ERROR_PARTIAL)        else if (count == PCRE_ERROR_PARTIAL)
2864          {          {
2865          fprintf(outfile, "Partial match");          if (markptr == NULL) fprintf(outfile, "Partial match");
2866              else fprintf(outfile, "Partial match, mark=%s", markptr);
2867          if (use_size_offsets > 1)          if (use_size_offsets > 1)
2868            {            {
2869            fprintf(outfile, ": ");            fprintf(outfile, ": ");
2870            pchars(bptr + use_offsets[0], use_offsets[1] - use_offsets[0],            pchars(bptr + use_offsets[0], use_offsets[1] - use_offsets[0],
2871              outfile);              outfile);
2872            }            }
2873          fprintf(outfile, "\n");          fprintf(outfile, "\n");
2874          break;  /* Out of the /g loop */          break;  /* Out of the /g loop */
2875          }          }
# Line 2388  while (!done) Line 2879  while (!done)
2879        to advance the start offset, and continue. We won't be at the end of the        to advance the start offset, and continue. We won't be at the end of the
2880        string - that was checked before setting g_notempty.        string - that was checked before setting g_notempty.
2881    
2882        Complication arises in the case when the newline option is "any" or        Complication arises in the case when the newline convention is "any",
2883        "anycrlf". If the previous match was at the end of a line terminated by        "crlf", or "anycrlf". If the previous match was at the end of a line
2884        CRLF, an advance of one character just passes the \r, whereas we should        terminated by CRLF, an advance of one character just passes the \r,
2885        prefer the longer newline sequence, as does the code in pcre_exec().        whereas we should prefer the longer newline sequence, as does the code in
2886        Fudge the offset value to achieve this.        pcre_exec(). Fudge the offset value to achieve this. We check for a
2887          newline setting in the pattern; if none was set, use pcre_config() to
2888          find the default.
2889    
2890        Otherwise, in the case of UTF-8 matching, the advance must be one        Otherwise, in the case of UTF-8 matching, the advance must be one
2891        character, not one byte. */        character, not one byte. */
# Line 2417  while (!done) Line 2910  while (!done)
2910                      (d == -1)? PCRE_NEWLINE_ANY : 0;                      (d == -1)? PCRE_NEWLINE_ANY : 0;
2911              }              }
2912            if (((obits & PCRE_NEWLINE_BITS) == PCRE_NEWLINE_ANY ||            if (((obits & PCRE_NEWLINE_BITS) == PCRE_NEWLINE_ANY ||
2913                   (obits & PCRE_NEWLINE_BITS) == PCRE_NEWLINE_CRLF ||
2914                 (obits & PCRE_NEWLINE_BITS) == PCRE_NEWLINE_ANYCRLF)                 (obits & PCRE_NEWLINE_BITS) == PCRE_NEWLINE_ANYCRLF)
2915                &&                &&
2916                start_offset < len - 1 &&                start_offset < len - 1 &&
# Line 2427  while (!done) Line 2921  while (!done)
2921              {              {
2922              while (start_offset + onechar < len)              while (start_offset + onechar < len)
2923                {                {
2924                int tb = bptr[start_offset+onechar];                if ((bptr[start_offset+onechar] & 0xc0) != 0x80) break;
2925                if (tb <= 127) break;                onechar++;
               tb &= 0xc0;  
               if (tb != 0 && tb != 0xc0) onechar++;  
2926                }                }
2927              }              }
2928            use_offsets[1] = start_offset + onechar;            use_offsets[1] = start_offset + onechar;
2929            }            }
2930          else          else
2931            {            {
2932            if (count == PCRE_ERROR_NOMATCH)            switch(count)
2933              {              {
2934              if (gmatched == 0) fprintf(outfile, "No match\n");              case PCRE_ERROR_NOMATCH:
2935                if (gmatched == 0)
2936                  {
2937                  if (markptr == NULL) fprintf(outfile, "No match\n");
2938                    else fprintf(outfile, "No match, mark = %s\n", markptr);
2939                  }
2940                break;
2941    
2942                case PCRE_ERROR_BADUTF8:
2943                case PCRE_ERROR_SHORTUTF8:
2944                fprintf(outfile, "Error %d (%s UTF-8 string)", count,
2945                  (count == PCRE_ERROR_BADUTF8)? "bad" : "short");
2946                if (use_size_offsets >= 2)
2947                  fprintf(outfile, " offset=%d reason=%d", use_offsets[0],
2948                    use_offsets[1]);
2949                fprintf(outfile, "\n");
2950                break;
2951    
2952                default:
2953                if (count < 0 && (-count) < sizeof(errtexts)/sizeof(const char *))
2954                  fprintf(outfile, "Error %d (%s)\n", count, errtexts[-count]);
2955                else
2956                  fprintf(outfile, "Error %d (Unexpected value)\n", count);
2957                break;
2958              }              }
2959            else fprintf(outfile, "Error %d\n", count);  
2960            break;  /* Out of the /g loop */            break;  /* Out of the /g loop */
2961            }            }
2962          }          }
# Line 2489  while (!done) Line 3004  while (!done)
3004    
3005    if (re != NULL) new_free(re);    if (re != NULL) new_free(re);
3006    if (extra != NULL) new_free(extra);    if (extra != NULL) new_free(extra);
3007    if (tables != NULL)    if (locale_set)
3008      {      {
3009      new_free((void *)tables);      new_free((void *)tables);
3010      setlocale(LC_CTYPE, "C");      setlocale(LC_CTYPE, "C");

Legend:
Removed from v.455  
changed lines
  Added in v.641

webmaster@exim.org
ViewVC Help
Powered by ViewVC 1.1.12