/[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 376 by ph10, Sun Mar 1 12:00:59 2009 UTC revision 412 by ph10, Sat Apr 11 10:34:37 2009 UTC
# Line 71  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  #define isatty _isatty         /* This is what Windows calls them, I'm told */  #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  #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 */
# Line 785  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 814  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 873  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 925  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;      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 933  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" :        (rc == -2)? "ANYCRLF" :
949        (rc == -1)? "ANY" : "???");        (rc == -1)? "ANY" : "???");
950      (void)pcre_config(PCRE_CONFIG_BSR, &rc);      (void)pcre_config(PCRE_CONFIG_BSR, &rc);
# Line 1315  while (!done) Line 1325  while (!done)
1325  #endif  /* !defined NOPOSIX */  #endif  /* !defined NOPOSIX */
1326    
1327      {      {
1328        unsigned long int get_options;
1329    
1330      if (timeit > 0)      if (timeit > 0)
1331        {        {
1332        register int i;        register int i;
# Line 1357  while (!done) Line 1369  while (!done)
1369          }          }
1370        goto CONTINUE;        goto CONTINUE;
1371        }        }
1372    
1373        /* Compilation succeeded. It is now possible to set the UTF-8 option from
1374        within the regex; check for this so that we know how to process the data
1375        lines. */
1376    
1377        new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options);
1378        if ((get_options & PCRE_UTF8) != 0) use_utf8 = 1;
1379    
1380      /* Compilation succeeded; print data if required. There are now two      /* Print information if required. There are now two info-returning
1381      info-returning functions. The old one has a limited interface and      functions. The old one has a limited interface and returns only limited
1382      returns only limited data. Check that it agrees with the newer one. */      data. Check that it agrees with the newer one. */
1383    
1384      if (log_store)      if (log_store)
1385        fprintf(outfile, "Memory allocation (code space): %d\n",        fprintf(outfile, "Memory allocation (code space): %d\n",
# Line 1444  while (!done) Line 1463  while (!done)
1463        fprintf(outfile, "------------------------------------------------------------------\n");        fprintf(outfile, "------------------------------------------------------------------\n");
1464        pcre_printint(re, outfile, debug_lengths);        pcre_printint(re, outfile, debug_lengths);
1465        }        }
1466    
1467        /* We already have the options in get_options (see above) */
1468    
1469      if (do_showinfo)      if (do_showinfo)
1470        {        {
1471        unsigned long int get_options, all_options;        unsigned long int all_options;
1472  #if !defined NOINFOCHECK  #if !defined NOINFOCHECK
1473        int old_first_char, old_options, old_count;        int old_first_char, old_options, old_count;
1474  #endif  #endif
# Line 1456  while (!done) Line 1477  while (!done)
1477        int nameentrysize, namecount;        int nameentrysize, namecount;
1478        const uschar *nametable;        const uschar *nametable;
1479    
       new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options);  
1480        new_info(re, NULL, PCRE_INFO_SIZE, &size);        new_info(re, NULL, PCRE_INFO_SIZE, &size);
1481        new_info(re, NULL, PCRE_INFO_CAPTURECOUNT, &count);        new_info(re, NULL, PCRE_INFO_CAPTURECOUNT, &count);
1482        new_info(re, NULL, PCRE_INFO_BACKREFMAX, &backrefmax);        new_info(re, NULL, PCRE_INFO_BACKREFMAX, &backrefmax);
# Line 1709  while (!done) Line 1729  while (!done)
1729      int callout_data_set = 0;      int callout_data_set = 0;
1730      int count, c;      int count, c;
1731      int copystrings = 0;      int copystrings = 0;
1732      int find_match_limit = 0;      int find_match_limit = default_find_match_limit;
1733      int getstrings = 0;      int getstrings = 0;
1734      int getlist = 0;      int getlist = 0;
1735      int gmatched = 0;      int gmatched = 0;
# Line 2007  while (!done) Line 2027  while (!done)
2027          show_malloc = 1;          show_malloc = 1;
2028          continue;          continue;
2029    
2030            case 'Y':
2031            options |= PCRE_NO_START_OPTIMIZE;
2032            continue;
2033    
2034          case 'Z':          case 'Z':
2035          options |= PCRE_NOTEOL;          options |= PCRE_NOTEOL;
2036          continue;          continue;
# Line 2065  while (!done) Line 2089  while (!done)
2089          pmatch = (regmatch_t *)malloc(sizeof(regmatch_t) * use_size_offsets);          pmatch = (regmatch_t *)malloc(sizeof(regmatch_t) * use_size_offsets);
2090        if ((options & PCRE_NOTBOL) != 0) eflags |= REG_NOTBOL;        if ((options & PCRE_NOTBOL) != 0) eflags |= REG_NOTBOL;
2091        if ((options & PCRE_NOTEOL) != 0) eflags |= REG_NOTEOL;        if ((options & PCRE_NOTEOL) != 0) eflags |= REG_NOTEOL;
2092          if ((options & PCRE_NOTEMPTY) != 0) eflags |= REG_NOTEMPTY;
2093    
2094        rc = regexec(&preg, (const char *)bptr, use_size_offsets, pmatch, eflags);        rc = regexec(&preg, (const char *)bptr, use_size_offsets, pmatch, eflags);
2095    
# Line 2372  while (!done) Line 2397  while (!done)
2397              {              {
2398              int d;              int d;
2399              (void)pcre_config(PCRE_CONFIG_NEWLINE, &d);              (void)pcre_config(PCRE_CONFIG_NEWLINE, &d);
2400              obits = (d == '\r')? PCRE_NEWLINE_CR :              /* Note that these values are always the ASCII ones, even in
2401                      (d == '\n')? PCRE_NEWLINE_LF :              EBCDIC environments. CR = 13, NL = 10. */
2402                      (d == ('\r'<<8 | '\n'))? PCRE_NEWLINE_CRLF :              obits = (d == 13)? PCRE_NEWLINE_CR :
2403                        (d == 10)? PCRE_NEWLINE_LF :
2404                        (d == (13<<8 | 10))? PCRE_NEWLINE_CRLF :
2405                      (d == -2)? PCRE_NEWLINE_ANYCRLF :                      (d == -2)? PCRE_NEWLINE_ANYCRLF :
2406                      (d == -1)? PCRE_NEWLINE_ANY : 0;                      (d == -1)? PCRE_NEWLINE_ANY : 0;
2407              }              }

Legend:
Removed from v.376  
changed lines
  Added in v.412

  ViewVC Help
Powered by ViewVC 1.1.5