/[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 580 by ph10, Fri Nov 26 11:16:43 2010 UTC revision 606 by ph10, Mon Jun 6 17:46:22 2011 UTC
# Line 197  static uschar *buffer = NULL; Line 197  static uschar *buffer = NULL;
197  static uschar *dbuffer = NULL;  static uschar *dbuffer = NULL;
198  static uschar *pbuffer = NULL;  static uschar *pbuffer = NULL;
199    
200    /* Textual explanations for runtime error codes */
201    
202    static const char *errtexts[] = {
203      NULL,  /* 0 is no error */
204      NULL,  /* NOMATCH is handled specially */
205      "NULL argument passed",
206      "bad option value",
207      "magic number missing",
208      "unknown opcode - pattern overwritten?",
209      "no more memory",
210      NULL,  /* never returned by pcre_exec() or pcre_dfa_exec() */
211      "match limit exceeded",
212      "callout error code",
213      NULL,  /* BADUTF8 is handled specially */
214      "bad UTF-8 offset",
215      NULL,  /* PARTIAL is handled specially */
216      "not used - internal error",
217      "internal error - pattern overwritten?",
218      "bad count value",
219      "item unsupported for DFA matching",
220      "backreference condition or recursion test not supported for DFA matching",
221      "match limit not supported for DFA matching",
222      "workspace size exceeded in DFA matching",
223      "too much recursion for DFA matching",
224      "recursion limit exceeded",
225      "not used - internal error",
226      "invalid combination of newline options",
227      "bad offset value",
228      NULL  /* SHORTUTF8 is handled specially */
229    };
230    
231    
232  /*************************************************  /*************************************************
233  *         Alternate character tables             *  *         Alternate character tables             *
# Line 1155  printf("  -p       use POSIX interface\n Line 1186  printf("  -p       use POSIX interface\n
1186  #endif  #endif
1187  printf("  -q       quiet: do not output PCRE version number at start\n");  printf("  -q       quiet: do not output PCRE version number at start\n");
1188  printf("  -S <n>   set stack size to <n> megabytes\n");  printf("  -S <n>   set stack size to <n> megabytes\n");
1189  printf("  -s       output store (memory) used information\n"  printf("  -s       force each pattern to be studied\n"
1190         "  -t       time compilation and execution\n");         "  -t       time compilation and execution\n");
1191  printf("  -t <n>   time compilation and execution, repeating <n> times\n");  printf("  -t <n>   time compilation and execution, repeating <n> times\n");
1192  printf("  -tm      time execution (matching) only\n");  printf("  -tm      time execution (matching) only\n");
# Line 1183  int timeit = 0; Line 1214  int timeit = 0;
1214  int timeitm = 0;  int timeitm = 0;
1215  int showinfo = 0;  int showinfo = 0;
1216  int showstore = 0;  int showstore = 0;
1217    int force_study = 0;
1218  int quiet = 0;  int quiet = 0;
1219  int size_offsets = 45;  int size_offsets = 45;
1220  int size_offsets_max;  int size_offsets_max;
# Line 1231  while (argc > 1 && argv[op][0] == '-') Line 1263  while (argc > 1 && argv[op][0] == '-')
1263    {    {
1264    unsigned char *endptr;    unsigned char *endptr;
1265    
1266    if (strcmp(argv[op], "-s") == 0 || strcmp(argv[op], "-m") == 0)    if (strcmp(argv[op], "-m") == 0) showstore = 1;
1267      showstore = 1;    else if (strcmp(argv[op], "-s") == 0) force_study = 1;
1268    else if (strcmp(argv[op], "-q") == 0) quiet = 1;    else if (strcmp(argv[op], "-q") == 0) quiet = 1;
1269    else if (strcmp(argv[op], "-b") == 0) debug = 1;    else if (strcmp(argv[op], "-b") == 0) debug = 1;
1270    else if (strcmp(argv[op], "-i") == 0) showinfo = 1;    else if (strcmp(argv[op], "-i") == 0) showinfo = 1;
# Line 1776  while (!done) Line 1808  while (!done)
1808      true_size = ((real_pcre *)re)->size;      true_size = ((real_pcre *)re)->size;
1809      regex_gotten_store = gotten_store;      regex_gotten_store = gotten_store;
1810    
1811      /* If /S was present, study the regexp to generate additional info to      /* If -s or /S was present, study the regexp to generate additional info to
1812      help with the matching. */      help with the matching. */
1813    
1814      if (do_study)      if (do_study || force_study)
1815        {        {
1816        if (timeit > 0)        if (timeit > 0)
1817          {          {
# Line 2019  while (!done) Line 2051  while (!done)
2051        so messes up the test suite. (And with the /F option, it might be        so messes up the test suite. (And with the /F option, it might be
2052        flipped.) */        flipped.) */
2053    
2054        if (do_study)        if (do_study || force_study)
2055          {          {
2056          if (extra == NULL)          if (extra == NULL)
2057            fprintf(outfile, "Study returned NULL\n");            fprintf(outfile, "Study returned NULL\n");
# Line 2858  while (!done) Line 2890  while (!done)
2890            }            }
2891          else          else
2892            {            {
2893            if (count == PCRE_ERROR_NOMATCH)            switch(count)
2894              {              {
2895                case PCRE_ERROR_NOMATCH:
2896              if (gmatched == 0)              if (gmatched == 0)
2897                {                {
2898                if (markptr == NULL) fprintf(outfile, "No match\n");                if (markptr == NULL) fprintf(outfile, "No match\n");
2899                  else fprintf(outfile, "No match, mark = %s\n", markptr);                  else fprintf(outfile, "No match, mark = %s\n", markptr);
2900                }                }
2901                break;
2902    
2903                case PCRE_ERROR_BADUTF8:
2904                case PCRE_ERROR_SHORTUTF8:
2905                fprintf(outfile, "Error %d (%s UTF-8 string)", count,
2906                  (count == PCRE_ERROR_BADUTF8)? "bad" : "short");
2907                if (use_size_offsets >= 2)
2908                  fprintf(outfile, " offset=%d reason=%d", use_offsets[0],
2909                    use_offsets[1]);
2910                fprintf(outfile, "\n");
2911                break;
2912    
2913                default:
2914                if (count < 0 && (-count) < sizeof(errtexts)/sizeof(const char *))
2915                  fprintf(outfile, "Error %d (%s)\n", count, errtexts[-count]);
2916                else
2917                  fprintf(outfile, "Error %d (Unexpected value)\n", count);
2918                break;
2919              }              }
2920            else fprintf(outfile, "Error %d\n", count);  
2921            break;  /* Out of the /g loop */            break;  /* Out of the /g loop */
2922            }            }
2923          }          }

Legend:
Removed from v.580  
changed lines
  Added in v.606

  ViewVC Help
Powered by ViewVC 1.1.5