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

Diff of /code/trunk/pcregrep.c

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

revision 636 by ph10, Sun Jul 24 17:43:51 2011 UTC revision 644 by ph10, Sat Jul 30 17:13:00 2011 UTC
# Line 74  typedef int BOOL; Line 74  typedef int BOOL;
74  #define OFFSET_SIZE 99  #define OFFSET_SIZE 99
75    
76  #if BUFSIZ > 8192  #if BUFSIZ > 8192
77  #define MBUFTHIRD BUFSIZ  #define PATBUFSIZE BUFSIZ
78  #else  #else
79  #define MBUFTHIRD 8192  #define PATBUFSIZE 8192
80  #endif  #endif
81    
82  /* Values for the "filenames" variable, which specifies options for file name  /* Values for the "filenames" variable, which specifies options for file name
# Line 135  static char *colour_string = (char *)"1; Line 135  static char *colour_string = (char *)"1;
135  static char *colour_option = NULL;  static char *colour_option = NULL;
136  static char *dee_option = NULL;  static char *dee_option = NULL;
137  static char *DEE_option = NULL;  static char *DEE_option = NULL;
138    static char *main_buffer = NULL;
139  static char *newline = NULL;  static char *newline = NULL;
140  static char *pattern_filename = NULL;  static char *pattern_filename = NULL;
141  static char *stdin_name = (char *)"(standard input)";  static char *stdin_name = (char *)"(standard input)";
# Line 159  static pcre *exclude_dir_compiled = NULL Line 160  static pcre *exclude_dir_compiled = NULL
160  static int after_context = 0;  static int after_context = 0;
161  static int before_context = 0;  static int before_context = 0;
162  static int both_context = 0;  static int both_context = 0;
163    static int bufthird = PCREGREP_BUFSIZE;
164    static int bufsize = 3*PCREGREP_BUFSIZE;
165  static int dee_action = dee_READ;  static int dee_action = dee_READ;
166  static int DEE_action = DEE_READ;  static int DEE_action = DEE_READ;
167  static int error_count = 0;  static int error_count = 0;
# Line 214  used to identify them. */ Line 217  used to identify them. */
217  #define N_LBUFFER      (-12)  #define N_LBUFFER      (-12)
218  #define N_M_LIMIT      (-13)  #define N_M_LIMIT      (-13)
219  #define N_M_LIMIT_REC  (-14)  #define N_M_LIMIT_REC  (-14)
220    #define N_BUFSIZE      (-15)
221    
222  static option_item optionlist[] = {  static option_item optionlist[] = {
223    { OP_NODATA,     N_NULL,   NULL,              "",              "  terminate options" },    { OP_NODATA,     N_NULL,   NULL,              "",              "  terminate options" },
224    { OP_NODATA,     N_HELP,   NULL,              "help",          "display this help and exit" },    { OP_NODATA,     N_HELP,   NULL,              "help",          "display this help and exit" },
225    { OP_NUMBER,     'A',      &after_context,    "after-context=number", "set number of following context lines" },    { OP_NUMBER,     'A',      &after_context,    "after-context=number", "set number of following context lines" },
226    { OP_NUMBER,     'B',      &before_context,   "before-context=number", "set number of prior context lines" },    { OP_NUMBER,     'B',      &before_context,   "before-context=number", "set number of prior context lines" },
227      { OP_NUMBER,     N_BUFSIZE,&bufthird,         "buffer-size=number", "set processing buffer size parameter" },
228    { OP_OP_STRING,  N_COLOUR, &colour_option,    "color=option",  "matched text color option" },    { OP_OP_STRING,  N_COLOUR, &colour_option,    "color=option",  "matched text color option" },
229    { OP_OP_STRING,  N_COLOUR, &colour_option,    "colour=option", "matched text colour option" },    { OP_OP_STRING,  N_COLOUR, &colour_option,    "colour=option", "matched text colour option" },
230    { OP_NUMBER,     'C',      &both_context,     "context=number", "set number of context lines, before & after" },    { OP_NUMBER,     'C',      &both_context,     "context=number", "set number of context lines, before & after" },
# Line 634  Arguments: Line 639  Arguments:
639    endptr    end of available data    endptr    end of available data
640    lenptr    where to put the length of the eol sequence    lenptr    where to put the length of the eol sequence
641    
642  Returns:    pointer to the last byte of the line, including the newline byte(s)  Returns:    pointer after the last byte of the line,
643                including the newline byte(s)
644  */  */
645    
646  static char *  static char *
# Line 989  return FALSE;  /* No match, no errors */ Line 995  return FALSE;  /* No match, no errors */
995  *************************************************/  *************************************************/
996    
997  /* This is called from grep_or_recurse() below. It uses a buffer that is three  /* This is called from grep_or_recurse() below. It uses a buffer that is three
998  times the value of MBUFTHIRD. The matching point is never allowed to stray into  times the value of bufthird. The matching point is never allowed to stray into
999  the top third of the buffer, thus keeping more of the file available for  the top third of the buffer, thus keeping more of the file available for
1000  context printing or for multiline scanning. For large files, the pointer will  context printing or for multiline scanning. For large files, the pointer will
1001  be in the middle third most of the time, so the bottom third is available for  be in the middle third most of the time, so the bottom third is available for
# Line 1000  Arguments: Line 1006  Arguments:
1006                 the gzFile pointer when reading is via libz                 the gzFile pointer when reading is via libz
1007                 the BZFILE pointer when reading is via libbz2                 the BZFILE pointer when reading is via libbz2
1008    frtype       FR_PLAIN, FR_LIBZ, or FR_LIBBZ2    frtype       FR_PLAIN, FR_LIBZ, or FR_LIBBZ2
1009      filename     the file name or NULL (for errors)
1010    printname    the file name if it is to be printed for each match    printname    the file name if it is to be printed for each match
1011                 or NULL if the file name is not to be printed                 or NULL if the file name is not to be printed
1012                 it cannot be NULL if filenames[_nomatch]_only is set                 it cannot be NULL if filenames[_nomatch]_only is set
1013    
1014  Returns:       0 if there was at least one match  Returns:       0 if there was at least one match
1015                 1 otherwise (no matches)                 1 otherwise (no matches)
1016                 2 if there is a read error on a .bz2 file                 2 if an overlong line is encountered
1017                   3 if there is a read error on a .bz2 file
1018  */  */
1019    
1020  static int  static int
1021  pcregrep(void *handle, int frtype, char *printname)  pcregrep(void *handle, int frtype, char *filename, char *printname)
1022  {  {
1023  int rc = 1;  int rc = 1;
1024  int linenumber = 1;  int linenumber = 1;
# Line 1019  int count = 0; Line 1027  int count = 0;
1027  int filepos = 0;  int filepos = 0;
1028  int offsets[OFFSET_SIZE];  int offsets[OFFSET_SIZE];
1029  char *lastmatchrestart = NULL;  char *lastmatchrestart = NULL;
1030  char buffer[3*MBUFTHIRD];  char *ptr = main_buffer;
 char *ptr = buffer;  
1031  char *endptr;  char *endptr;
1032  size_t bufflength;  size_t bufflength;
1033  BOOL endhyphenpending = FALSE;  BOOL endhyphenpending = FALSE;
# Line 1045  fail. */ Line 1052  fail. */
1052  if (frtype == FR_LIBZ)  if (frtype == FR_LIBZ)
1053    {    {
1054    ingz = (gzFile)handle;    ingz = (gzFile)handle;
1055    bufflength = gzread (ingz, buffer, 3*MBUFTHIRD);    bufflength = gzread (ingz, main_buffer, bufsize);
1056    }    }
1057  else  else
1058  #endif  #endif
# Line 1054  else Line 1061  else
1061  if (frtype == FR_LIBBZ2)  if (frtype == FR_LIBBZ2)
1062    {    {
1063    inbz2 = (BZFILE *)handle;    inbz2 = (BZFILE *)handle;
1064    bufflength = BZ2_bzread(inbz2, buffer, 3*MBUFTHIRD);    bufflength = BZ2_bzread(inbz2, main_buffer, bufsize);
1065    if ((int)bufflength < 0) return 2;   /* Gotcha: bufflength is size_t; */    if ((int)bufflength < 0) return 2;   /* Gotcha: bufflength is size_t; */
1066    }                                    /* without the cast it is unsigned. */    }                                    /* without the cast it is unsigned. */
1067  else  else
# Line 1064  else Line 1071  else
1071    in = (FILE *)handle;    in = (FILE *)handle;
1072    if (is_file_tty(in)) input_line_buffered = TRUE;    if (is_file_tty(in)) input_line_buffered = TRUE;
1073    bufflength = input_line_buffered?    bufflength = input_line_buffered?
1074      read_one_line(buffer, 3*MBUFTHIRD, in) :      read_one_line(main_buffer, bufsize, in) :
1075      fread(buffer, 1, 3*MBUFTHIRD, in);      fread(main_buffer, 1, bufsize, in);
1076    }    }
1077    
1078  endptr = buffer + bufflength;  endptr = main_buffer + bufflength;
1079    
1080  /* Loop while the current pointer is not at the end of the file. For large  /* Loop while the current pointer is not at the end of the file. For large
1081  files, endptr will be at the end of the buffer when we are in the middle of the  files, endptr will be at the end of the buffer when we are in the middle of the
# Line 1096  while (ptr < endptr) Line 1103  while (ptr < endptr)
1103    t = end_of_line(t, endptr, &endlinelength);    t = end_of_line(t, endptr, &endlinelength);
1104    linelength = t - ptr - endlinelength;    linelength = t - ptr - endlinelength;
1105    length = multiline? (size_t)(endptr - ptr) : linelength;    length = multiline? (size_t)(endptr - ptr) : linelength;
1106    
1107      /* Check to see if the line we are looking at extends right to the very end
1108      of the buffer without a line terminator. This means the line is too long to
1109      handle. */
1110    
1111      if (endlinelength == 0 && t == main_buffer + bufsize)
1112        {
1113        fprintf(stderr, "pcregrep: line %d%s%s is too long for the internal buffer\n"
1114                        "pcregrep: check the --buffer_size option\n",
1115                        linenumber,
1116                        (filename == NULL)? "" : " of file ",
1117                        (filename == NULL)? "" : filename);
1118        return 2;
1119        }
1120    
1121    /* Extra processing for Jeffrey Friedl's debugging. */    /* Extra processing for Jeffrey Friedl's debugging. */
1122    
# Line 1281  while (ptr < endptr) Line 1302  while (ptr < endptr)
1302          int linecount = 0;          int linecount = 0;
1303          char *p = ptr;          char *p = ptr;
1304    
1305          while (p > buffer && (lastmatchnumber == 0 || p > lastmatchrestart) &&          while (p > main_buffer && (lastmatchnumber == 0 || p > lastmatchrestart) &&
1306                 linecount < before_context)                 linecount < before_context)
1307            {            {
1308            linecount++;            linecount++;
1309            p = previous_line(p, buffer);            p = previous_line(p, main_buffer);
1310            }            }
1311    
1312          if (lastmatchnumber > 0 && p > lastmatchrestart && !hyphenprinted)          if (lastmatchnumber > 0 && p > lastmatchrestart && !hyphenprinted)
# Line 1425  while (ptr < endptr) Line 1446  while (ptr < endptr)
1446    /* If input is line buffered, and the buffer is not yet full, read another    /* If input is line buffered, and the buffer is not yet full, read another
1447    line and add it into the buffer. */    line and add it into the buffer. */
1448    
1449    if (input_line_buffered && bufflength < sizeof(buffer))    if (input_line_buffered && bufflength < bufsize)
1450      {      {
1451      int add = read_one_line(ptr, sizeof(buffer) - (ptr - buffer), in);      int add = read_one_line(ptr, bufsize - (ptr - main_buffer), in);
1452      bufflength += add;      bufflength += add;
1453      endptr += add;      endptr += add;
1454      }      }
# Line 1437  while (ptr < endptr) Line 1458  while (ptr < endptr)
1458    1/3 and refill it. Before we do this, if some unprinted "after" lines are    1/3 and refill it. Before we do this, if some unprinted "after" lines are
1459    about to be lost, print them. */    about to be lost, print them. */
1460    
1461    if (bufflength >= sizeof(buffer) && ptr > buffer + 2*MBUFTHIRD)    if (bufflength >= bufsize && ptr > main_buffer + 2*bufthird)
1462      {      {
1463      if (after_context > 0 &&      if (after_context > 0 &&
1464          lastmatchnumber > 0 &&          lastmatchnumber > 0 &&
1465          lastmatchrestart < buffer + MBUFTHIRD)          lastmatchrestart < main_buffer + bufthird)
1466        {        {
1467        do_after_lines(lastmatchnumber, lastmatchrestart, endptr, printname);        do_after_lines(lastmatchnumber, lastmatchrestart, endptr, printname);
1468        lastmatchnumber = 0;        lastmatchnumber = 0;
# Line 1449  while (ptr < endptr) Line 1470  while (ptr < endptr)
1470    
1471      /* Now do the shuffle */      /* Now do the shuffle */
1472    
1473      memmove(buffer, buffer + MBUFTHIRD, 2*MBUFTHIRD);      memmove(main_buffer, main_buffer + bufthird, 2*bufthird);
1474      ptr -= MBUFTHIRD;      ptr -= bufthird;
1475    
1476  #ifdef SUPPORT_LIBZ  #ifdef SUPPORT_LIBZ
1477      if (frtype == FR_LIBZ)      if (frtype == FR_LIBZ)
1478        bufflength = 2*MBUFTHIRD +        bufflength = 2*bufthird +
1479          gzread (ingz, buffer + 2*MBUFTHIRD, MBUFTHIRD);          gzread (ingz, main_buffer + 2*bufthird, bufthird);
1480      else      else
1481  #endif  #endif
1482    
1483  #ifdef SUPPORT_LIBBZ2  #ifdef SUPPORT_LIBBZ2
1484      if (frtype == FR_LIBBZ2)      if (frtype == FR_LIBBZ2)
1485        bufflength = 2*MBUFTHIRD +        bufflength = 2*bufthird +
1486          BZ2_bzread(inbz2, buffer + 2*MBUFTHIRD, MBUFTHIRD);          BZ2_bzread(inbz2, main_buffer + 2*bufthird, bufthird);
1487      else      else
1488  #endif  #endif
1489    
1490      bufflength = 2*MBUFTHIRD +      bufflength = 2*bufthird +
1491        (input_line_buffered?        (input_line_buffered?
1492         read_one_line(buffer + 2*MBUFTHIRD, MBUFTHIRD, in) :         read_one_line(main_buffer + 2*bufthird, bufthird, in) :
1493         fread(buffer + 2*MBUFTHIRD, 1, MBUFTHIRD, in));         fread(main_buffer + 2*bufthird, 1, bufthird, in));
1494      endptr = buffer + bufflength;      endptr = main_buffer + bufflength;
1495    
1496      /* Adjust any last match point */      /* Adjust any last match point */
1497    
1498      if (lastmatchnumber > 0) lastmatchrestart -= MBUFTHIRD;      if (lastmatchnumber > 0) lastmatchrestart -= bufthird;
1499      }      }
1500    }     /* Loop through the whole file */    }     /* Loop through the whole file */
1501    
# Line 1554  BZFILE *inbz2 = NULL; Line 1575  BZFILE *inbz2 = NULL;
1575    
1576  if (strcmp(pathname, "-") == 0)  if (strcmp(pathname, "-") == 0)
1577    {    {
1578    return pcregrep(stdin, FR_PLAIN,    return pcregrep(stdin, FR_PLAIN, stdin_name,
1579      (filenames > FN_DEFAULT || (filenames == FN_DEFAULT && !only_one_at_top))?      (filenames > FN_DEFAULT || (filenames == FN_DEFAULT && !only_one_at_top))?
1580        stdin_name : NULL);        stdin_name : NULL);
1581    }    }
# Line 1686  if (handle == NULL) Line 1707  if (handle == NULL)
1707    
1708  /* Now grep the file */  /* Now grep the file */
1709    
1710  rc = pcregrep(handle, frtype, (filenames > FN_DEFAULT ||  rc = pcregrep(handle, frtype, pathname, (filenames > FN_DEFAULT ||
1711    (filenames == FN_DEFAULT && !only_one_at_top))? pathname : NULL);    (filenames == FN_DEFAULT && !only_one_at_top))? pathname : NULL);
1712    
1713  /* Close in an appropriate manner. */  /* Close in an appropriate manner. */
# Line 1697  if (frtype == FR_LIBZ) Line 1718  if (frtype == FR_LIBZ)
1718  else  else
1719  #endif  #endif
1720    
1721  /* If it is a .bz2 file and the result is 2, it means that the first attempt to  /* If it is a .bz2 file and the result is 3, it means that the first attempt to
1722  read failed. If the error indicates that the file isn't in fact bzipped, try  read failed. If the error indicates that the file isn't in fact bzipped, try
1723  again as a normal file. */  again as a normal file. */
1724    
1725  #ifdef SUPPORT_LIBBZ2  #ifdef SUPPORT_LIBBZ2
1726  if (frtype == FR_LIBBZ2)  if (frtype == FR_LIBBZ2)
1727    {    {
1728    if (rc == 2)    if (rc == 3)
1729      {      {
1730      int errnum;      int errnum;
1731      const char *err = BZ2_bzerror(inbz2, &errnum);      const char *err = BZ2_bzerror(inbz2, &errnum);
# Line 1716  if (frtype == FR_LIBBZ2) Line 1737  if (frtype == FR_LIBBZ2)
1737      else if (!silent)      else if (!silent)
1738        fprintf(stderr, "pcregrep: Failed to read %s using bzlib: %s\n",        fprintf(stderr, "pcregrep: Failed to read %s using bzlib: %s\n",
1739          pathname, err);          pathname, err);
1740        rc = 2;    /* The normal "something went wrong" code */
1741      }      }
1742    BZ2_bzclose(inbz2);    BZ2_bzclose(inbz2);
1743    }    }
# Line 1808  for (op = optionlist; op->one_char != 0; Line 1830  for (op = optionlist; op->one_char != 0;
1830    printf("%.*s%s\n", n, "                     ", op->help_text);    printf("%.*s%s\n", n, "                     ", op->help_text);
1831    }    }
1832    
1833  printf("\nWhen reading patterns from a file instead of using a command line option,\n");  printf("\nNumbers may be followed by K or M, e.g. --buffer-size=100K.\n");
1834    printf("The default value for --buffer-size is %d.\n", PCREGREP_BUFSIZE);
1835    printf("When reading patterns from a file instead of using a command line option,\n");
1836  printf("trailing white space is removed and blank lines are ignored.\n");  printf("trailing white space is removed and blank lines are ignored.\n");
1837  printf("There is a maximum of %d patterns.\n", MAX_PATTERN_COUNT);  printf("There is a maximum of %d patterns, each of maximum size %d bytes.\n",
1838      MAX_PATTERN_COUNT, PATBUFSIZE);
1839    
1840  printf("\nWith no FILEs, read standard input. If fewer than two FILEs given, assume -h.\n");  printf("\nWith no FILEs, read standard input. If fewer than two FILEs given, assume -h.\n");
1841  printf("Exit status is 0 if any matches, 1 if no matches, and 2 if trouble.\n");  printf("Exit status is 0 if any matches, 1 if no matches, and 2 if trouble.\n");
# Line 1912  Returns:         TRUE on success, FALSE Line 1937  Returns:         TRUE on success, FALSE
1937  static BOOL  static BOOL
1938  compile_single_pattern(char *pattern, int options, char *filename, int count)  compile_single_pattern(char *pattern, int options, char *filename, int count)
1939  {  {
1940  char buffer[MBUFTHIRD + 16];  char buffer[PATBUFSIZE];
1941  const char *error;  const char *error;
1942  int errptr;  int errptr;
1943    
# Line 1923  if (pattern_count >= MAX_PATTERN_COUNT) Line 1948  if (pattern_count >= MAX_PATTERN_COUNT)
1948    return FALSE;    return FALSE;
1949    }    }
1950    
1951  sprintf(buffer, "%s%.*s%s", prefix[process_options], MBUFTHIRD, pattern,  sprintf(buffer, "%s%.*s%s", prefix[process_options], bufthird, pattern,
1952    suffix[process_options]);    suffix[process_options]);
1953  pattern_list[pattern_count] =  pattern_list[pattern_count] =
1954    pcre_compile(buffer, options, &error, &errptr, pcretables);    pcre_compile(buffer, options, &error, &errptr, pcretables);
# Line 1982  compile_pattern(char *pattern, int optio Line 2007  compile_pattern(char *pattern, int optio
2007  if ((process_options & PO_FIXED_STRINGS) != 0)  if ((process_options & PO_FIXED_STRINGS) != 0)
2008    {    {
2009    char *eop = pattern + strlen(pattern);    char *eop = pattern + strlen(pattern);
2010    char buffer[MBUFTHIRD];    char buffer[PATBUFSIZE];
2011    for(;;)    for(;;)
2012      {      {
2013      int ellength;      int ellength;
# Line 2294  for (i = 1; i < argc; i++) Line 2319  for (i = 1; i < argc; i++)
2319      while (*endptr != 0 && isspace((unsigned char)(*endptr))) endptr++;      while (*endptr != 0 && isspace((unsigned char)(*endptr))) endptr++;
2320      while (isdigit((unsigned char)(*endptr)))      while (isdigit((unsigned char)(*endptr)))
2321        n = n * 10 + (int)(*endptr++ - '0');        n = n * 10 + (int)(*endptr++ - '0');
2322        if (toupper(*endptr) == 'K')
2323          {
2324          n *= 1024;
2325          endptr++;
2326          }
2327        else if (toupper(*endptr) == 'M')
2328          {
2329          n *= 1024*1024;
2330          endptr++;
2331          }
2332      if (*endptr != 0)      if (*endptr != 0)
2333        {        {
2334        if (longop)        if (longop)
# Line 2460  if (jfriedl_XT != 0 || jfriedl_XR != 0) Line 2495  if (jfriedl_XT != 0 || jfriedl_XR != 0)
2495    }    }
2496  #endif  #endif
2497    
2498  /* Get memory to store the pattern and hints lists. */  /* Get memory for the main buffer, and to store the pattern and hints lists. */
2499    
2500    bufsize = 3*bufthird;
2501    main_buffer = (char *)malloc(bufsize);
2502  pattern_list = (pcre **)malloc(MAX_PATTERN_COUNT * sizeof(pcre *));  pattern_list = (pcre **)malloc(MAX_PATTERN_COUNT * sizeof(pcre *));
2503  hints_list = (pcre_extra **)malloc(MAX_PATTERN_COUNT * sizeof(pcre_extra *));  hints_list = (pcre_extra **)malloc(MAX_PATTERN_COUNT * sizeof(pcre_extra *));
2504    
2505  if (pattern_list == NULL || hints_list == NULL)  if (main_buffer == NULL || pattern_list == NULL || hints_list == NULL)
2506    {    {
2507    fprintf(stderr, "pcregrep: malloc failed\n");    fprintf(stderr, "pcregrep: malloc failed\n");
2508    goto EXIT2;    goto EXIT2;
# Line 2497  if (pattern_filename != NULL) Line 2534  if (pattern_filename != NULL)
2534    int linenumber = 0;    int linenumber = 0;
2535    FILE *f;    FILE *f;
2536    char *filename;    char *filename;
2537    char buffer[MBUFTHIRD];    char buffer[PATBUFSIZE];
2538    
2539    if (strcmp(pattern_filename, "-") == 0)    if (strcmp(pattern_filename, "-") == 0)
2540      {      {
# Line 2516  if (pattern_filename != NULL) Line 2553  if (pattern_filename != NULL)
2553      filename = pattern_filename;      filename = pattern_filename;
2554      }      }
2555    
2556    while (fgets(buffer, MBUFTHIRD, f) != NULL)    while (fgets(buffer, PATBUFSIZE, f) != NULL)
2557      {      {
2558      char *s = buffer + (int)strlen(buffer);      char *s = buffer + (int)strlen(buffer);
2559      while (s > buffer && isspace((unsigned char)(s[-1]))) s--;      while (s > buffer && isspace((unsigned char)(s[-1]))) s--;
# Line 2628  if (include_dir_pattern != NULL) Line 2665  if (include_dir_pattern != NULL)
2665    
2666  if (i >= argc)  if (i >= argc)
2667    {    {
2668    rc = pcregrep(stdin, FR_PLAIN, (filenames > FN_DEFAULT)? stdin_name : NULL);    rc = pcregrep(stdin, FR_PLAIN, stdin_name,
2669        (filenames > FN_DEFAULT)? stdin_name : NULL);
2670    goto EXIT;    goto EXIT;
2671    }    }
2672    
# Line 2648  for (; i < argc; i++) Line 2686  for (; i < argc; i++)
2686    }    }
2687    
2688  EXIT:  EXIT:
2689    if (main_buffer != NULL) free(main_buffer);
2690  if (pattern_list != NULL)  if (pattern_list != NULL)
2691    {    {
2692    for (i = 0; i < pattern_count; i++) free(pattern_list[i]);    for (i = 0; i < pattern_count; i++) free(pattern_list[i]);

Legend:
Removed from v.636  
changed lines
  Added in v.644

  ViewVC Help
Powered by ViewVC 1.1.5