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

Diff of /code/trunk/pcretest.c

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

revision 96 by nigel, Fri Mar 2 13:10:43 2007 UTC revision 411 by ph10, Fri Apr 10 15:40:21 2009 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"
# Line 114  Makefile. */ Line 139  Makefile. */
139  #include "pcreposix.h"  #include "pcreposix.h"
140  #endif  #endif
141    
142  /* It is also possible, for the benefit of the version imported into Exim, to  /* It is also possible, for the benefit of the version currently imported into
143  build pcretest without support for UTF8 (define NOUTF8), without the interface  Exim, to build pcretest without support for UTF8 (define NOUTF8), without the
144  to the DFA matcher (NODFA), and without the doublecheck of the old "info"  interface to the DFA matcher (NODFA), and without the doublecheck of the old
145  function (define NOINFOCHECK). */  "info" function (define NOINFOCHECK). In fact, we automatically cut out the
146    UTF8 support if PCRE is built without it. */
147    
148    #ifndef SUPPORT_UTF8
149    #ifndef NOUTF8
150    #define NOUTF8
151    #endif
152    #endif
153    
154    
155  /* Other parameters */  /* Other parameters */
# Line 142  static int callout_count; Line 174  static int callout_count;
174  static int callout_extra;  static int callout_extra;
175  static int callout_fail_count;  static int callout_fail_count;
176  static int callout_fail_id;  static int callout_fail_id;
177    static int debug_lengths;
178  static int first_callout;  static int first_callout;
179  static int locale_set = 0;  static int locale_set = 0;
180  static int show_malloc;  static int show_malloc;
# Line 173  optimal way of handling this, but hey, t Line 206  optimal way of handling this, but hey, t
206  Arguments:  Arguments:
207    f            the file to read    f            the file to read
208    start        where in buffer to start (this *must* be within buffer)    start        where in buffer to start (this *must* be within buffer)
209      prompt       for stdin or readline()
210    
211  Returns:       pointer to the start of new data  Returns:       pointer to the start of new data
212                 could be a copy of start, or could be moved                 could be a copy of start, or could be moved
# Line 180  Returns:       pointer to the start of n Line 214  Returns:       pointer to the start of n
214  */  */
215    
216  static uschar *  static uschar *
217  extend_inputline(FILE *f, uschar *start)  extend_inputline(FILE *f, uschar *start, const char *prompt)
218  {  {
219  uschar *here = start;  uschar *here = start;
220    
# Line 191  for (;;) Line 225  for (;;)
225    if (rlen > 1000)    if (rlen > 1000)
226      {      {
227      int dlen;      int dlen;
228      if (fgets((char *)here, rlen,  f) == NULL)  
229        return (here == start)? NULL : start;      /* If libreadline support is required, use readline() to read a line if the
230        input is a terminal. Note that readline() removes the trailing newline, so
231        we must put it back again, to be compatible with fgets(). */
232    
233    #ifdef SUPPORT_LIBREADLINE
234        if (isatty(fileno(f)))
235          {
236          size_t len;
237          char *s = readline(prompt);
238          if (s == NULL) return (here == start)? NULL : start;
239          len = strlen(s);
240          if (len > 0) add_history(s);
241          if (len > rlen - 1) len = rlen - 1;
242          memcpy(here, s, len);
243          here[len] = '\n';
244          here[len+1] = 0;
245          free(s);
246          }
247        else
248    #endif
249    
250        /* Read the next line by normal means, prompting if the file is stdin. */
251    
252          {
253          if (f == stdin) printf(prompt);
254          if (fgets((char *)here, rlen,  f) == NULL)
255            return (here == start)? NULL : start;
256          }
257    
258      dlen = (int)strlen((char *)here);      dlen = (int)strlen((char *)here);
259      if (dlen > 0 && here[dlen - 1] == '\n') return start;      if (dlen > 0 && here[dlen - 1] == '\n') return start;
260      here += dlen;      here += dlen;
# Line 649  return count; Line 711  return count;
711    
712    
713  /*************************************************  /*************************************************
714    *         Case-independent strncmp() function    *
715    *************************************************/
716    
717    /*
718    Arguments:
719      s         first string
720      t         second string
721      n         number of characters to compare
722    
723    Returns:    < 0, = 0, or > 0, according to the comparison
724    */
725    
726    static int
727    strncmpic(uschar *s, uschar *t, int n)
728    {
729    while (n--)
730      {
731      int c = tolower(*s++) - tolower(*t++);
732      if (c) return c;
733      }
734    return 0;
735    }
736    
737    
738    
739    /*************************************************
740  *         Check newline indicator                *  *         Check newline indicator                *
741  *************************************************/  *************************************************/
742    
743  /* 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, where
744  xxx is LF, CR, CRLF, or ANY. Print a message and return 0 if there is no match.  xxx is LF, CR, CRLF, ANYCRLF, or ANY. Print a message and return 0 if there is
745    no match.
746    
747  Arguments:  Arguments:
748    p           points after the leading '<'    p           points after the leading '<'
# Line 665  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 682  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 691  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 720  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 779  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 831  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 838  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      exit(0);      goto EXIT;
964      }      }
965    else if (strcmp(argv[op], "-help") == 0 ||    else if (strcmp(argv[op], "-help") == 0 ||
966             strcmp(argv[op], "--help") == 0)             strcmp(argv[op], "--help") == 0)
# Line 877  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 945  while (!done) Line 1054  while (!done)
1054    int erroroffset, len, delimiter, poffset;    int erroroffset, len, delimiter, poffset;
1055    
1056    use_utf8 = 0;    use_utf8 = 0;
1057      debug_lengths = 1;
1058    
1059    if (infile == stdin) printf("  re> ");    if (extend_inputline(infile, buffer, "  re> ") == NULL) break;
   if (extend_inputline(infile, buffer) == NULL) break;  
1060    if (infile != stdin) fprintf(outfile, "%s", (char *)buffer);    if (infile != stdin) fprintf(outfile, "%s", (char *)buffer);
1061    fflush(outfile);    fflush(outfile);
1062    
# Line 1047  while (!done) Line 1156  while (!done)
1156    
1157    if (isalnum(delimiter) || delimiter == '\\')    if (isalnum(delimiter) || delimiter == '\\')
1158      {      {
1159      fprintf(outfile, "** Delimiter must not be alphameric or \\\n");      fprintf(outfile, "** Delimiter must not be alphanumeric or \\\n");
1160      goto SKIP_DATA;      goto SKIP_DATA;
1161      }      }
1162    
# Line 1063  while (!done) Line 1172  while (!done)
1172        pp++;        pp++;
1173        }        }
1174      if (*pp != 0) break;      if (*pp != 0) break;
1175      if (infile == stdin) printf("    > ");      if ((pp = extend_inputline(infile, pp, "    > ")) == NULL)
     if ((pp = extend_inputline(infile, pp)) == NULL)  
1176        {        {
1177        fprintf(outfile, "** Unexpected EOF\n");        fprintf(outfile, "** Unexpected EOF\n");
1178        done = 1;        done = 1;
# Line 1127  while (!done) Line 1235  while (!done)
1235        case 'S': do_study = 1; break;        case 'S': do_study = 1; break;
1236        case 'U': options |= PCRE_UNGREEDY; break;        case 'U': options |= PCRE_UNGREEDY; break;
1237        case 'X': options |= PCRE_EXTRA; break;        case 'X': options |= PCRE_EXTRA; break;
1238          case 'Z': debug_lengths = 0; break;
1239        case '8': options |= PCRE_UTF8; use_utf8 = 1; break;        case '8': options |= PCRE_UTF8; use_utf8 = 1; break;
1240        case '?': options |= PCRE_NO_UTF8_CHECK; break;        case '?': options |= PCRE_NO_UTF8_CHECK; break;
1241    
# Line 1155  while (!done) Line 1264  while (!done)
1264    
1265        case '<':        case '<':
1266          {          {
1267          int x = check_newline(pp, outfile);          if (strncmp((char *)pp, "JS>", 3) == 0)
1268          if (x == 0) goto SKIP_DATA;            {
1269          options |= x;            options |= PCRE_JAVASCRIPT_COMPAT;
1270          while (*pp++ != '>');            pp += 3;
1271              }
1272            else
1273              {
1274              int x = check_newline(pp, outfile);
1275              if (x == 0) goto SKIP_DATA;
1276              options |= x;
1277              while (*pp++ != '>');
1278              }
1279          }          }
1280        break;        break;
1281    
# Line 1237  while (!done) Line 1354  while (!done)
1354          {          {
1355          for (;;)          for (;;)
1356            {            {
1357            if (extend_inputline(infile, buffer) == NULL)            if (extend_inputline(infile, buffer, NULL) == NULL)
1358              {              {
1359              done = 1;              done = 1;
1360              goto CONTINUE;              goto CONTINUE;
# Line 1300  while (!done) Line 1417  while (!done)
1417      if (do_flip)      if (do_flip)
1418        {        {
1419        real_pcre *rre = (real_pcre *)re;        real_pcre *rre = (real_pcre *)re;
1420        rre->magic_number = byteflip(rre->magic_number, sizeof(rre->magic_number));        rre->magic_number =
1421            byteflip(rre->magic_number, sizeof(rre->magic_number));
1422        rre->size = byteflip(rre->size, sizeof(rre->size));        rre->size = byteflip(rre->size, sizeof(rre->size));
1423        rre->options = byteflip(rre->options, sizeof(rre->options));        rre->options = byteflip(rre->options, sizeof(rre->options));
1424        rre->top_bracket = byteflip(rre->top_bracket, sizeof(rre->top_bracket));        rre->flags = (pcre_uint16)byteflip(rre->flags, sizeof(rre->flags));
1425        rre->top_backref = byteflip(rre->top_backref, sizeof(rre->top_backref));        rre->top_bracket =
1426        rre->first_byte = byteflip(rre->first_byte, sizeof(rre->first_byte));          (pcre_uint16)byteflip(rre->top_bracket, sizeof(rre->top_bracket));
1427        rre->req_byte = byteflip(rre->req_byte, sizeof(rre->req_byte));        rre->top_backref =
1428        rre->name_table_offset = byteflip(rre->name_table_offset,          (pcre_uint16)byteflip(rre->top_backref, sizeof(rre->top_backref));
1429          rre->first_byte =
1430            (pcre_uint16)byteflip(rre->first_byte, sizeof(rre->first_byte));
1431          rre->req_byte =
1432            (pcre_uint16)byteflip(rre->req_byte, sizeof(rre->req_byte));
1433          rre->name_table_offset = (pcre_uint16)byteflip(rre->name_table_offset,
1434          sizeof(rre->name_table_offset));          sizeof(rre->name_table_offset));
1435        rre->name_entry_size = byteflip(rre->name_entry_size,        rre->name_entry_size = (pcre_uint16)byteflip(rre->name_entry_size,
1436          sizeof(rre->name_entry_size));          sizeof(rre->name_entry_size));
1437        rre->name_count = byteflip(rre->name_count, sizeof(rre->name_count));        rre->name_count = (pcre_uint16)byteflip(rre->name_count,
1438            sizeof(rre->name_count));
1439    
1440        if (extra != NULL)        if (extra != NULL)
1441          {          {
# Line 1328  while (!done) Line 1452  while (!done)
1452      if (do_debug)      if (do_debug)
1453        {        {
1454        fprintf(outfile, "------------------------------------------------------------------\n");        fprintf(outfile, "------------------------------------------------------------------\n");
1455        pcre_printint(re, outfile);        pcre_printint(re, outfile, debug_lengths);
1456        }        }
1457    
1458      if (do_showinfo)      if (do_showinfo)
# Line 1337  while (!done) Line 1461  while (!done)
1461  #if !defined NOINFOCHECK  #if !defined NOINFOCHECK
1462        int old_first_char, old_options, old_count;        int old_first_char, old_options, old_count;
1463  #endif  #endif
1464        int count, backrefmax, first_char, need_char;        int count, backrefmax, first_char, need_char, okpartial, jchanged,
1465            hascrorlf;
1466        int nameentrysize, namecount;        int nameentrysize, namecount;
1467        const uschar *nametable;        const uschar *nametable;
1468    
# Line 1350  while (!done) Line 1475  while (!done)
1475        new_info(re, NULL, PCRE_INFO_NAMEENTRYSIZE, &nameentrysize);        new_info(re, NULL, PCRE_INFO_NAMEENTRYSIZE, &nameentrysize);
1476        new_info(re, NULL, PCRE_INFO_NAMECOUNT, &namecount);        new_info(re, NULL, PCRE_INFO_NAMECOUNT, &namecount);
1477        new_info(re, NULL, PCRE_INFO_NAMETABLE, (void *)&nametable);        new_info(re, NULL, PCRE_INFO_NAMETABLE, (void *)&nametable);
1478          new_info(re, NULL, PCRE_INFO_OKPARTIAL, &okpartial);
1479          new_info(re, NULL, PCRE_INFO_JCHANGED, &jchanged);
1480          new_info(re, NULL, PCRE_INFO_HASCRORLF, &hascrorlf);
1481    
1482  #if !defined NOINFOCHECK  #if !defined NOINFOCHECK
1483        old_count = pcre_info(re, &old_options, &old_first_char);        old_count = pcre_info(re, &old_options, &old_first_char);
# Line 1391  while (!done) Line 1519  while (!done)
1519            }            }
1520          }          }
1521    
1522        /* The NOPARTIAL bit is a private bit in the options, so we have        if (!okpartial) fprintf(outfile, "Partial matching not supported\n");
1523        to fish it out via out back door */        if (hascrorlf) fprintf(outfile, "Contains explicit CR or LF match\n");
1524    
1525        all_options = ((real_pcre *)re)->options;        all_options = ((real_pcre *)re)->options;
1526        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");  
1527    
1528        if (get_options == 0) fprintf(outfile, "No options\n");        if (get_options == 0) fprintf(outfile, "No options\n");
1529          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\n",
1530            ((get_options & PCRE_ANCHORED) != 0)? " anchored" : "",            ((get_options & PCRE_ANCHORED) != 0)? " anchored" : "",
1531            ((get_options & PCRE_CASELESS) != 0)? " caseless" : "",            ((get_options & PCRE_CASELESS) != 0)? " caseless" : "",
1532            ((get_options & PCRE_EXTENDED) != 0)? " extended" : "",            ((get_options & PCRE_EXTENDED) != 0)? " extended" : "",
1533            ((get_options & PCRE_MULTILINE) != 0)? " multiline" : "",            ((get_options & PCRE_MULTILINE) != 0)? " multiline" : "",
1534            ((get_options & PCRE_FIRSTLINE) != 0)? " firstline" : "",            ((get_options & PCRE_FIRSTLINE) != 0)? " firstline" : "",
1535            ((get_options & PCRE_DOTALL) != 0)? " dotall" : "",            ((get_options & PCRE_DOTALL) != 0)? " dotall" : "",
1536              ((get_options & PCRE_BSR_ANYCRLF) != 0)? " bsr_anycrlf" : "",
1537              ((get_options & PCRE_BSR_UNICODE) != 0)? " bsr_unicode" : "",
1538            ((get_options & PCRE_DOLLAR_ENDONLY) != 0)? " dollar_endonly" : "",            ((get_options & PCRE_DOLLAR_ENDONLY) != 0)? " dollar_endonly" : "",
1539            ((get_options & PCRE_EXTRA) != 0)? " extra" : "",            ((get_options & PCRE_EXTRA) != 0)? " extra" : "",
1540            ((get_options & PCRE_UNGREEDY) != 0)? " ungreedy" : "",            ((get_options & PCRE_UNGREEDY) != 0)? " ungreedy" : "",
# Line 1419  while (!done) Line 1543  while (!done)
1543            ((get_options & PCRE_NO_UTF8_CHECK) != 0)? " no_utf8_check" : "",            ((get_options & PCRE_NO_UTF8_CHECK) != 0)? " no_utf8_check" : "",
1544            ((get_options & PCRE_DUPNAMES) != 0)? " dupnames" : "");            ((get_options & PCRE_DUPNAMES) != 0)? " dupnames" : "");
1545    
1546          if (jchanged) fprintf(outfile, "Duplicate name status changes\n");
1547    
1548        switch (get_options & PCRE_NEWLINE_BITS)        switch (get_options & PCRE_NEWLINE_BITS)
1549          {          {
1550          case PCRE_NEWLINE_CR:          case PCRE_NEWLINE_CR:
# Line 1433  while (!done) Line 1559  while (!done)
1559          fprintf(outfile, "Forced newline sequence: CRLF\n");          fprintf(outfile, "Forced newline sequence: CRLF\n");
1560          break;          break;
1561    
1562            case PCRE_NEWLINE_ANYCRLF:
1563            fprintf(outfile, "Forced newline sequence: ANYCRLF\n");
1564            break;
1565    
1566          case PCRE_NEWLINE_ANY:          case PCRE_NEWLINE_ANY:
1567          fprintf(outfile, "Forced newline sequence: ANY\n");          fprintf(outfile, "Forced newline sequence: ANY\n");
1568          break;          break;
# Line 1537  while (!done) Line 1667  while (!done)
1667        else        else
1668          {          {
1669          uschar sbuf[8];          uschar sbuf[8];
1670          sbuf[0] = (true_size >> 24)  & 255;          sbuf[0] = (uschar)((true_size >> 24) & 255);
1671          sbuf[1] = (true_size >> 16)  & 255;          sbuf[1] = (uschar)((true_size >> 16) & 255);
1672          sbuf[2] = (true_size >>  8)  & 255;          sbuf[2] = (uschar)((true_size >>  8) & 255);
1673          sbuf[3] = (true_size)  & 255;          sbuf[3] = (uschar)((true_size) & 255);
1674    
1675          sbuf[4] = (true_study_size >> 24)  & 255;          sbuf[4] = (uschar)((true_study_size >> 24) & 255);
1676          sbuf[5] = (true_study_size >> 16)  & 255;          sbuf[5] = (uschar)((true_study_size >> 16) & 255);
1677          sbuf[6] = (true_study_size >>  8)  & 255;          sbuf[6] = (uschar)((true_study_size >>  8) & 255);
1678          sbuf[7] = (true_study_size)  & 255;          sbuf[7] = (uschar)((true_study_size) & 255);
1679    
1680          if (fwrite(sbuf, 1, 8, f) < 8 ||          if (fwrite(sbuf, 1, 8, f) < 8 ||
1681              fwrite(re, 1, true_size, f) < true_size)              fwrite(re, 1, true_size, f) < true_size)
# Line 1582  while (!done) Line 1712  while (!done)
1712    for (;;)    for (;;)
1713      {      {
1714      uschar *q;      uschar *q;
1715      uschar *bptr = dbuffer;      uschar *bptr;
1716      int *use_offsets = offsets;      int *use_offsets = offsets;
1717      int use_size_offsets = size_offsets;      int use_size_offsets = size_offsets;
1718      int callout_data = 0;      int callout_data = 0;
1719      int callout_data_set = 0;      int callout_data_set = 0;
1720      int count, c;      int count, c;
1721      int copystrings = 0;      int copystrings = 0;
1722      int find_match_limit = 0;      int find_match_limit = default_find_match_limit;
1723      int getstrings = 0;      int getstrings = 0;
1724      int getlist = 0;      int getlist = 0;
1725      int gmatched = 0;      int gmatched = 0;
# Line 1619  while (!done) Line 1749  while (!done)
1749      len = 0;      len = 0;
1750      for (;;)      for (;;)
1751        {        {
1752        if (infile == stdin) printf("data> ");        if (extend_inputline(infile, buffer + len, "data> ") == NULL)
       if (extend_inputline(infile, buffer + len) == NULL)  
1753          {          {
1754          if (len > 0) break;          if (len > 0) break;
1755          done = 1;          done = 1;
# Line 1638  while (!done) Line 1767  while (!done)
1767      p = buffer;      p = buffer;
1768      while (isspace(*p)) p++;      while (isspace(*p)) p++;
1769    
1770      q = dbuffer;      bptr = q = dbuffer;
1771      while ((c = *p++) != 0)      while ((c = *p++) != 0)
1772        {        {
1773        int i = 0;        int i = 0;
# Line 1688  while (!done) Line 1817  while (!done)
1817              {              {
1818              unsigned char buff8[8];              unsigned char buff8[8];
1819              int ii, utn;              int ii, utn;
1820              utn = ord2utf8(c, buff8);              if (use_utf8)
1821              for (ii = 0; ii < utn - 1; ii++) *q++ = buff8[ii];                {
1822              c = buff8[ii];   /* Last byte */                utn = ord2utf8(c, buff8);
1823                  for (ii = 0; ii < utn - 1; ii++) *q++ = buff8[ii];
1824                  c = buff8[ii];   /* Last byte */
1825                  }
1826                else
1827                 {
1828                 if (c > 255)
1829                   fprintf(outfile, "** Character \\x{%x} is greater than 255 and "
1830                     "UTF-8 mode is not enabled.\n"
1831                     "** Truncation will probably give the wrong result.\n", c);
1832                 }
1833              p = pt + 1;              p = pt + 1;
1834              break;              break;
1835              }              }
# Line 1833  while (!done) Line 1972  while (!done)
1972            if (offsets == NULL)            if (offsets == NULL)
1973              {              {
1974              printf("** Failed to get %d bytes of memory for offsets vector\n",              printf("** Failed to get %d bytes of memory for offsets vector\n",
1975                size_offsets_max * sizeof(int));                (int)(size_offsets_max * sizeof(int)));
1976              yield = 1;              yield = 1;
1977              goto EXIT;              goto EXIT;
1978              }              }
# Line 1878  while (!done) Line 2017  while (!done)
2017          show_malloc = 1;          show_malloc = 1;
2018          continue;          continue;
2019    
2020            case 'Y':
2021            options |= PCRE_NO_START_OPTIMIZE;
2022            continue;
2023    
2024          case 'Z':          case 'Z':
2025          options |= PCRE_NOTEOL;          options |= PCRE_NOTEOL;
2026          continue;          continue;
# Line 1900  while (!done) Line 2043  while (!done)
2043      *q = 0;      *q = 0;
2044      len = q - dbuffer;      len = q - dbuffer;
2045    
2046        /* Move the data to the end of the buffer so that a read over the end of
2047        the buffer will be seen by valgrind, even if it doesn't cause a crash. If
2048        we are using the POSIX interface, we must include the terminating zero. */
2049    
2050    #if !defined NOPOSIX
2051        if (posix || do_posix)
2052          {
2053          memmove(bptr + buffer_size - len - 1, bptr, len + 1);
2054          bptr += buffer_size - len - 1;
2055          }
2056        else
2057    #endif
2058          {
2059          memmove(bptr + buffer_size - len, bptr, len);
2060          bptr += buffer_size - len;
2061          }
2062    
2063      if ((all_use_dfa || use_dfa) && find_match_limit)      if ((all_use_dfa || use_dfa) && find_match_limit)
2064        {        {
2065        printf("**Match limit not relevant for DFA matching: ignored\n");        printf("**Match limit not relevant for DFA matching: ignored\n");
# Line 1919  while (!done) Line 2079  while (!done)
2079          pmatch = (regmatch_t *)malloc(sizeof(regmatch_t) * use_size_offsets);          pmatch = (regmatch_t *)malloc(sizeof(regmatch_t) * use_size_offsets);
2080        if ((options & PCRE_NOTBOL) != 0) eflags |= REG_NOTBOL;        if ((options & PCRE_NOTBOL) != 0) eflags |= REG_NOTBOL;
2081        if ((options & PCRE_NOTEOL) != 0) eflags |= REG_NOTEOL;        if ((options & PCRE_NOTEOL) != 0) eflags |= REG_NOTEOL;
2082          if ((options & PCRE_NOTEMPTY) != 0) eflags |= REG_NOTEMPTY;
2083    
2084        rc = regexec(&preg, (const char *)bptr, use_size_offsets, pmatch, eflags);        rc = regexec(&preg, (const char *)bptr, use_size_offsets, pmatch, eflags);
2085    
# Line 2202  while (!done) Line 2363  while (!done)
2363          }          }
2364    
2365        /* 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
2366        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
2367        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
2368        matching, the advance must be one character, not one byte. Fudge the        string - that was checked before setting g_notempty.
2369        offset values to achieve this. We won't be at the end of the string -  
2370        that was checked before setting g_notempty. */        Complication arises in the case when the newline option is "any" or
2371          "anycrlf". If the previous match was at the end of a line terminated by
2372          CRLF, an advance of one character just passes the \r, whereas we should
2373          prefer the longer newline sequence, as does the code in pcre_exec().
2374          Fudge the offset value to achieve this.
2375    
2376          Otherwise, in the case of UTF-8 matching, the advance must be one
2377          character, not one byte. */
2378    
2379        else        else
2380          {          {
2381          if (g_notempty != 0)          if (g_notempty != 0)
2382            {            {
2383            int onechar = 1;            int onechar = 1;
2384              unsigned int obits = ((real_pcre *)re)->options;
2385            use_offsets[0] = start_offset;            use_offsets[0] = start_offset;
2386            if (use_utf8)            if ((obits & PCRE_NEWLINE_BITS) == 0)
2387                {
2388                int d;
2389                (void)pcre_config(PCRE_CONFIG_NEWLINE, &d);
2390                /* Note that these values are always the ASCII ones, even in
2391                EBCDIC environments. CR = 13, NL = 10. */
2392                obits = (d == 13)? PCRE_NEWLINE_CR :
2393                        (d == 10)? PCRE_NEWLINE_LF :
2394                        (d == (13<<8 | 10))? PCRE_NEWLINE_CRLF :
2395                        (d == -2)? PCRE_NEWLINE_ANYCRLF :
2396                        (d == -1)? PCRE_NEWLINE_ANY : 0;
2397                }
2398              if (((obits & PCRE_NEWLINE_BITS) == PCRE_NEWLINE_ANY ||
2399                   (obits & PCRE_NEWLINE_BITS) == PCRE_NEWLINE_ANYCRLF)
2400                  &&
2401                  start_offset < len - 1 &&
2402                  bptr[start_offset] == '\r' &&
2403                  bptr[start_offset+1] == '\n')
2404                onechar++;
2405              else if (use_utf8)
2406              {              {
2407              while (start_offset + onechar < len)              while (start_offset + onechar < len)
2408                {                {
# Line 2249  while (!done) Line 2437  while (!done)
2437        character. */        character. */
2438    
2439        g_notempty = 0;        g_notempty = 0;
2440    
2441        if (use_offsets[0] == use_offsets[1])        if (use_offsets[0] == use_offsets[1])
2442          {          {
2443          if (use_offsets[0] == len) break;          if (use_offsets[0] == len) break;

Legend:
Removed from v.96  
changed lines
  Added in v.411

  ViewVC Help
Powered by ViewVC 1.1.5