/[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 123 by ph10, Mon Mar 12 15:19:06 2007 UTC revision 537 by ph10, Tue Jun 8 15:28:26 2010 UTC
# Line 36  POSSIBILITY OF SUCH DAMAGE. Line 36  POSSIBILITY OF SUCH DAMAGE.
36  */  */
37    
38    
39    #ifdef HAVE_CONFIG_H
40    #include "config.h"
41    #endif
42    
43  #include <ctype.h>  #include <ctype.h>
44  #include <stdio.h>  #include <stdio.h>
45  #include <string.h>  #include <string.h>
# Line 44  POSSIBILITY OF SUCH DAMAGE. Line 48  POSSIBILITY OF SUCH DAMAGE.
48  #include <locale.h>  #include <locale.h>
49  #include <errno.h>  #include <errno.h>
50    
51    #ifdef SUPPORT_LIBREADLINE
52    #ifdef HAVE_UNISTD_H
53    #include <unistd.h>
54    #endif
55    #include <readline/readline.h>
56    #include <readline/history.h>
57    #endif
58    
59    
60  /* A number of things vary for Windows builds. Originally, pcretest opened its  /* A number of things vary for Windows builds. Originally, pcretest opened its
61  input and output without "b"; then I was told that "b" was needed in some  input and output without "b"; then I was told that "b" was needed in some
# Line 59  input mode under Windows. */ Line 71  input mode under Windows. */
71  #define INPUT_MODE   "r"  #define INPUT_MODE   "r"
72  #define OUTPUT_MODE  "wb"  #define OUTPUT_MODE  "wb"
73    
74    #ifndef isatty
75    #define isatty _isatty         /* This is what Windows calls them, I'm told, */
76    #endif                         /* though in some environments they seem to   */
77                                   /* be already defined, hence the #ifndefs.    */
78    #ifndef fileno
79    #define fileno _fileno
80    #endif
81    
82  #else  #else
83  #include <sys/time.h>          /* These two includes are needed */  #include <sys/time.h>          /* These two includes are needed */
84  #include <sys/resource.h>      /* for setrlimit(). */  #include <sys/resource.h>      /* for setrlimit(). */
# Line 67  input mode under Windows. */ Line 87  input mode under Windows. */
87  #endif  #endif
88    
89    
90  #define PCRE_SPY        /* For Win32 build, import data, not export */  /* We have to include pcre_internal.h because we need the internal info for
91    displaying the results of pcre_study() and we also need to know about the
92  /* We include pcre_internal.h because we need the internal info for displaying  internal macros, structures, and other internal data values; pcretest has
93  the results of pcre_study() and we also need to know about the internal  "inside information" compared to a program that strictly follows the PCRE API.
94  macros, structures, and other internal data values; pcretest has "inside  
95  information" compared to a program that strictly follows the PCRE API. */  Although pcre_internal.h does itself include pcre.h, we explicitly include it
96    here before pcre_internal.h so that the PCRE_EXP_xxx macros get set
97    appropriately for an application, not for building PCRE. */
98    
99    #include "pcre.h"
100  #include "pcre_internal.h"  #include "pcre_internal.h"
101    
102  /* We need access to the data tables that PCRE uses. So as not to have to keep  /* We need access to some of the data tables that PCRE uses. So as not to have
103  two copies, we include the source file here, changing the names of the external  to keep two copies, we include the source file here, changing the names of the
104  symbols to prevent clashes. */  external symbols to prevent clashes. */
105    
106    #define _pcre_ucp_gentype      ucp_gentype
107  #define _pcre_utf8_table1      utf8_table1  #define _pcre_utf8_table1      utf8_table1
108  #define _pcre_utf8_table1_size utf8_table1_size  #define _pcre_utf8_table1_size utf8_table1_size
109  #define _pcre_utf8_table2      utf8_table2  #define _pcre_utf8_table2      utf8_table2
# Line 87  symbols to prevent clashes. */ Line 111  symbols to prevent clashes. */
111  #define _pcre_utf8_table4      utf8_table4  #define _pcre_utf8_table4      utf8_table4
112  #define _pcre_utt              utt  #define _pcre_utt              utt
113  #define _pcre_utt_size         utt_size  #define _pcre_utt_size         utt_size
114    #define _pcre_utt_names        utt_names
115  #define _pcre_OP_lengths       OP_lengths  #define _pcre_OP_lengths       OP_lengths
116    
117  #include "pcre_tables.c"  #include "pcre_tables.c"
118    
119  /* We also need the pcre_printint() function for printing out compiled  /* We also need the pcre_printint() function for printing out compiled
120  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
121  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
122    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. */  
123    
124    #define COMPILING_PCRETEST
125  #include "pcre_printint.src"  #include "pcre_printint.src"
126    
127  #define PRINTHEX(c) (locale_set? isprint(c) : PRINTABLE(c))  /* The definition of the macro PRINTABLE, which determines whether to print an
128    output character as-is or as a hex value when showing compiled patterns, is
129    contained in the printint.src file. We uses it here also, in cases when the
130    locale has not been explicitly changed, so as to get consistent output from
131    systems that differ in their output from isprint() even in the "C" locale. */
132    
133    #define PRINTHEX(c) (locale_set? isprint(c) : PRINTABLE(c))
134    
135  /* It is possible to compile this test program without including support for  /* It is possible to compile this test program without including support for
136  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 149  static int callout_count; Line 175  static int callout_count;
175  static int callout_extra;  static int callout_extra;
176  static int callout_fail_count;  static int callout_fail_count;
177  static int callout_fail_id;  static int callout_fail_id;
178    static int debug_lengths;
179  static int first_callout;  static int first_callout;
180  static int locale_set = 0;  static int locale_set = 0;
181  static int show_malloc;  static int show_malloc;
# Line 180  optimal way of handling this, but hey, t Line 207  optimal way of handling this, but hey, t
207  Arguments:  Arguments:
208    f            the file to read    f            the file to read
209    start        where in buffer to start (this *must* be within buffer)    start        where in buffer to start (this *must* be within buffer)
210      prompt       for stdin or readline()
211    
212  Returns:       pointer to the start of new data  Returns:       pointer to the start of new data
213                 could be a copy of start, or could be moved                 could be a copy of start, or could be moved
# Line 187  Returns: pointer to the start of n Line 215  Returns: pointer to the start of n
215  */  */
216    
217  static uschar *  static uschar *
218  extend_inputline(FILE *f, uschar *start)  extend_inputline(FILE *f, uschar *start, const char *prompt)
219  {  {
220  uschar *here = start;  uschar *here = start;
221    
222  for (;;)  for (;;)
223    {    {
224    int rlen = buffer_size - (here - buffer);    int rlen = (int)(buffer_size - (here - buffer));
225    
226    if (rlen > 1000)    if (rlen > 1000)
227      {      {
228      int dlen;      int dlen;
229      if (fgets((char *)here, rlen,  f) == NULL)  
230        return (here == start)? NULL : start;      /* If libreadline support is required, use readline() to read a line if the
231        input is a terminal. Note that readline() removes the trailing newline, so
232        we must put it back again, to be compatible with fgets(). */
233    
234    #ifdef SUPPORT_LIBREADLINE
235        if (isatty(fileno(f)))
236          {
237          size_t len;
238          char *s = readline(prompt);
239          if (s == NULL) return (here == start)? NULL : start;
240          len = strlen(s);
241          if (len > 0) add_history(s);
242          if (len > rlen - 1) len = rlen - 1;
243          memcpy(here, s, len);
244          here[len] = '\n';
245          here[len+1] = 0;
246          free(s);
247          }
248        else
249    #endif
250    
251        /* Read the next line by normal means, prompting if the file is stdin. */
252    
253          {
254          if (f == stdin) printf("%s", prompt);
255          if (fgets((char *)here, rlen,  f) == NULL)
256            return (here == start)? NULL : start;
257          }
258    
259      dlen = (int)strlen((char *)here);      dlen = (int)strlen((char *)here);
260      if (dlen > 0 && here[dlen - 1] == '\n') return start;      if (dlen > 0 && here[dlen - 1] == '\n') return start;
261      here += dlen;      here += dlen;
# Line 656  return count; Line 712  return count;
712    
713    
714  /*************************************************  /*************************************************
715    *         Case-independent strncmp() function    *
716    *************************************************/
717    
718    /*
719    Arguments:
720      s         first string
721      t         second string
722      n         number of characters to compare
723    
724    Returns:    < 0, = 0, or > 0, according to the comparison
725    */
726    
727    static int
728    strncmpic(uschar *s, uschar *t, int n)
729    {
730    while (n--)
731      {
732      int c = tolower(*s++) - tolower(*t++);
733      if (c) return c;
734      }
735    return 0;
736    }
737    
738    
739    
740    /*************************************************
741  *         Check newline indicator                *  *         Check newline indicator                *
742  *************************************************/  *************************************************/
743    
744  /* 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
745  xxx is LF, CR, CRLF, or ANY. Print a message and return 0 if there is no match.  a message and return 0 if there is no match.
746    
747  Arguments:  Arguments:
748    p           points after the leading '<'    p           points after the leading '<'
# Line 672  Returns: appropriate PCRE_NEWLINE_x Line 754  Returns: appropriate PCRE_NEWLINE_x
754  static int  static int
755  check_newline(uschar *p, FILE *f)  check_newline(uschar *p, FILE *f)
756  {  {
757  if (strncmp((char *)p, "cr>", 3) == 0) return PCRE_NEWLINE_CR;  if (strncmpic(p, (uschar *)"cr>", 3) == 0) return PCRE_NEWLINE_CR;
758  if (strncmp((char *)p, "lf>", 3) == 0) return PCRE_NEWLINE_LF;  if (strncmpic(p, (uschar *)"lf>", 3) == 0) return PCRE_NEWLINE_LF;
759  if (strncmp((char *)p, "crlf>", 5) == 0) return PCRE_NEWLINE_CRLF;  if (strncmpic(p, (uschar *)"crlf>", 5) == 0) return PCRE_NEWLINE_CRLF;
760  if (strncmp((char *)p, "any>", 4) == 0) return PCRE_NEWLINE_ANY;  if (strncmpic(p, (uschar *)"anycrlf>", 8) == 0) return PCRE_NEWLINE_ANYCRLF;
761    if (strncmpic(p, (uschar *)"any>", 4) == 0) return PCRE_NEWLINE_ANY;
762    if (strncmpic(p, (uschar *)"bsr_anycrlf>", 12) == 0) return PCRE_BSR_ANYCRLF;
763    if (strncmpic(p, (uschar *)"bsr_unicode>", 12) == 0) return PCRE_BSR_UNICODE;
764  fprintf(f, "Unknown newline type at: <%s\n", p);  fprintf(f, "Unknown newline type at: <%s\n", p);
765  return 0;  return 0;
766  }  }
# Line 689  return 0; Line 774  return 0;
774  static void  static void
775  usage(void)  usage(void)
776  {  {
777  printf("Usage:     pcretest [options] [<input> [<output>]]\n");  printf("Usage:     pcretest [options] [<input file> [<output file>]]\n\n");
778    printf("Input and output default to stdin and stdout.\n");
779    #ifdef SUPPORT_LIBREADLINE
780    printf("If input is a terminal, readline() is used to read from it.\n");
781    #else
782    printf("This version of pcretest is not linked with readline().\n");
783    #endif
784    printf("\nOptions:\n");
785  printf("  -b       show compiled code (bytecode)\n");  printf("  -b       show compiled code (bytecode)\n");
786  printf("  -C       show PCRE compile-time options and exit\n");  printf("  -C       show PCRE compile-time options and exit\n");
787  printf("  -d       debug: show compiled code and information (-b and -i)\n");  printf("  -d       debug: show compiled code and information (-b and -i)\n");
# Line 698  printf(" -dfa force DFA matching fo Line 790  printf(" -dfa force DFA matching fo
790  #endif  #endif
791  printf("  -help    show usage information\n");  printf("  -help    show usage information\n");
792  printf("  -i       show information about compiled patterns\n"  printf("  -i       show information about compiled patterns\n"
793           "  -M       find MATCH_LIMIT minimum for each subject\n"
794         "  -m       output memory used information\n"         "  -m       output memory used information\n"
795         "  -o <n>   set size of offsets vector to <n>\n");         "  -o <n>   set size of offsets vector to <n>\n");
796  #if !defined NOPOSIX  #if !defined NOPOSIX
# Line 727  int main(int argc, char **argv) Line 820  int main(int argc, char **argv)
820  FILE *infile = stdin;  FILE *infile = stdin;
821  int options = 0;  int options = 0;
822  int study_options = 0;  int study_options = 0;
823    int default_find_match_limit = FALSE;
824  int op = 1;  int op = 1;
825  int timeit = 0;  int timeit = 0;
826  int timeitm = 0;  int timeitm = 0;
# Line 786  while (argc > 1 && argv[op][0] == '-') Line 880  while (argc > 1 && argv[op][0] == '-')
880    else if (strcmp(argv[op], "-b") == 0) debug = 1;    else if (strcmp(argv[op], "-b") == 0) debug = 1;
881    else if (strcmp(argv[op], "-i") == 0) showinfo = 1;    else if (strcmp(argv[op], "-i") == 0) showinfo = 1;
882    else if (strcmp(argv[op], "-d") == 0) showinfo = debug = 1;    else if (strcmp(argv[op], "-d") == 0) showinfo = debug = 1;
883      else if (strcmp(argv[op], "-M") == 0) default_find_match_limit = TRUE;
884  #if !defined NODFA  #if !defined NODFA
885    else if (strcmp(argv[op], "-dfa") == 0) all_use_dfa = 1;    else if (strcmp(argv[op], "-dfa") == 0) all_use_dfa = 1;
886  #endif  #endif
# Line 838  while (argc > 1 && argv[op][0] == '-') Line 933  while (argc > 1 && argv[op][0] == '-')
933    else if (strcmp(argv[op], "-C") == 0)    else if (strcmp(argv[op], "-C") == 0)
934      {      {
935      int rc;      int rc;
936        unsigned long int lrc;
937      printf("PCRE version %s\n", pcre_version());      printf("PCRE version %s\n", pcre_version());
938      printf("Compiled with\n");      printf("Compiled with\n");
939      (void)pcre_config(PCRE_CONFIG_UTF8, &rc);      (void)pcre_config(PCRE_CONFIG_UTF8, &rc);
# Line 845  while (argc > 1 && argv[op][0] == '-') Line 941  while (argc > 1 && argv[op][0] == '-')
941      (void)pcre_config(PCRE_CONFIG_UNICODE_PROPERTIES, &rc);      (void)pcre_config(PCRE_CONFIG_UNICODE_PROPERTIES, &rc);
942      printf("  %sUnicode properties support\n", rc? "" : "No ");      printf("  %sUnicode properties support\n", rc? "" : "No ");
943      (void)pcre_config(PCRE_CONFIG_NEWLINE, &rc);      (void)pcre_config(PCRE_CONFIG_NEWLINE, &rc);
944      printf("  Newline sequence is %s\n", (rc == '\r')? "CR" :      /* Note that these values are always the ASCII values, even
945        (rc == '\n')? "LF" : (rc == ('\r'<<8 | '\n'))? "CRLF" :      in EBCDIC environments. CR is 13 and NL is 10. */
946        printf("  Newline sequence is %s\n", (rc == 13)? "CR" :
947          (rc == 10)? "LF" : (rc == (13<<8 | 10))? "CRLF" :
948          (rc == -2)? "ANYCRLF" :
949        (rc == -1)? "ANY" : "???");        (rc == -1)? "ANY" : "???");
950        (void)pcre_config(PCRE_CONFIG_BSR, &rc);
951        printf("  \\R matches %s\n", rc? "CR, LF, or CRLF only" :
952                                         "all Unicode newlines");
953      (void)pcre_config(PCRE_CONFIG_LINK_SIZE, &rc);      (void)pcre_config(PCRE_CONFIG_LINK_SIZE, &rc);
954      printf("  Internal link size = %d\n", rc);      printf("  Internal link size = %d\n", rc);
955      (void)pcre_config(PCRE_CONFIG_POSIX_MALLOC_THRESHOLD, &rc);      (void)pcre_config(PCRE_CONFIG_POSIX_MALLOC_THRESHOLD, &rc);
956      printf("  POSIX malloc threshold = %d\n", rc);      printf("  POSIX malloc threshold = %d\n", rc);
957      (void)pcre_config(PCRE_CONFIG_MATCH_LIMIT, &rc);      (void)pcre_config(PCRE_CONFIG_MATCH_LIMIT, &lrc);
958      printf("  Default match limit = %d\n", rc);      printf("  Default match limit = %ld\n", lrc);
959      (void)pcre_config(PCRE_CONFIG_MATCH_LIMIT_RECURSION, &rc);      (void)pcre_config(PCRE_CONFIG_MATCH_LIMIT_RECURSION, &lrc);
960      printf("  Default recursion depth limit = %d\n", rc);      printf("  Default recursion depth limit = %ld\n", lrc);
961      (void)pcre_config(PCRE_CONFIG_STACKRECURSE, &rc);      (void)pcre_config(PCRE_CONFIG_STACKRECURSE, &rc);
962      printf("  Match recursion uses %s\n", rc? "stack" : "heap");      printf("  Match recursion uses %s\n", rc? "stack" : "heap");
963      goto EXIT;      goto EXIT;
# Line 884  offsets = (int *)malloc(size_offsets_max Line 986  offsets = (int *)malloc(size_offsets_max
986  if (offsets == NULL)  if (offsets == NULL)
987    {    {
988    printf("** Failed to get %d bytes of memory for offsets vector\n",    printf("** Failed to get %d bytes of memory for offsets vector\n",
989      size_offsets_max * sizeof(int));      (int)(size_offsets_max * sizeof(int)));
990    yield = 1;    yield = 1;
991    goto EXIT;    goto EXIT;
992    }    }
# Line 937  while (!done) Line 1039  while (!done)
1039  #endif  #endif
1040    
1041    const char *error;    const char *error;
1042      unsigned char *markptr;
1043    unsigned char *p, *pp, *ppp;    unsigned char *p, *pp, *ppp;
1044    unsigned char *to_file = NULL;    unsigned char *to_file = NULL;
1045    const unsigned char *tables = NULL;    const unsigned char *tables = NULL;
1046    unsigned long int true_size, true_study_size = 0;    unsigned long int true_size, true_study_size = 0;
1047    size_t size, regex_gotten_store;    size_t size, regex_gotten_store;
1048      int do_mark = 0;
1049    int do_study = 0;    int do_study = 0;
1050    int do_debug = debug;    int do_debug = debug;
   int debug_lengths = 1;  
1051    int do_G = 0;    int do_G = 0;
1052    int do_g = 0;    int do_g = 0;
1053    int do_showinfo = showinfo;    int do_showinfo = showinfo;
# Line 953  while (!done) Line 1056  while (!done)
1056    int erroroffset, len, delimiter, poffset;    int erroroffset, len, delimiter, poffset;
1057    
1058    use_utf8 = 0;    use_utf8 = 0;
1059      debug_lengths = 1;
1060    
1061    if (infile == stdin) printf("  re> ");    if (extend_inputline(infile, buffer, "  re> ") == NULL) break;
   if (extend_inputline(infile, buffer) == NULL) break;  
1062    if (infile != stdin) fprintf(outfile, "%s", (char *)buffer);    if (infile != stdin) fprintf(outfile, "%s", (char *)buffer);
1063    fflush(outfile);    fflush(outfile);
1064    
# Line 1055  while (!done) Line 1158  while (!done)
1158    
1159    if (isalnum(delimiter) || delimiter == '\\')    if (isalnum(delimiter) || delimiter == '\\')
1160      {      {
1161      fprintf(outfile, "** Delimiter must not be alphameric or \\\n");      fprintf(outfile, "** Delimiter must not be alphanumeric or \\\n");
1162      goto SKIP_DATA;      goto SKIP_DATA;
1163      }      }
1164    
1165    pp = p;    pp = p;
1166    poffset = p - buffer;    poffset = (int)(p - buffer);
1167    
1168    for(;;)    for(;;)
1169      {      {
# Line 1071  while (!done) Line 1174  while (!done)
1174        pp++;        pp++;
1175        }        }
1176      if (*pp != 0) break;      if (*pp != 0) break;
1177      if (infile == stdin) printf("    > ");      if ((pp = extend_inputline(infile, pp, "    > ")) == NULL)
     if ((pp = extend_inputline(infile, pp)) == NULL)  
1178        {        {
1179        fprintf(outfile, "** Unexpected EOF\n");        fprintf(outfile, "** Unexpected EOF\n");
1180        done = 1;        done = 1;
# Line 1125  while (!done) Line 1227  while (!done)
1227        case 'G': do_G = 1; break;        case 'G': do_G = 1; break;
1228        case 'I': do_showinfo = 1; break;        case 'I': do_showinfo = 1; break;
1229        case 'J': options |= PCRE_DUPNAMES; break;        case 'J': options |= PCRE_DUPNAMES; break;
1230          case 'K': do_mark = 1; break;
1231        case 'M': log_store = 1; break;        case 'M': log_store = 1; break;
1232        case 'N': options |= PCRE_NO_AUTO_CAPTURE; break;        case 'N': options |= PCRE_NO_AUTO_CAPTURE; break;
1233    
# Line 1134  while (!done) Line 1237  while (!done)
1237    
1238        case 'S': do_study = 1; break;        case 'S': do_study = 1; break;
1239        case 'U': options |= PCRE_UNGREEDY; break;        case 'U': options |= PCRE_UNGREEDY; break;
1240          case 'W': options |= PCRE_UCP; break;
1241        case 'X': options |= PCRE_EXTRA; break;        case 'X': options |= PCRE_EXTRA; break;
1242        case 'Z': debug_lengths = 0;        case 'Z': debug_lengths = 0; break;
1243        case '8': options |= PCRE_UTF8; use_utf8 = 1; break;        case '8': options |= PCRE_UTF8; use_utf8 = 1; break;
1244        case '?': options |= PCRE_NO_UTF8_CHECK; break;        case '?': options |= PCRE_NO_UTF8_CHECK; break;
1245    
# Line 1164  while (!done) Line 1268  while (!done)
1268    
1269        case '<':        case '<':
1270          {          {
1271          int x = check_newline(pp, outfile);          if (strncmpic(pp, (uschar *)"JS>", 3) == 0)
1272          if (x == 0) goto SKIP_DATA;            {
1273          options |= x;            options |= PCRE_JAVASCRIPT_COMPAT;
1274          while (*pp++ != '>');            pp += 3;
1275              }
1276            else
1277              {
1278              int x = check_newline(pp, outfile);
1279              if (x == 0) goto SKIP_DATA;
1280              options |= x;
1281              while (*pp++ != '>');
1282              }
1283          }          }
1284        break;        break;
1285    
# Line 1197  while (!done) Line 1309  while (!done)
1309      if ((options & PCRE_DOTALL) != 0) cflags |= REG_DOTALL;      if ((options & PCRE_DOTALL) != 0) cflags |= REG_DOTALL;
1310      if ((options & PCRE_NO_AUTO_CAPTURE) != 0) cflags |= REG_NOSUB;      if ((options & PCRE_NO_AUTO_CAPTURE) != 0) cflags |= REG_NOSUB;
1311      if ((options & PCRE_UTF8) != 0) cflags |= REG_UTF8;      if ((options & PCRE_UTF8) != 0) cflags |= REG_UTF8;
1312        if ((options & PCRE_UCP) != 0) cflags |= REG_UCP;
1313        if ((options & PCRE_UNGREEDY) != 0) cflags |= REG_UNGREEDY;
1314    
1315      rc = regcomp(&preg, (char *)p, cflags);      rc = regcomp(&preg, (char *)p, cflags);
1316    
# Line 1217  while (!done) Line 1331  while (!done)
1331  #endif  /* !defined NOPOSIX */  #endif  /* !defined NOPOSIX */
1332    
1333      {      {
1334        unsigned long int get_options;
1335    
1336      if (timeit > 0)      if (timeit > 0)
1337        {        {
1338        register int i;        register int i;
# Line 1246  while (!done) Line 1362  while (!done)
1362          {          {
1363          for (;;)          for (;;)
1364            {            {
1365            if (extend_inputline(infile, buffer) == NULL)            if (extend_inputline(infile, buffer, NULL) == NULL)
1366              {              {
1367              done = 1;              done = 1;
1368              goto CONTINUE;              goto CONTINUE;
# Line 1260  while (!done) Line 1376  while (!done)
1376        goto CONTINUE;        goto CONTINUE;
1377        }        }
1378    
1379      /* Compilation succeeded; print data if required. There are now two      /* Compilation succeeded. It is now possible to set the UTF-8 option from
1380      info-returning functions. The old one has a limited interface and      within the regex; check for this so that we know how to process the data
1381      returns only limited data. Check that it agrees with the newer one. */      lines. */
1382    
1383        new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options);
1384        if ((get_options & PCRE_UTF8) != 0) use_utf8 = 1;
1385    
1386        /* Print information if required. There are now two info-returning
1387        functions. The old one has a limited interface and returns only limited
1388        data. Check that it agrees with the newer one. */
1389    
1390      if (log_store)      if (log_store)
1391        fprintf(outfile, "Memory allocation (code space): %d\n",        fprintf(outfile, "Memory allocation (code space): %d\n",
# Line 1301  while (!done) Line 1424  while (!done)
1424          true_study_size = ((pcre_study_data *)(extra->study_data))->size;          true_study_size = ((pcre_study_data *)(extra->study_data))->size;
1425        }        }
1426    
1427        /* If /K was present, we set up for handling MARK data. */
1428    
1429        if (do_mark)
1430          {
1431          if (extra == NULL)
1432            {
1433            extra = (pcre_extra *)malloc(sizeof(pcre_extra));
1434            extra->flags = 0;
1435            }
1436          extra->mark = &markptr;
1437          extra->flags |= PCRE_EXTRA_MARK;
1438          }
1439    
1440      /* 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
1441      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
1442      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 1309  while (!done) Line 1445  while (!done)
1445      if (do_flip)      if (do_flip)
1446        {        {
1447        real_pcre *rre = (real_pcre *)re;        real_pcre *rre = (real_pcre *)re;
1448        rre->magic_number = byteflip(rre->magic_number, sizeof(rre->magic_number));        rre->magic_number =
1449            byteflip(rre->magic_number, sizeof(rre->magic_number));
1450        rre->size = byteflip(rre->size, sizeof(rre->size));        rre->size = byteflip(rre->size, sizeof(rre->size));
1451        rre->options = byteflip(rre->options, sizeof(rre->options));        rre->options = byteflip(rre->options, sizeof(rre->options));
1452        rre->top_bracket = byteflip(rre->top_bracket, sizeof(rre->top_bracket));        rre->flags = (pcre_uint16)byteflip(rre->flags, sizeof(rre->flags));
1453        rre->top_backref = byteflip(rre->top_backref, sizeof(rre->top_backref));        rre->top_bracket =
1454        rre->first_byte = byteflip(rre->first_byte, sizeof(rre->first_byte));          (pcre_uint16)byteflip(rre->top_bracket, sizeof(rre->top_bracket));
1455        rre->req_byte = byteflip(rre->req_byte, sizeof(rre->req_byte));        rre->top_backref =
1456        rre->name_table_offset = byteflip(rre->name_table_offset,          (pcre_uint16)byteflip(rre->top_backref, sizeof(rre->top_backref));
1457          rre->first_byte =
1458            (pcre_uint16)byteflip(rre->first_byte, sizeof(rre->first_byte));
1459          rre->req_byte =
1460            (pcre_uint16)byteflip(rre->req_byte, sizeof(rre->req_byte));
1461          rre->name_table_offset = (pcre_uint16)byteflip(rre->name_table_offset,
1462          sizeof(rre->name_table_offset));          sizeof(rre->name_table_offset));
1463        rre->name_entry_size = byteflip(rre->name_entry_size,        rre->name_entry_size = (pcre_uint16)byteflip(rre->name_entry_size,
1464          sizeof(rre->name_entry_size));          sizeof(rre->name_entry_size));
1465        rre->name_count = byteflip(rre->name_count, sizeof(rre->name_count));        rre->name_count = (pcre_uint16)byteflip(rre->name_count,
1466            sizeof(rre->name_count));
1467    
1468        if (extra != NULL)        if (extra != NULL)
1469          {          {
1470          pcre_study_data *rsd = (pcre_study_data *)(extra->study_data);          pcre_study_data *rsd = (pcre_study_data *)(extra->study_data);
1471          rsd->size = byteflip(rsd->size, sizeof(rsd->size));          rsd->size = byteflip(rsd->size, sizeof(rsd->size));
1472          rsd->options = byteflip(rsd->options, sizeof(rsd->options));          rsd->flags = byteflip(rsd->flags, sizeof(rsd->flags));
1473            rsd->minlength = byteflip(rsd->minlength, sizeof(rsd->minlength));
1474          }          }
1475        }        }
1476    
# Line 1340  while (!done) Line 1484  while (!done)
1484        pcre_printint(re, outfile, debug_lengths);        pcre_printint(re, outfile, debug_lengths);
1485        }        }
1486    
1487        /* We already have the options in get_options (see above) */
1488    
1489      if (do_showinfo)      if (do_showinfo)
1490        {        {
1491        unsigned long int get_options, all_options;        unsigned long int all_options;
1492  #if !defined NOINFOCHECK  #if !defined NOINFOCHECK
1493        int old_first_char, old_options, old_count;        int old_first_char, old_options, old_count;
1494  #endif  #endif
1495        int count, backrefmax, first_char, need_char;        int count, backrefmax, first_char, need_char, okpartial, jchanged,
1496            hascrorlf;
1497        int nameentrysize, namecount;        int nameentrysize, namecount;
1498        const uschar *nametable;        const uschar *nametable;
1499    
       new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options);  
1500        new_info(re, NULL, PCRE_INFO_SIZE, &size);        new_info(re, NULL, PCRE_INFO_SIZE, &size);
1501        new_info(re, NULL, PCRE_INFO_CAPTURECOUNT, &count);        new_info(re, NULL, PCRE_INFO_CAPTURECOUNT, &count);
1502        new_info(re, NULL, PCRE_INFO_BACKREFMAX, &backrefmax);        new_info(re, NULL, PCRE_INFO_BACKREFMAX, &backrefmax);
# Line 1359  while (!done) Line 1505  while (!done)
1505        new_info(re, NULL, PCRE_INFO_NAMEENTRYSIZE, &nameentrysize);        new_info(re, NULL, PCRE_INFO_NAMEENTRYSIZE, &nameentrysize);
1506        new_info(re, NULL, PCRE_INFO_NAMECOUNT, &namecount);        new_info(re, NULL, PCRE_INFO_NAMECOUNT, &namecount);
1507        new_info(re, NULL, PCRE_INFO_NAMETABLE, (void *)&nametable);        new_info(re, NULL, PCRE_INFO_NAMETABLE, (void *)&nametable);
1508          new_info(re, NULL, PCRE_INFO_OKPARTIAL, &okpartial);
1509          new_info(re, NULL, PCRE_INFO_JCHANGED, &jchanged);
1510          new_info(re, NULL, PCRE_INFO_HASCRORLF, &hascrorlf);
1511    
1512  #if !defined NOINFOCHECK  #if !defined NOINFOCHECK
1513        old_count = pcre_info(re, &old_options, &old_first_char);        old_count = pcre_info(re, &old_options, &old_first_char);
# Line 1400  while (!done) Line 1549  while (!done)
1549            }            }
1550          }          }
1551    
1552        /* The NOPARTIAL bit is a private bit in the options, so we have        if (!okpartial) fprintf(outfile, "Partial matching not supported\n");
1553        to fish it out via out back door */        if (hascrorlf) fprintf(outfile, "Contains explicit CR or LF match\n");
1554    
1555        all_options = ((real_pcre *)re)->options;        all_options = ((real_pcre *)re)->options;
1556        if (do_flip)        if (do_flip) all_options = byteflip(all_options, sizeof(all_options));
         {  
         all_options = byteflip(all_options, sizeof(all_options));  
          }  
   
       if ((all_options & PCRE_NOPARTIAL) != 0)  
         fprintf(outfile, "Partial matching not supported\n");  
1557    
1558        if (get_options == 0) fprintf(outfile, "No options\n");        if (get_options == 0) fprintf(outfile, "No options\n");
1559          else fprintf(outfile, "Options:%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\n",
1560            ((get_options & PCRE_ANCHORED) != 0)? " anchored" : "",            ((get_options & PCRE_ANCHORED) != 0)? " anchored" : "",
1561            ((get_options & PCRE_CASELESS) != 0)? " caseless" : "",            ((get_options & PCRE_CASELESS) != 0)? " caseless" : "",
1562            ((get_options & PCRE_EXTENDED) != 0)? " extended" : "",            ((get_options & PCRE_EXTENDED) != 0)? " extended" : "",
1563            ((get_options & PCRE_MULTILINE) != 0)? " multiline" : "",            ((get_options & PCRE_MULTILINE) != 0)? " multiline" : "",
1564            ((get_options & PCRE_FIRSTLINE) != 0)? " firstline" : "",            ((get_options & PCRE_FIRSTLINE) != 0)? " firstline" : "",
1565            ((get_options & PCRE_DOTALL) != 0)? " dotall" : "",            ((get_options & PCRE_DOTALL) != 0)? " dotall" : "",
1566              ((get_options & PCRE_BSR_ANYCRLF) != 0)? " bsr_anycrlf" : "",
1567              ((get_options & PCRE_BSR_UNICODE) != 0)? " bsr_unicode" : "",
1568            ((get_options & PCRE_DOLLAR_ENDONLY) != 0)? " dollar_endonly" : "",            ((get_options & PCRE_DOLLAR_ENDONLY) != 0)? " dollar_endonly" : "",
1569            ((get_options & PCRE_EXTRA) != 0)? " extra" : "",            ((get_options & PCRE_EXTRA) != 0)? " extra" : "",
1570            ((get_options & PCRE_UNGREEDY) != 0)? " ungreedy" : "",            ((get_options & PCRE_UNGREEDY) != 0)? " ungreedy" : "",
1571            ((get_options & PCRE_NO_AUTO_CAPTURE) != 0)? " no_auto_capture" : "",            ((get_options & PCRE_NO_AUTO_CAPTURE) != 0)? " no_auto_capture" : "",
1572            ((get_options & PCRE_UTF8) != 0)? " utf8" : "",            ((get_options & PCRE_UTF8) != 0)? " utf8" : "",
1573              ((get_options & PCRE_UCP) != 0)? " ucp" : "",
1574            ((get_options & PCRE_NO_UTF8_CHECK) != 0)? " no_utf8_check" : "",            ((get_options & PCRE_NO_UTF8_CHECK) != 0)? " no_utf8_check" : "",
1575            ((get_options & PCRE_DUPNAMES) != 0)? " dupnames" : "");            ((get_options & PCRE_DUPNAMES) != 0)? " dupnames" : "");
1576    
1577          if (jchanged) fprintf(outfile, "Duplicate name status changes\n");
1578    
1579        switch (get_options & PCRE_NEWLINE_BITS)        switch (get_options & PCRE_NEWLINE_BITS)
1580          {          {
1581          case PCRE_NEWLINE_CR:          case PCRE_NEWLINE_CR:
# Line 1442  while (!done) Line 1590  while (!done)
1590          fprintf(outfile, "Forced newline sequence: CRLF\n");          fprintf(outfile, "Forced newline sequence: CRLF\n");
1591          break;          break;
1592    
1593            case PCRE_NEWLINE_ANYCRLF:
1594            fprintf(outfile, "Forced newline sequence: ANYCRLF\n");
1595            break;
1596    
1597          case PCRE_NEWLINE_ANY:          case PCRE_NEWLINE_ANY:
1598          fprintf(outfile, "Forced newline sequence: ANY\n");          fprintf(outfile, "Forced newline sequence: ANY\n");
1599          break;          break;
# Line 1496  while (!done) Line 1648  while (!done)
1648          else          else
1649            {            {
1650            uschar *start_bits = NULL;            uschar *start_bits = NULL;
1651            new_info(re, extra, PCRE_INFO_FIRSTTABLE, &start_bits);            int minlength;
1652    
1653              new_info(re, extra, PCRE_INFO_MINLENGTH, &minlength);
1654              fprintf(outfile, "Subject length lower bound = %d\n", minlength);
1655    
1656              new_info(re, extra, PCRE_INFO_FIRSTTABLE, &start_bits);
1657            if (start_bits == NULL)            if (start_bits == NULL)
1658              fprintf(outfile, "No starting byte set\n");              fprintf(outfile, "No set of starting bytes\n");
1659            else            else
1660              {              {
1661              int i;              int i;
# Line 1546  while (!done) Line 1702  while (!done)
1702        else        else
1703          {          {
1704          uschar sbuf[8];          uschar sbuf[8];
1705          sbuf[0] = (true_size >> 24)  & 255;          sbuf[0] = (uschar)((true_size >> 24) & 255);
1706          sbuf[1] = (true_size >> 16)  & 255;          sbuf[1] = (uschar)((true_size >> 16) & 255);
1707          sbuf[2] = (true_size >>  8)  & 255;          sbuf[2] = (uschar)((true_size >>  8) & 255);
1708          sbuf[3] = (true_size)  & 255;          sbuf[3] = (uschar)((true_size) & 255);
1709    
1710          sbuf[4] = (true_study_size >> 24)  & 255;          sbuf[4] = (uschar)((true_study_size >> 24) & 255);
1711          sbuf[5] = (true_study_size >> 16)  & 255;          sbuf[5] = (uschar)((true_study_size >> 16) & 255);
1712          sbuf[6] = (true_study_size >>  8)  & 255;          sbuf[6] = (uschar)((true_study_size >>  8) & 255);
1713          sbuf[7] = (true_study_size)  & 255;          sbuf[7] = (uschar)((true_study_size) & 255);
1714    
1715          if (fwrite(sbuf, 1, 8, f) < 8 ||          if (fwrite(sbuf, 1, 8, f) < 8 ||
1716              fwrite(re, 1, true_size, f) < true_size)              fwrite(re, 1, true_size, f) < true_size)
# Line 1591  while (!done) Line 1747  while (!done)
1747    for (;;)    for (;;)
1748      {      {
1749      uschar *q;      uschar *q;
1750      uschar *bptr = dbuffer;      uschar *bptr;
1751      int *use_offsets = offsets;      int *use_offsets = offsets;
1752      int use_size_offsets = size_offsets;      int use_size_offsets = size_offsets;
1753      int callout_data = 0;      int callout_data = 0;
1754      int callout_data_set = 0;      int callout_data_set = 0;
1755      int count, c;      int count, c;
1756      int copystrings = 0;      int copystrings = 0;
1757      int find_match_limit = 0;      int find_match_limit = default_find_match_limit;
1758      int getstrings = 0;      int getstrings = 0;
1759      int getlist = 0;      int getlist = 0;
1760      int gmatched = 0;      int gmatched = 0;
# Line 1628  while (!done) Line 1784  while (!done)
1784      len = 0;      len = 0;
1785      for (;;)      for (;;)
1786        {        {
1787        if (infile == stdin) printf("data> ");        if (extend_inputline(infile, buffer + len, "data> ") == NULL)
       if (extend_inputline(infile, buffer + len) == NULL)  
1788          {          {
1789          if (len > 0) break;          if (len > 0)    /* Reached EOF without hitting a newline */
1790              {
1791              fprintf(outfile, "\n");
1792              break;
1793              }
1794          done = 1;          done = 1;
1795          goto CONTINUE;          goto CONTINUE;
1796          }          }
# Line 1647  while (!done) Line 1806  while (!done)
1806      p = buffer;      p = buffer;
1807      while (isspace(*p)) p++;      while (isspace(*p)) p++;
1808    
1809      q = dbuffer;      bptr = q = dbuffer;
1810      while ((c = *p++) != 0)      while ((c = *p++) != 0)
1811        {        {
1812        int i = 0;        int i = 0;
# Line 1697  while (!done) Line 1856  while (!done)
1856              {              {
1857              unsigned char buff8[8];              unsigned char buff8[8];
1858              int ii, utn;              int ii, utn;
1859              utn = ord2utf8(c, buff8);              if (use_utf8)
1860              for (ii = 0; ii < utn - 1; ii++) *q++ = buff8[ii];                {
1861              c = buff8[ii];   /* Last byte */                utn = ord2utf8(c, buff8);
1862                  for (ii = 0; ii < utn - 1; ii++) *q++ = buff8[ii];
1863                  c = buff8[ii];   /* Last byte */
1864                  }
1865                else
1866                 {
1867                 if (c > 255)
1868                   fprintf(outfile, "** Character \\x{%x} is greater than 255 and "
1869                     "UTF-8 mode is not enabled.\n"
1870                     "** Truncation will probably give the wrong result.\n", c);
1871                 }
1872              p = pt + 1;              p = pt + 1;
1873              break;              break;
1874              }              }
# Line 1829  while (!done) Line 1998  while (!done)
1998          continue;          continue;
1999    
2000          case 'N':          case 'N':
2001          options |= PCRE_NOTEMPTY;          if ((options & PCRE_NOTEMPTY) != 0)
2002              options = (options & ~PCRE_NOTEMPTY) | PCRE_NOTEMPTY_ATSTART;
2003            else
2004              options |= PCRE_NOTEMPTY;
2005          continue;          continue;
2006    
2007          case 'O':          case 'O':
# Line 1842  while (!done) Line 2014  while (!done)
2014            if (offsets == NULL)            if (offsets == NULL)
2015              {              {
2016              printf("** Failed to get %d bytes of memory for offsets vector\n",              printf("** Failed to get %d bytes of memory for offsets vector\n",
2017                size_offsets_max * sizeof(int));                (int)(size_offsets_max * sizeof(int)));
2018              yield = 1;              yield = 1;
2019              goto EXIT;              goto EXIT;
2020              }              }
# Line 1852  while (!done) Line 2024  while (!done)
2024          continue;          continue;
2025    
2026          case 'P':          case 'P':
2027          options |= PCRE_PARTIAL;          options |= ((options & PCRE_PARTIAL_SOFT) == 0)?
2028              PCRE_PARTIAL_SOFT : PCRE_PARTIAL_HARD;
2029          continue;          continue;
2030    
2031          case 'Q':          case 'Q':
# Line 1887  while (!done) Line 2060  while (!done)
2060          show_malloc = 1;          show_malloc = 1;
2061          continue;          continue;
2062    
2063            case 'Y':
2064            options |= PCRE_NO_START_OPTIMIZE;
2065            continue;
2066    
2067          case 'Z':          case 'Z':
2068          options |= PCRE_NOTEOL;          options |= PCRE_NOTEOL;
2069          continue;          continue;
# Line 1907  while (!done) Line 2084  while (!done)
2084        *q++ = c;        *q++ = c;
2085        }        }
2086      *q = 0;      *q = 0;
2087      len = q - dbuffer;      len = (int)(q - dbuffer);
2088    
2089        /* Move the data to the end of the buffer so that a read over the end of
2090        the buffer will be seen by valgrind, even if it doesn't cause a crash. If
2091        we are using the POSIX interface, we must include the terminating zero. */
2092    
2093    #if !defined NOPOSIX
2094        if (posix || do_posix)
2095          {
2096          memmove(bptr + buffer_size - len - 1, bptr, len + 1);
2097          bptr += buffer_size - len - 1;
2098          }
2099        else
2100    #endif
2101          {
2102          memmove(bptr + buffer_size - len, bptr, len);
2103          bptr += buffer_size - len;
2104          }
2105    
2106      if ((all_use_dfa || use_dfa) && find_match_limit)      if ((all_use_dfa || use_dfa) && find_match_limit)
2107        {        {
# Line 1928  while (!done) Line 2122  while (!done)
2122          pmatch = (regmatch_t *)malloc(sizeof(regmatch_t) * use_size_offsets);          pmatch = (regmatch_t *)malloc(sizeof(regmatch_t) * use_size_offsets);
2123        if ((options & PCRE_NOTBOL) != 0) eflags |= REG_NOTBOL;        if ((options & PCRE_NOTBOL) != 0) eflags |= REG_NOTBOL;
2124        if ((options & PCRE_NOTEOL) != 0) eflags |= REG_NOTEOL;        if ((options & PCRE_NOTEOL) != 0) eflags |= REG_NOTEOL;
2125          if ((options & PCRE_NOTEMPTY) != 0) eflags |= REG_NOTEMPTY;
2126    
2127        rc = regexec(&preg, (const char *)bptr, use_size_offsets, pmatch, eflags);        rc = regexec(&preg, (const char *)bptr, use_size_offsets, pmatch, eflags);
2128    
# Line 1972  while (!done) Line 2167  while (!done)
2167    
2168      for (;; gmatched++)    /* Loop for /g or /G */      for (;; gmatched++)    /* Loop for /g or /G */
2169        {        {
2170          markptr = NULL;
2171    
2172        if (timeitm > 0)        if (timeitm > 0)
2173          {          {
2174          register int i;          register int i;
# Line 1983  while (!done) Line 2180  while (!done)
2180            {            {
2181            int workspace[1000];            int workspace[1000];
2182            for (i = 0; i < timeitm; i++)            for (i = 0; i < timeitm; i++)
2183              count = pcre_dfa_exec(re, NULL, (char *)bptr, len, start_offset,              count = pcre_dfa_exec(re, extra, (char *)bptr, len, start_offset,
2184                options | g_notempty, use_offsets, use_size_offsets, workspace,                options | g_notempty, use_offsets, use_size_offsets, workspace,
2185                sizeof(workspace)/sizeof(int));                sizeof(workspace)/sizeof(int));
2186            }            }
# Line 2046  while (!done) Line 2243  while (!done)
2243        else if (all_use_dfa || use_dfa)        else if (all_use_dfa || use_dfa)
2244          {          {
2245          int workspace[1000];          int workspace[1000];
2246          count = pcre_dfa_exec(re, NULL, (char *)bptr, len, start_offset,          count = pcre_dfa_exec(re, extra, (char *)bptr, len, start_offset,
2247            options | g_notempty, use_offsets, use_size_offsets, workspace,            options | g_notempty, use_offsets, use_size_offsets, workspace,
2248            sizeof(workspace)/sizeof(int));            sizeof(workspace)/sizeof(int));
2249          if (count == 0)          if (count == 0)
# Line 2117  while (!done) Line 2314  while (!done)
2314              }              }
2315            }            }
2316    
2317            if (markptr != NULL) fprintf(outfile, "MK: %s\n", markptr);
2318    
2319          for (i = 0; i < 32; i++)          for (i = 0; i < 32; i++)
2320            {            {
2321            if ((copystrings & (1 << i)) != 0)            if ((copystrings & (1 << i)) != 0)
# Line 2200  while (!done) Line 2399  while (!done)
2399    
2400        else if (count == PCRE_ERROR_PARTIAL)        else if (count == PCRE_ERROR_PARTIAL)
2401          {          {
2402          fprintf(outfile, "Partial match");          if (markptr == NULL) fprintf(outfile, "Partial match");
2403  #if !defined NODFA            else fprintf(outfile, "Partial match, mark=%s", markptr);
2404          if ((all_use_dfa || use_dfa) && use_size_offsets > 2)          if (use_size_offsets > 1)
2405            fprintf(outfile, ": %.*s", use_offsets[1] - use_offsets[0],            {
2406              bptr + use_offsets[0]);            fprintf(outfile, ": ");
2407  #endif            pchars(bptr + use_offsets[0], use_offsets[1] - use_offsets[0],
2408                outfile);
2409              }
2410          fprintf(outfile, "\n");          fprintf(outfile, "\n");
2411          break;  /* Out of the /g loop */          break;  /* Out of the /g loop */
2412          }          }
2413    
2414        /* Failed to match. If this is a /g or /G loop and we previously set        /* Failed to match. If this is a /g or /G loop and we previously set
2415        g_notempty after a null match, this is not necessarily the end.        g_notempty after a null match, this is not necessarily the end. We want
2416        We want to advance the start offset, and continue. In the case of UTF-8        to advance the start offset, and continue. We won't be at the end of the
2417        matching, the advance must be one character, not one byte. Fudge the        string - that was checked before setting g_notempty.
2418        offset values to achieve this. We won't be at the end of the string -  
2419        that was checked before setting g_notempty. */        Complication arises in the case when the newline option is "any" or
2420          "anycrlf". If the previous match was at the end of a line terminated by
2421          CRLF, an advance of one character just passes the \r, whereas we should
2422          prefer the longer newline sequence, as does the code in pcre_exec().
2423          Fudge the offset value to achieve this.
2424    
2425          Otherwise, in the case of UTF-8 matching, the advance must be one
2426          character, not one byte. */
2427    
2428        else        else
2429          {          {
2430          if (g_notempty != 0)          if (g_notempty != 0)
2431            {            {
2432            int onechar = 1;            int onechar = 1;
2433              unsigned int obits = ((real_pcre *)re)->options;
2434            use_offsets[0] = start_offset;            use_offsets[0] = start_offset;
2435            if (use_utf8)            if ((obits & PCRE_NEWLINE_BITS) == 0)
2436                {
2437                int d;
2438                (void)pcre_config(PCRE_CONFIG_NEWLINE, &d);
2439                /* Note that these values are always the ASCII ones, even in
2440                EBCDIC environments. CR = 13, NL = 10. */
2441                obits = (d == 13)? PCRE_NEWLINE_CR :
2442                        (d == 10)? PCRE_NEWLINE_LF :
2443                        (d == (13<<8 | 10))? PCRE_NEWLINE_CRLF :
2444                        (d == -2)? PCRE_NEWLINE_ANYCRLF :
2445                        (d == -1)? PCRE_NEWLINE_ANY : 0;
2446                }
2447              if (((obits & PCRE_NEWLINE_BITS) == PCRE_NEWLINE_ANY ||
2448                   (obits & PCRE_NEWLINE_BITS) == PCRE_NEWLINE_ANYCRLF)
2449                  &&
2450                  start_offset < len - 1 &&
2451                  bptr[start_offset] == '\r' &&
2452                  bptr[start_offset+1] == '\n')
2453                onechar++;
2454              else if (use_utf8)
2455              {              {
2456              while (start_offset + onechar < len)              while (start_offset + onechar < len)
2457                {                {
# Line 2239  while (!done) Line 2467  while (!done)
2467            {            {
2468            if (count == PCRE_ERROR_NOMATCH)            if (count == PCRE_ERROR_NOMATCH)
2469              {              {
2470              if (gmatched == 0) fprintf(outfile, "No match\n");              if (gmatched == 0)
2471                  {
2472                  if (markptr == NULL) fprintf(outfile, "No match\n");
2473                    else fprintf(outfile, "No match, mark = %s\n", markptr);
2474                  }
2475              }              }
2476            else fprintf(outfile, "Error %d\n", count);            else fprintf(outfile, "Error %d\n", count);
2477            break;  /* Out of the /g loop */            break;  /* Out of the /g loop */
# Line 2251  while (!done) Line 2483  while (!done)
2483        if (!do_g && !do_G) break;        if (!do_g && !do_G) break;
2484    
2485        /* If we have matched an empty string, first check to see if we are at        /* If we have matched an empty string, first check to see if we are at
2486        the end of the subject. If so, the /g loop is over. Otherwise, mimic        the end of the subject. If so, the /g loop is over. Otherwise, mimic what
2487        what Perl's /g options does. This turns out to be rather cunning. First        Perl's /g options does. This turns out to be rather cunning. First we set
2488        we set PCRE_NOTEMPTY and PCRE_ANCHORED and try the match again at the        PCRE_NOTEMPTY_ATSTART and PCRE_ANCHORED and try the match again at the
2489        same point. If this fails (picked up above) we advance to the next        same point. If this fails (picked up above) we advance to the next
2490        character. */        character. */
2491    
2492        g_notempty = 0;        g_notempty = 0;
2493    
2494        if (use_offsets[0] == use_offsets[1])        if (use_offsets[0] == use_offsets[1])
2495          {          {
2496          if (use_offsets[0] == len) break;          if (use_offsets[0] == len) break;
2497          g_notempty = PCRE_NOTEMPTY | PCRE_ANCHORED;          g_notempty = PCRE_NOTEMPTY_ATSTART | PCRE_ANCHORED;
2498          }          }
2499    
2500        /* For /g, update the start offset, leaving the rest alone */        /* For /g, update the start offset, leaving the rest alone */

Legend:
Removed from v.123  
changed lines
  Added in v.537

webmaster@exim.org
ViewVC Help
Powered by ViewVC 1.1.12