/[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 358 by ph10, Wed Jul 9 11:03:07 2008 UTC revision 389 by ph10, Sun Mar 15 18:24:05 2009 UTC
# Line 785  printf(" -dfa force DFA matching fo Line 785  printf(" -dfa force DFA matching fo
785  #endif  #endif
786  printf("  -help    show usage information\n");  printf("  -help    show usage information\n");
787  printf("  -i       show information about compiled patterns\n"  printf("  -i       show information about compiled patterns\n"
788           "  -M       find MATCH_LIMIT minimum for each subject\n"
789         "  -m       output memory used information\n"         "  -m       output memory used information\n"
790         "  -o <n>   set size of offsets vector to <n>\n");         "  -o <n>   set size of offsets vector to <n>\n");
791  #if !defined NOPOSIX  #if !defined NOPOSIX
# Line 814  int main(int argc, char **argv) Line 815  int main(int argc, char **argv)
815  FILE *infile = stdin;  FILE *infile = stdin;
816  int options = 0;  int options = 0;
817  int study_options = 0;  int study_options = 0;
818    int default_find_match_limit = FALSE;
819  int op = 1;  int op = 1;
820  int timeit = 0;  int timeit = 0;
821  int timeitm = 0;  int timeitm = 0;
# Line 873  while (argc > 1 && argv[op][0] == '-') Line 875  while (argc > 1 && argv[op][0] == '-')
875    else if (strcmp(argv[op], "-b") == 0) debug = 1;    else if (strcmp(argv[op], "-b") == 0) debug = 1;
876    else if (strcmp(argv[op], "-i") == 0) showinfo = 1;    else if (strcmp(argv[op], "-i") == 0) showinfo = 1;
877    else if (strcmp(argv[op], "-d") == 0) showinfo = debug = 1;    else if (strcmp(argv[op], "-d") == 0) showinfo = debug = 1;
878      else if (strcmp(argv[op], "-M") == 0) default_find_match_limit = TRUE;
879  #if !defined NODFA  #if !defined NODFA
880    else if (strcmp(argv[op], "-dfa") == 0) all_use_dfa = 1;    else if (strcmp(argv[op], "-dfa") == 0) all_use_dfa = 1;
881  #endif  #endif
# Line 925  while (argc > 1 && argv[op][0] == '-') Line 928  while (argc > 1 && argv[op][0] == '-')
928    else if (strcmp(argv[op], "-C") == 0)    else if (strcmp(argv[op], "-C") == 0)
929      {      {
930      int rc;      int rc;
931        unsigned long int lrc;
932      printf("PCRE version %s\n", pcre_version());      printf("PCRE version %s\n", pcre_version());
933      printf("Compiled with\n");      printf("Compiled with\n");
934      (void)pcre_config(PCRE_CONFIG_UTF8, &rc);      (void)pcre_config(PCRE_CONFIG_UTF8, &rc);
# Line 943  while (argc > 1 && argv[op][0] == '-') Line 947  while (argc > 1 && argv[op][0] == '-')
947      printf("  Internal link size = %d\n", rc);      printf("  Internal link size = %d\n", rc);
948      (void)pcre_config(PCRE_CONFIG_POSIX_MALLOC_THRESHOLD, &rc);      (void)pcre_config(PCRE_CONFIG_POSIX_MALLOC_THRESHOLD, &rc);
949      printf("  POSIX malloc threshold = %d\n", rc);      printf("  POSIX malloc threshold = %d\n", rc);
950      (void)pcre_config(PCRE_CONFIG_MATCH_LIMIT, &rc);      (void)pcre_config(PCRE_CONFIG_MATCH_LIMIT, &lrc);
951      printf("  Default match limit = %d\n", rc);      printf("  Default match limit = %ld\n", lrc);
952      (void)pcre_config(PCRE_CONFIG_MATCH_LIMIT_RECURSION, &rc);      (void)pcre_config(PCRE_CONFIG_MATCH_LIMIT_RECURSION, &lrc);
953      printf("  Default recursion depth limit = %d\n", rc);      printf("  Default recursion depth limit = %ld\n", lrc);
954      (void)pcre_config(PCRE_CONFIG_STACKRECURSE, &rc);      (void)pcre_config(PCRE_CONFIG_STACKRECURSE, &rc);
955      printf("  Match recursion uses %s\n", rc? "stack" : "heap");      printf("  Match recursion uses %s\n", rc? "stack" : "heap");
956      goto EXIT;      goto EXIT;
# Line 1708  while (!done) Line 1712  while (!done)
1712      int callout_data_set = 0;      int callout_data_set = 0;
1713      int count, c;      int count, c;
1714      int copystrings = 0;      int copystrings = 0;
1715      int find_match_limit = 0;      int find_match_limit = default_find_match_limit;
1716      int getstrings = 0;      int getstrings = 0;
1717      int getlist = 0;      int getlist = 0;
1718      int gmatched = 0;      int gmatched = 0;
# Line 2005  while (!done) Line 2009  while (!done)
2009          case 'S':          case 'S':
2010          show_malloc = 1;          show_malloc = 1;
2011          continue;          continue;
2012    
2013            case 'Y':
2014            options |= PCRE_NO_START_OPTIMIZE;
2015            continue;
2016    
2017          case 'Z':          case 'Z':
2018          options |= PCRE_NOTEOL;          options |= PCRE_NOTEOL;
# Line 2028  while (!done) Line 2036  while (!done)
2036      *q = 0;      *q = 0;
2037      len = q - dbuffer;      len = q - dbuffer;
2038    
2039        /* Move the data to the end of the buffer so that a read over the end of
2040        the buffer will be seen by valgrind, even if it doesn't cause a crash. If
2041        we are using the POSIX interface, we must include the terminating zero. */
2042    
2043    #if !defined NOPOSIX
2044        if (posix || do_posix)
2045          {
2046          memmove(bptr + buffer_size - len - 1, bptr, len + 1);
2047          bptr += buffer_size - len - 1;
2048          }
2049        else
2050    #endif
2051          {
2052          memmove(bptr + buffer_size - len, bptr, len);
2053          bptr += buffer_size - len;
2054          }
2055    
2056      if ((all_use_dfa || use_dfa) && find_match_limit)      if ((all_use_dfa || use_dfa) && find_match_limit)
2057        {        {
2058        printf("**Match limit not relevant for DFA matching: ignored\n");        printf("**Match limit not relevant for DFA matching: ignored\n");
# Line 2047  while (!done) Line 2072  while (!done)
2072          pmatch = (regmatch_t *)malloc(sizeof(regmatch_t) * use_size_offsets);          pmatch = (regmatch_t *)malloc(sizeof(regmatch_t) * use_size_offsets);
2073        if ((options & PCRE_NOTBOL) != 0) eflags |= REG_NOTBOL;        if ((options & PCRE_NOTBOL) != 0) eflags |= REG_NOTBOL;
2074        if ((options & PCRE_NOTEOL) != 0) eflags |= REG_NOTEOL;        if ((options & PCRE_NOTEOL) != 0) eflags |= REG_NOTEOL;
2075          if ((options & PCRE_NOTEMPTY) != 0) eflags |= REG_NOTEMPTY;
2076    
2077        rc = regexec(&preg, (const char *)bptr, use_size_offsets, pmatch, eflags);        rc = regexec(&preg, (const char *)bptr, use_size_offsets, pmatch, eflags);
2078    

Legend:
Removed from v.358  
changed lines
  Added in v.389

webmaster@exim.org
ViewVC Help
Powered by ViewVC 1.1.12