/[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 152 by ph10, Tue Apr 17 15:55:53 2007 UTC revision 718 by ph10, Wed Oct 5 16:11:19 2011 UTC
# Line 6  Line 6 
6  its pattern matching. On a Unix or Win32 system it can recurse into  its pattern matching. On a Unix or Win32 system it can recurse into
7  directories.  directories.
8    
9             Copyright (c) 1997-2007 University of Cambridge             Copyright (c) 1997-2011 University of Cambridge
10    
11  -----------------------------------------------------------------------------  -----------------------------------------------------------------------------
12  Redistribution and use in source and binary forms, with or without  Redistribution and use in source and binary forms, with or without
# Line 38  POSSIBILITY OF SUCH DAMAGE. Line 38  POSSIBILITY OF SUCH DAMAGE.
38  */  */
39    
40  #ifdef HAVE_CONFIG_H  #ifdef HAVE_CONFIG_H
41  #  include <config.h>  #include "config.h"
42  #endif  #endif
43    
44  #include <ctype.h>  #include <ctype.h>
# Line 50  POSSIBILITY OF SUCH DAMAGE. Line 50  POSSIBILITY OF SUCH DAMAGE.
50    
51  #include <sys/types.h>  #include <sys/types.h>
52  #include <sys/stat.h>  #include <sys/stat.h>
53    
54  #ifdef HAVE_UNISTD_H  #ifdef HAVE_UNISTD_H
55  #  include <unistd.h>  #include <unistd.h>
56    #endif
57    
58    #ifdef SUPPORT_LIBZ
59    #include <zlib.h>
60    #endif
61    
62    #ifdef SUPPORT_LIBBZ2
63    #include <bzlib.h>
64  #endif  #endif
65    
66  #include <pcre.h>  #include "pcre.h"
67    
68  #define FALSE 0  #define FALSE 0
69  #define TRUE 1  #define TRUE 1
# Line 62  POSSIBILITY OF SUCH DAMAGE. Line 71  POSSIBILITY OF SUCH DAMAGE.
71  typedef int BOOL;  typedef int BOOL;
72    
73  #define MAX_PATTERN_COUNT 100  #define MAX_PATTERN_COUNT 100
74    #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
83  output. The order is important; it is assumed that a file name is wanted for  output. The order is important; it is assumed that a file name is wanted for
84  all values greater than FN_DEFAULT. */  all values greater than FN_DEFAULT. */
85    
86  enum { FN_NONE, FN_DEFAULT, FN_ONLY, FN_NOMATCH_ONLY, FN_FORCE };  enum { FN_NONE, FN_DEFAULT, FN_MATCH_ONLY, FN_NOMATCH_ONLY, FN_FORCE };
87    
88    /* File reading styles */
89    
90    enum { FR_PLAIN, FR_LIBZ, FR_LIBBZ2 };
91    
92  /* Actions for the -d and -D options */  /* Actions for the -d and -D options */
93    
# Line 90  enum { DEE_READ, DEE_SKIP }; Line 104  enum { DEE_READ, DEE_SKIP };
104    
105  enum { EL_LF, EL_CR, EL_CRLF, EL_ANY, EL_ANYCRLF };  enum { EL_LF, EL_CR, EL_CRLF, EL_ANY, EL_ANYCRLF };
106    
107    /* In newer versions of gcc, with FORTIFY_SOURCE set (the default in some
108    environments), a warning is issued if the value of fwrite() is ignored.
109    Unfortunately, casting to (void) does not suppress the warning. To get round
110    this, we use a macro that compiles a fudge. Oddly, this does not also seem to
111    apply to fprintf(). */
112    
113    #define FWRITE(a,b,c,d) if (fwrite(a,b,c,d)) {}
114    
115    
116    
117  /*************************************************  /*************************************************
# Line 113  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 126  static pcre_extra **hints_list = NULL; Line 149  static pcre_extra **hints_list = NULL;
149    
150  static char *include_pattern = NULL;  static char *include_pattern = NULL;
151  static char *exclude_pattern = NULL;  static char *exclude_pattern = NULL;
152    static char *include_dir_pattern = NULL;
153    static char *exclude_dir_pattern = NULL;
154    
155  static pcre *include_compiled = NULL;  static pcre *include_compiled = NULL;
156  static pcre *exclude_compiled = NULL;  static pcre *exclude_compiled = NULL;
157    static pcre *include_dir_compiled = NULL;
158    static pcre *exclude_dir_compiled = NULL;
159    
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;
168  static int filenames = FN_DEFAULT;  static int filenames = FN_DEFAULT;
169    static int only_matching = -1;
170  static int process_options = 0;  static int process_options = 0;
171    
172    #ifdef SUPPORT_PCREGREP_JIT
173    static int study_options = PCRE_STUDY_JIT_COMPILE;
174    #else
175    static int study_options = 0;
176    #endif
177    
178    static unsigned long int match_limit = 0;
179    static unsigned long int match_limit_recursion = 0;
180    
181  static BOOL count_only = FALSE;  static BOOL count_only = FALSE;
182  static BOOL do_colour = FALSE;  static BOOL do_colour = FALSE;
183    static BOOL file_offsets = FALSE;
184  static BOOL hyphenpending = FALSE;  static BOOL hyphenpending = FALSE;
185  static BOOL invert = FALSE;  static BOOL invert = FALSE;
186    static BOOL line_buffered = FALSE;
187    static BOOL line_offsets = FALSE;
188  static BOOL multiline = FALSE;  static BOOL multiline = FALSE;
189  static BOOL number = FALSE;  static BOOL number = FALSE;
190  static BOOL only_matching = FALSE;  static BOOL omit_zero_count = FALSE;
191    static BOOL resource_error = FALSE;
192  static BOOL quiet = FALSE;  static BOOL quiet = FALSE;
193  static BOOL silent = FALSE;  static BOOL silent = FALSE;
194  static BOOL utf8 = FALSE;  static BOOL utf8 = FALSE;
195    
196  /* Structure for options and list of them */  /* Structure for options and list of them */
197    
198  enum { OP_NODATA, OP_STRING, OP_OP_STRING, OP_NUMBER, OP_OP_NUMBER,  enum { OP_NODATA, OP_STRING, OP_OP_STRING, OP_NUMBER, OP_LONGNUMBER,
199         OP_PATLIST };         OP_OP_NUMBER, OP_PATLIST };
200    
201  typedef struct option_item {  typedef struct option_item {
202    int type;    int type;
# Line 166  typedef struct option_item { Line 209  typedef struct option_item {
209  /* Options without a single-letter equivalent get a negative value. This can be  /* Options without a single-letter equivalent get a negative value. This can be
210  used to identify them. */  used to identify them. */
211    
212  #define N_COLOUR    (-1)  #define N_COLOUR       (-1)
213  #define N_EXCLUDE   (-2)  #define N_EXCLUDE      (-2)
214  #define N_HELP      (-3)  #define N_EXCLUDE_DIR  (-3)
215  #define N_INCLUDE   (-4)  #define N_HELP         (-4)
216  #define N_LABEL     (-5)  #define N_INCLUDE      (-5)
217  #define N_LOCALE    (-6)  #define N_INCLUDE_DIR  (-6)
218  #define N_NULL      (-7)  #define N_LABEL        (-7)
219    #define N_LOCALE       (-8)
220    #define N_NULL         (-9)
221    #define N_LOFFSETS     (-10)
222    #define N_FOFFSETS     (-11)
223    #define N_LBUFFER      (-12)
224    #define N_M_LIMIT      (-13)
225    #define N_M_LIMIT_REC  (-14)
226    #define N_BUFSIZE      (-15)
227    #define N_NOJIT        (-16)
228    
229  static option_item optionlist[] = {  static option_item optionlist[] = {
230    { OP_NODATA,    N_NULL,   NULL,              "",              "  terminate options" },    { OP_NODATA,     N_NULL,   NULL,              "",              "  terminate options" },
231    { OP_NODATA,    N_HELP,   NULL,              "help",          "display this help and exit" },    { OP_NODATA,     N_HELP,   NULL,              "help",          "display this help and exit" },
232    { 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" },
233    { 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" },
234    { OP_OP_STRING, N_COLOUR, &colour_option,    "color=option",  "matched text color option" },    { OP_NUMBER,     N_BUFSIZE,&bufthird,         "buffer-size=number", "set processing buffer size parameter" },
235    { OP_NUMBER,    'C',      &both_context,     "context=number", "set number of context lines, before & after" },    { OP_OP_STRING,  N_COLOUR, &colour_option,    "color=option",  "matched text color option" },
236    { OP_NODATA,    'c',      NULL,              "count",         "print only a count of matching lines per FILE" },    { OP_OP_STRING,  N_COLOUR, &colour_option,    "colour=option", "matched text colour option" },
237    { OP_OP_STRING, N_COLOUR, &colour_option,    "colour=option", "matched text colour option" },    { OP_NUMBER,     'C',      &both_context,     "context=number", "set number of context lines, before & after" },
238    { OP_STRING,    'D',      &DEE_option,       "devices=action","how to handle devices, FIFOs, and sockets" },    { OP_NODATA,     'c',      NULL,              "count",         "print only a count of matching lines per FILE" },
239    { OP_STRING,    'd',      &dee_option,       "directories=action", "how to handle directories" },    { OP_STRING,     'D',      &DEE_option,       "devices=action","how to handle devices, FIFOs, and sockets" },
240    { OP_PATLIST,   'e',      NULL,              "regex(p)",      "specify pattern (may be used more than once)" },    { OP_STRING,     'd',      &dee_option,       "directories=action", "how to handle directories" },
241    { OP_NODATA,    'F',      NULL,              "fixed_strings", "patterns are sets of newline-separated strings" },    { OP_PATLIST,    'e',      NULL,              "regex(p)=pattern", "specify pattern (may be used more than once)" },
242    { OP_STRING,    'f',      &pattern_filename, "file=path",     "read patterns from file" },    { OP_NODATA,     'F',      NULL,              "fixed-strings", "patterns are sets of newline-separated strings" },
243    { OP_NODATA,    'H',      NULL,              "with-filename", "force the prefixing filename on output" },    { OP_STRING,     'f',      &pattern_filename, "file=path",     "read patterns from file" },
244    { OP_NODATA,    'h',      NULL,              "no-filename",   "suppress the prefixing filename on output" },    { OP_NODATA,     N_FOFFSETS, NULL,            "file-offsets",  "output file offsets, not text" },
245    { OP_NODATA,    'i',      NULL,              "ignore-case",   "ignore case distinctions" },    { OP_NODATA,     'H',      NULL,              "with-filename", "force the prefixing filename on output" },
246    { OP_NODATA,    'l',      NULL,              "files-with-matches", "print only FILE names containing matches" },    { OP_NODATA,     'h',      NULL,              "no-filename",   "suppress the prefixing filename on output" },
247    { OP_NODATA,    'L',      NULL,              "files-without-match","print only FILE names not containing matches" },    { OP_NODATA,     'i',      NULL,              "ignore-case",   "ignore case distinctions" },
248    { OP_STRING,    N_LABEL,  &stdin_name,       "label=name",    "set name for standard input" },  #ifdef SUPPORT_PCREGREP_JIT
249    { OP_STRING,    N_LOCALE, &locale,           "locale=locale", "use the named locale" },    { OP_NODATA,     N_NOJIT,  NULL,              "no-jit",        "do not use just-in-time compiler optimization" },
250    { OP_NODATA,    'M',      NULL,              "multiline",     "run in multiline mode" },  #else
251    { OP_STRING,    'N',      &newline,          "newline=type",  "specify newline type (CR, LF, CRLF, ANYCRLF or ANY)" },    { OP_NODATA,     N_NOJIT,  NULL,              "no-jit",        "ignored: this pcregrep does not support JIT" },
252    { OP_NODATA,    'n',      NULL,              "line-number",   "print line number with output lines" },  #endif
253    { OP_NODATA,    'o',      NULL,              "only-matching", "show only the part of the line that matched" },    { OP_NODATA,     'l',      NULL,              "files-with-matches", "print only FILE names containing matches" },
254    { OP_NODATA,    'q',      NULL,              "quiet",         "suppress output, just set return code" },    { OP_NODATA,     'L',      NULL,              "files-without-match","print only FILE names not containing matches" },
255    { OP_NODATA,    'r',      NULL,              "recursive",     "recursively scan sub-directories" },    { OP_STRING,     N_LABEL,  &stdin_name,       "label=name",    "set name for standard input" },
256    { OP_STRING,    N_EXCLUDE,&exclude_pattern,  "exclude=pattern","exclude matching files when recursing" },    { OP_NODATA,     N_LBUFFER, NULL,             "line-buffered", "use line buffering" },
257    { OP_STRING,    N_INCLUDE,&include_pattern,  "include=pattern","include matching files when recursing" },    { OP_NODATA,     N_LOFFSETS, NULL,            "line-offsets",  "output line numbers and offsets, not text" },
258      { OP_STRING,     N_LOCALE, &locale,           "locale=locale", "use the named locale" },
259      { OP_LONGNUMBER, N_M_LIMIT, &match_limit,     "match-limit=number", "set PCRE match limit option" },
260      { OP_LONGNUMBER, N_M_LIMIT_REC, &match_limit_recursion, "recursion-limit=number", "set PCRE match recursion limit option" },
261      { OP_NODATA,     'M',      NULL,              "multiline",     "run in multiline mode" },
262      { OP_STRING,     'N',      &newline,          "newline=type",  "set newline type (CR, LF, CRLF, ANYCRLF or ANY)" },
263      { OP_NODATA,     'n',      NULL,              "line-number",   "print line number with output lines" },
264      { OP_OP_NUMBER,  'o',      &only_matching,    "only-matching=n", "show only the part of the line that matched" },
265      { OP_NODATA,     'q',      NULL,              "quiet",         "suppress output, just set return code" },
266      { OP_NODATA,     'r',      NULL,              "recursive",     "recursively scan sub-directories" },
267      { OP_STRING,     N_EXCLUDE,&exclude_pattern,  "exclude=pattern","exclude matching files when recursing" },
268      { OP_STRING,     N_INCLUDE,&include_pattern,  "include=pattern","include matching files when recursing" },
269      { OP_STRING,     N_EXCLUDE_DIR,&exclude_dir_pattern, "exclude-dir=pattern","exclude matching directories when recursing" },
270      { OP_STRING,     N_INCLUDE_DIR,&include_dir_pattern, "include-dir=pattern","include matching directories when recursing" },
271    
272      /* These two were accidentally implemented with underscores instead of
273      hyphens in the option names. As this was not discovered for several releases,
274      the incorrect versions are left in the table for compatibility. However, the
275      --help function misses out any option that has an underscore in its name. */
276    
277      { OP_STRING,    N_EXCLUDE_DIR,&exclude_dir_pattern, "exclude_dir=pattern","exclude matching directories when recursing" },
278      { OP_STRING,    N_INCLUDE_DIR,&include_dir_pattern, "include_dir=pattern","include matching directories when recursing" },
279    
280  #ifdef JFRIEDL_DEBUG  #ifdef JFRIEDL_DEBUG
281    { OP_OP_NUMBER, 'S',      &S_arg,            "jeffS",         "replace matched (sub)string with X" },    { OP_OP_NUMBER, 'S',      &S_arg,            "jeffS",         "replace matched (sub)string with X" },
282  #endif  #endif
# Line 239  const char utf8_table4[] = { Line 313  const char utf8_table4[] = {
313    
314    
315  /*************************************************  /*************************************************
316    *         Exit from the program                  *
317    *************************************************/
318    
319    /* If there has been a resource error, give a suitable message.
320    
321    Argument:  the return code
322    Returns:   does not return
323    */
324    
325    static void
326    pcregrep_exit(int rc)
327    {
328    if (resource_error)
329      {
330      fprintf(stderr, "pcregrep: Error %d, %d or %d means that a resource limit "
331        "was exceeded.\n", PCRE_ERROR_MATCHLIMIT, PCRE_ERROR_RECURSIONLIMIT,
332        PCRE_ERROR_JIT_STACKLIMIT);
333      fprintf(stderr, "pcregrep: Check your regex for nested unlimited loops.\n");
334      }
335    
336    exit(rc);
337    }
338    
339    
340    /*************************************************
341  *            OS-specific functions               *  *            OS-specific functions               *
342  *************************************************/  *************************************************/
343    
# Line 302  return (statbuf.st_mode & S_IFMT) == S_I Line 401  return (statbuf.st_mode & S_IFMT) == S_I
401  }  }
402    
403    
404  /************* Test stdout for being a terminal in Unix **********/  /************* Test for a terminal in Unix **********/
405    
406  static BOOL  static BOOL
407  is_stdout_tty(void)  is_stdout_tty(void)
# Line 310  is_stdout_tty(void) Line 409  is_stdout_tty(void)
409  return isatty(fileno(stdout));  return isatty(fileno(stdout));
410  }  }
411    
412    static BOOL
413    is_file_tty(FILE *f)
414    {
415    return isatty(fileno(f));
416    }
417    
418    
419  /************* Directory scanning in Win32 ***********/  /************* Directory scanning in Win32 ***********/
420    
421  /* I (Philip Hazel) have no means of testing this code. It was contributed by  /* I (Philip Hazel) have no means of testing this code. It was contributed by
422  Lionel Fourquaux. David Burgess added a patch to define INVALID_FILE_ATTRIBUTES  Lionel Fourquaux. David Burgess added a patch to define INVALID_FILE_ATTRIBUTES
423  when it did not exist. */  when it did not exist. David Byron added a patch that moved the #include of
424    <windows.h> to before the INVALID_FILE_ATTRIBUTES definition rather than after.
425    The double test below stops gcc 4.4.4 grumbling that HAVE_WINDOWS_H is
426    undefined when it is indeed undefined. */
427    
428  #elif HAVE_WINDOWS_H  #elif defined HAVE_WINDOWS_H && HAVE_WINDOWS_H
429    
430  #ifndef STRICT  #ifndef STRICT
431  # define STRICT  # define STRICT
# Line 326  when it did not exist. */ Line 433  when it did not exist. */
433  #ifndef WIN32_LEAN_AND_MEAN  #ifndef WIN32_LEAN_AND_MEAN
434  # define WIN32_LEAN_AND_MEAN  # define WIN32_LEAN_AND_MEAN
435  #endif  #endif
436    
437    #include <windows.h>
438    
439  #ifndef INVALID_FILE_ATTRIBUTES  #ifndef INVALID_FILE_ATTRIBUTES
440  #define INVALID_FILE_ATTRIBUTES 0xFFFFFFFF  #define INVALID_FILE_ATTRIBUTES 0xFFFFFFFF
441  #endif  #endif
442    
 #include <windows.h>  
   
443  typedef struct directory_type  typedef struct directory_type
444  {  {
445  HANDLE handle;  HANDLE handle;
# Line 361  dir = (directory_type *) malloc(sizeof(* Line 469  dir = (directory_type *) malloc(sizeof(*
469  if ((pattern == NULL) || (dir == NULL))  if ((pattern == NULL) || (dir == NULL))
470    {    {
471    fprintf(stderr, "pcregrep: malloc failed\n");    fprintf(stderr, "pcregrep: malloc failed\n");
472    exit(2);    pcregrep_exit(2);
473    }    }
474  memcpy(pattern, filename, len);  memcpy(pattern, filename, len);
475  memcpy(&(pattern[len]), "\\*", 3);  memcpy(&(pattern[len]), "\\*", 3);
# Line 416  regular if they are not directories. */ Line 524  regular if they are not directories. */
524    
525  int isregfile(char *filename)  int isregfile(char *filename)
526  {  {
527  return !isdirectory(filename)  return !isdirectory(filename);
528  }  }
529    
530    
531  /************* Test stdout for being a terminal in Win32 **********/  /************* Test for a terminal in Win32 **********/
532    
533  /* I don't know how to do this; assume never */  /* I don't know how to do this; assume never */
534    
535  static BOOL  static BOOL
536  is_stdout_tty(void)  is_stdout_tty(void)
537  {  {
538  FALSE;  return FALSE;
539    }
540    
541    static BOOL
542    is_file_tty(FILE *f)
543    {
544    return FALSE;
545  }  }
546    
547    
# Line 452  void closedirectory(directory_type *dir) Line 566  void closedirectory(directory_type *dir)
566  int isregfile(char *filename) { return 1; }  int isregfile(char *filename) { return 1; }
567    
568    
569  /************* Test stdout for being a terminal when we can't do it **********/  /************* Test for a terminal when we can't do it **********/
570    
571  static BOOL  static BOOL
572  is_stdout_tty(void)  is_stdout_tty(void)
# Line 460  is_stdout_tty(void) Line 574  is_stdout_tty(void)
574  return FALSE;  return FALSE;
575  }  }
576    
577    static BOOL
578    is_file_tty(FILE *f)
579    {
580    return FALSE;
581    }
582    
583  #endif  #endif
584    
# Line 488  return sys_errlist[n]; Line 607  return sys_errlist[n];
607    
608    
609  /*************************************************  /*************************************************
610    *            Read one line of input              *
611    *************************************************/
612    
613    /* Normally, input is read using fread() into a large buffer, so many lines may
614    be read at once. However, doing this for tty input means that no output appears
615    until a lot of input has been typed. Instead, tty input is handled line by
616    line. We cannot use fgets() for this, because it does not stop at a binary
617    zero, and therefore there is no way of telling how many characters it has read,
618    because there may be binary zeros embedded in the data.
619    
620    Arguments:
621      buffer     the buffer to read into
622      length     the maximum number of characters to read
623      f          the file
624    
625    Returns:     the number of characters read, zero at end of file
626    */
627    
628    static int
629    read_one_line(char *buffer, int length, FILE *f)
630    {
631    int c;
632    int yield = 0;
633    while ((c = fgetc(f)) != EOF)
634      {
635      buffer[yield++] = c;
636      if (c == '\n' || yield >= length) break;
637      }
638    return yield;
639    }
640    
641    
642    
643    /*************************************************
644  *             Find end of line                   *  *             Find end of line                   *
645  *************************************************/  *************************************************/
646    
# Line 499  Arguments: Line 652  Arguments:
652    endptr    end of available data    endptr    end of available data
653    lenptr    where to put the length of the eol sequence    lenptr    where to put the length of the eol sequence
654    
655  Returns:    pointer to the last byte of the line  Returns:    pointer after the last byte of the line,
656                including the newline byte(s)
657  */  */
658    
659  static char *  static char *
# Line 782  if (after_context > 0 && lastmatchnumber Line 936  if (after_context > 0 && lastmatchnumber
936      if (printname != NULL) fprintf(stdout, "%s-", printname);      if (printname != NULL) fprintf(stdout, "%s-", printname);
937      if (number) fprintf(stdout, "%d-", lastmatchnumber++);      if (number) fprintf(stdout, "%d-", lastmatchnumber++);
938      pp = end_of_line(pp, endptr, &ellength);      pp = end_of_line(pp, endptr, &ellength);
939      fwrite(lastmatchrestart, 1, pp - lastmatchrestart, stdout);      FWRITE(lastmatchrestart, 1, pp - lastmatchrestart, stdout);
940      lastmatchrestart = pp;      lastmatchrestart = pp;
941      }      }
942    hyphenpending = TRUE;    hyphenpending = TRUE;
# Line 792  if (after_context > 0 && lastmatchnumber Line 946  if (after_context > 0 && lastmatchnumber
946    
947    
948  /*************************************************  /*************************************************
949    *   Apply patterns to subject till one matches   *
950    *************************************************/
951    
952    /* This function is called to run through all patterns, looking for a match. It
953    is used multiple times for the same subject when colouring is enabled, in order
954    to find all possible matches.
955    
956    Arguments:
957      matchptr     the start of the subject
958      length       the length of the subject to match
959      startoffset  where to start matching
960      offsets      the offets vector to fill in
961      mrc          address of where to put the result of pcre_exec()
962    
963    Returns:      TRUE if there was a match
964                  FALSE if there was no match
965                  invert if there was a non-fatal error
966    */
967    
968    static BOOL
969    match_patterns(char *matchptr, size_t length, int startoffset, int *offsets,
970      int *mrc)
971    {
972    int i;
973    size_t slen = length;
974    const char *msg = "this text:\n\n";
975    if (slen > 200)
976      {
977      slen = 200;
978      msg = "text that starts:\n\n";
979      }
980    for (i = 0; i < pattern_count; i++)
981      {
982      *mrc = pcre_exec(pattern_list[i], hints_list[i], matchptr, (int)length,
983        startoffset, PCRE_NOTEMPTY, offsets, OFFSET_SIZE);
984      if (*mrc >= 0) return TRUE;
985      if (*mrc == PCRE_ERROR_NOMATCH) continue;
986      fprintf(stderr, "pcregrep: pcre_exec() gave error %d while matching ", *mrc);
987      if (pattern_count > 1) fprintf(stderr, "pattern number %d to ", i+1);
988      fprintf(stderr, "%s", msg);
989      FWRITE(matchptr, 1, slen, stderr);   /* In case binary zero included */
990      fprintf(stderr, "\n\n");
991      if (*mrc == PCRE_ERROR_MATCHLIMIT || *mrc == PCRE_ERROR_RECURSIONLIMIT ||
992          *mrc == PCRE_ERROR_JIT_STACKLIMIT)
993        resource_error = TRUE;
994      if (error_count++ > 20)
995        {
996        fprintf(stderr, "pcregrep: Too many errors - abandoned.\n");
997        pcregrep_exit(2);
998        }
999      return invert;    /* No more matching; don't show the line again */
1000      }
1001    
1002    return FALSE;  /* No match, no errors */
1003    }
1004    
1005    
1006    
1007    /*************************************************
1008  *            Grep an individual file             *  *            Grep an individual file             *
1009  *************************************************/  *************************************************/
1010    
1011  /* 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
1012  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
1013  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
1014  context printing or for multiline scanning. For large files, the pointer will  context printing or for multiline scanning. For large files, the pointer will
1015  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
1016  "before" context printing.  "before" context printing.
1017    
1018  Arguments:  Arguments:
1019    in           the fopened FILE stream    handle       the fopened FILE stream for a normal file
1020                   the gzFile pointer when reading is via libz
1021                   the BZFILE pointer when reading is via libbz2
1022      frtype       FR_PLAIN, FR_LIBZ, or FR_LIBBZ2
1023      filename     the file name or NULL (for errors)
1024    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
1025                 or NULL if the file name is not to be printed                 or NULL if the file name is not to be printed
1026                 it cannot be NULL if filenames[_nomatch]_only is set                 it cannot be NULL if filenames[_nomatch]_only is set
1027    
1028  Returns:       0 if there was at least one match  Returns:       0 if there was at least one match
1029                 1 otherwise (no matches)                 1 otherwise (no matches)
1030                   2 if an overlong line is encountered
1031                   3 if there is a read error on a .bz2 file
1032  */  */
1033    
1034  static int  static int
1035  pcregrep(FILE *in, char *printname)  pcregrep(void *handle, int frtype, char *filename, char *printname)
1036  {  {
1037  int rc = 1;  int rc = 1;
1038  int linenumber = 1;  int linenumber = 1;
1039  int lastmatchnumber = 0;  int lastmatchnumber = 0;
1040  int count = 0;  int count = 0;
1041  int offsets[99];  int filepos = 0;
1042    int offsets[OFFSET_SIZE];
1043  char *lastmatchrestart = NULL;  char *lastmatchrestart = NULL;
1044  char buffer[3*MBUFTHIRD];  char *ptr = main_buffer;
 char *ptr = buffer;  
1045  char *endptr;  char *endptr;
1046  size_t bufflength;  size_t bufflength;
1047  BOOL endhyphenpending = FALSE;  BOOL endhyphenpending = FALSE;
1048    BOOL input_line_buffered = line_buffered;
1049    FILE *in = NULL;                    /* Ensure initialized */
1050    
1051  /* Do the first read into the start of the buffer and set up the pointer to  #ifdef SUPPORT_LIBZ
1052  end of what we have. */  gzFile ingz = NULL;
1053    #endif
1054    
1055  bufflength = fread(buffer, 1, 3*MBUFTHIRD, in);  #ifdef SUPPORT_LIBBZ2
1056  endptr = buffer + bufflength;  BZFILE *inbz2 = NULL;
1057    #endif
1058    
1059    
1060    /* Do the first read into the start of the buffer and set up the pointer to end
1061    of what we have. In the case of libz, a non-zipped .gz file will be read as a
1062    plain file. However, if a .bz2 file isn't actually bzipped, the first read will
1063    fail. */
1064    
1065    #ifdef SUPPORT_LIBZ
1066    if (frtype == FR_LIBZ)
1067      {
1068      ingz = (gzFile)handle;
1069      bufflength = gzread (ingz, main_buffer, bufsize);
1070      }
1071    else
1072    #endif
1073    
1074    #ifdef SUPPORT_LIBBZ2
1075    if (frtype == FR_LIBBZ2)
1076      {
1077      inbz2 = (BZFILE *)handle;
1078      bufflength = BZ2_bzread(inbz2, main_buffer, bufsize);
1079      if ((int)bufflength < 0) return 2;   /* Gotcha: bufflength is size_t; */
1080      }                                    /* without the cast it is unsigned. */
1081    else
1082    #endif
1083    
1084      {
1085      in = (FILE *)handle;
1086      if (is_file_tty(in)) input_line_buffered = TRUE;
1087      bufflength = input_line_buffered?
1088        read_one_line(main_buffer, bufsize, in) :
1089        fread(main_buffer, 1, bufsize, in);
1090      }
1091    
1092    endptr = main_buffer + bufflength;
1093    
1094  /* 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
1095  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 840  way, the buffer is shifted left and re-f Line 1098  way, the buffer is shifted left and re-f
1098    
1099  while (ptr < endptr)  while (ptr < endptr)
1100    {    {
1101    int i, endlinelength;    int endlinelength;
1102    int mrc = 0;    int mrc = 0;
1103    BOOL match = FALSE;    int startoffset = 0;
1104      BOOL match;
1105      char *matchptr = ptr;
1106    char *t = ptr;    char *t = ptr;
1107    size_t length, linelength;    size_t length, linelength;
1108    
1109    /* At this point, ptr is at the start of a line. We need to find the length    /* At this point, ptr is at the start of a line. We need to find the length
1110    of the subject string to pass to pcre_exec(). In multiline mode, it is the    of the subject string to pass to pcre_exec(). In multiline mode, it is the
1111    length remainder of the data in the buffer. Otherwise, it is the length of    length remainder of the data in the buffer. Otherwise, it is the length of
1112    the next line. After matching, we always advance by the length of the next    the next line, excluding the terminating newline. After matching, we always
1113    line. In multiline mode the PCRE_FIRSTLINE option is used for compiling, so    advance by the length of the next line. In multiline mode the PCRE_FIRSTLINE
1114    that any match is constrained to be in the first line. */    option is used for compiling, so that any match is constrained to be in the
1115      first line. */
1116    
1117    t = end_of_line(t, endptr, &endlinelength);    t = end_of_line(t, endptr, &endlinelength);
1118    linelength = t - ptr - endlinelength;    linelength = t - ptr - endlinelength;
1119    length = multiline? endptr - ptr : linelength;    length = multiline? (size_t)(endptr - ptr) : linelength;
1120    
1121      /* Check to see if the line we are looking at extends right to the very end
1122      of the buffer without a line terminator. This means the line is too long to
1123      handle. */
1124    
1125      if (endlinelength == 0 && t == main_buffer + bufsize)
1126        {
1127        fprintf(stderr, "pcregrep: line %d%s%s is too long for the internal buffer\n"
1128                        "pcregrep: check the --buffer-size option\n",
1129                        linenumber,
1130                        (filename == NULL)? "" : " of file ",
1131                        (filename == NULL)? "" : filename);
1132        return 2;
1133        }
1134    
1135    /* Extra processing for Jeffrey Friedl's debugging. */    /* Extra processing for Jeffrey Friedl's debugging. */
1136    
# Line 866  while (ptr < endptr) Line 1141  while (ptr < endptr)
1141        #include <time.h>        #include <time.h>
1142        struct timeval start_time, end_time;        struct timeval start_time, end_time;
1143        struct timezone dummy;        struct timezone dummy;
1144          int i;
1145    
1146        if (jfriedl_XT)        if (jfriedl_XT)
1147        {        {
# Line 874  while (ptr < endptr) Line 1150  while (ptr < endptr)
1150            ptr = malloc(newlen + 1);            ptr = malloc(newlen + 1);
1151            if (!ptr) {            if (!ptr) {
1152                    printf("out of memory");                    printf("out of memory");
1153                    exit(2);                    pcregrep_exit(2);
1154            }            }
1155            endptr = ptr;            endptr = ptr;
1156            strcpy(endptr, jfriedl_prefix); endptr += strlen(jfriedl_prefix);            strcpy(endptr, jfriedl_prefix); endptr += strlen(jfriedl_prefix);
# Line 891  while (ptr < endptr) Line 1167  while (ptr < endptr)
1167    
1168    
1169        for (i = 0; i < jfriedl_XR; i++)        for (i = 0; i < jfriedl_XR; i++)
1170            match = (pcre_exec(pattern_list[0], hints_list[0], ptr, length, 0, 0, offsets, 99) >= 0);            match = (pcre_exec(pattern_list[0], hints_list[0], ptr, length, 0,
1171                  PCRE_NOTEMPTY, offsets, OFFSET_SIZE) >= 0);
1172    
1173        if (gettimeofday(&end_time, &dummy) != 0)        if (gettimeofday(&end_time, &dummy) != 0)
1174                perror("bad gettimeofday");                perror("bad gettimeofday");
# Line 905  while (ptr < endptr) Line 1182  while (ptr < endptr)
1182    }    }
1183  #endif  #endif
1184    
1185      /* We come back here after a match when the -o option (only_matching) is set,
1186      in order to find any further matches in the same line. */
1187    
1188    /* Run through all the patterns until one matches. Note that we don't include    ONLY_MATCHING_RESTART:
   the final newline in the subject string. */  
1189    
1190    for (i = 0; i < pattern_count; i++)    /* Run through all the patterns until one matches or there is an error other
1191      {    than NOMATCH. This code is in a subroutine so that it can be re-used for
1192      mrc = pcre_exec(pattern_list[i], hints_list[i], ptr, length, 0, 0,    finding subsequent matches when colouring matched lines. */
1193        offsets, 99);  
1194      if (mrc >= 0) { match = TRUE; break; }    match = match_patterns(matchptr, length, startoffset, offsets, &mrc);
     if (mrc != PCRE_ERROR_NOMATCH)  
       {  
       fprintf(stderr, "pcregrep: pcre_exec() error %d while matching ", mrc);  
       if (pattern_count > 1) fprintf(stderr, "pattern number %d to ", i+1);  
       fprintf(stderr, "this line:\n");  
       fwrite(ptr, 1, linelength, stderr);   /* In case binary zero included */  
       fprintf(stderr, "\n");  
       if (error_count == 0 &&  
           (mrc == PCRE_ERROR_MATCHLIMIT || mrc == PCRE_ERROR_RECURSIONLIMIT))  
         {  
         fprintf(stderr, "pcregrep: error %d means that a resource limit "  
           "was exceeded\n", mrc);  
         fprintf(stderr, "pcregrep: check your regex for nested unlimited loops\n");  
         }  
       if (error_count++ > 20)  
         {  
         fprintf(stderr, "pcregrep: too many errors - abandoned\n");  
         exit(2);  
         }  
       match = invert;    /* No more matching; don't show the line again */  
       break;  
       }  
     }  
1195    
1196    /* If it's a match or a not-match (as required), do what's wanted. */    /* If it's a match or a not-match (as required), do what's wanted. */
1197    
# Line 955  while (ptr < endptr) Line 1210  while (ptr < endptr)
1210      /* If all we want is a file name, there is no need to scan any more lines      /* If all we want is a file name, there is no need to scan any more lines
1211      in the file. */      in the file. */
1212    
1213      else if (filenames == FN_ONLY)      else if (filenames == FN_MATCH_ONLY)
1214        {        {
1215        fprintf(stdout, "%s\n", printname);        fprintf(stdout, "%s\n", printname);
1216        return 0;        return 0;
# Line 965  while (ptr < endptr) Line 1220  while (ptr < endptr)
1220    
1221      else if (quiet) return 0;      else if (quiet) return 0;
1222    
1223      /* The --only-matching option prints just the substring that matched, and      /* The --only-matching option prints just the substring that matched, or a
1224      does not pring any context. */      captured portion of it, as long as this string is not empty, and the
1225        --file-offsets and --line-offsets options output offsets for the matching
1226        substring (they both force --only-matching = 0). None of these options
1227        prints any context. Afterwards, adjust the start and then jump back to look
1228        for further matches in the same line. If we are in invert mode, however,
1229        nothing is printed and we do not restart - this could still be useful
1230        because the return code is set. */
1231    
1232      else if (only_matching)      else if (only_matching >= 0)
1233        {        {
1234        if (printname != NULL) fprintf(stdout, "%s:", printname);        if (!invert)
1235        if (number) fprintf(stdout, "%d:", linenumber);          {
1236        fwrite(ptr + offsets[0], 1, offsets[1] - offsets[0], stdout);          if (printname != NULL) fprintf(stdout, "%s:", printname);
1237        fprintf(stdout, "\n");          if (number) fprintf(stdout, "%d:", linenumber);
1238            if (line_offsets)
1239              fprintf(stdout, "%d,%d\n", (int)(matchptr + offsets[0] - ptr),
1240                offsets[1] - offsets[0]);
1241            else if (file_offsets)
1242              fprintf(stdout, "%d,%d\n",
1243                (int)(filepos + matchptr + offsets[0] - ptr),
1244                offsets[1] - offsets[0]);
1245            else if (only_matching < mrc)
1246              {
1247              int plen = offsets[2*only_matching + 1] - offsets[2*only_matching];
1248              if (plen > 0)
1249                {
1250                if (do_colour) fprintf(stdout, "%c[%sm", 0x1b, colour_string);
1251                FWRITE(matchptr + offsets[only_matching*2], 1, plen, stdout);
1252                if (do_colour) fprintf(stdout, "%c[00m", 0x1b);
1253                fprintf(stdout, "\n");
1254                }
1255              }
1256            else if (printname != NULL || number) fprintf(stdout, "\n");
1257            match = FALSE;
1258            if (line_buffered) fflush(stdout);
1259            rc = 0;                      /* Had some success */
1260            startoffset = offsets[1];    /* Restart after the match */
1261            goto ONLY_MATCHING_RESTART;
1262            }
1263        }        }
1264    
1265      /* This is the default case when none of the above options is set. We print      /* This is the default case when none of the above options is set. We print
# Line 1007  while (ptr < endptr) Line 1293  while (ptr < endptr)
1293            if (printname != NULL) fprintf(stdout, "%s-", printname);            if (printname != NULL) fprintf(stdout, "%s-", printname);
1294            if (number) fprintf(stdout, "%d-", lastmatchnumber++);            if (number) fprintf(stdout, "%d-", lastmatchnumber++);
1295            pp = end_of_line(pp, endptr, &ellength);            pp = end_of_line(pp, endptr, &ellength);
1296            fwrite(lastmatchrestart, 1, pp - lastmatchrestart, stdout);            FWRITE(lastmatchrestart, 1, pp - lastmatchrestart, stdout);
1297            lastmatchrestart = pp;            lastmatchrestart = pp;
1298            }            }
1299          if (lastmatchrestart != ptr) hyphenpending = TRUE;          if (lastmatchrestart != ptr) hyphenpending = TRUE;
# Line 1030  while (ptr < endptr) Line 1316  while (ptr < endptr)
1316          int linecount = 0;          int linecount = 0;
1317          char *p = ptr;          char *p = ptr;
1318    
1319          while (p > buffer && (lastmatchnumber == 0 || p > lastmatchrestart) &&          while (p > main_buffer && (lastmatchnumber == 0 || p > lastmatchrestart) &&
1320                 linecount < before_context)                 linecount < before_context)
1321            {            {
1322            linecount++;            linecount++;
1323            p = previous_line(p, buffer);            p = previous_line(p, main_buffer);
1324            }            }
1325    
1326          if (lastmatchnumber > 0 && p > lastmatchrestart && !hyphenprinted)          if (lastmatchnumber > 0 && p > lastmatchrestart && !hyphenprinted)
# Line 1047  while (ptr < endptr) Line 1333  while (ptr < endptr)
1333            if (printname != NULL) fprintf(stdout, "%s-", printname);            if (printname != NULL) fprintf(stdout, "%s-", printname);
1334            if (number) fprintf(stdout, "%d-", linenumber - linecount--);            if (number) fprintf(stdout, "%d-", linenumber - linecount--);
1335            pp = end_of_line(pp, endptr, &ellength);            pp = end_of_line(pp, endptr, &ellength);
1336            fwrite(p, 1, pp - p, stdout);            FWRITE(p, 1, pp - p, stdout);
1337            p = pp;            p = pp;
1338            }            }
1339          }          }
# Line 1063  while (ptr < endptr) Line 1349  while (ptr < endptr)
1349    
1350        /* In multiline mode, we want to print to the end of the line in which        /* In multiline mode, we want to print to the end of the line in which
1351        the end of the matched string is found, so we adjust linelength and the        the end of the matched string is found, so we adjust linelength and the
1352        line number appropriately. Because the PCRE_FIRSTLINE option is set, the        line number appropriately, but only when there actually was a match
1353        start of the match will always be before the first newline sequence. */        (invert not set). Because the PCRE_FIRSTLINE option is set, the start of
1354          the match will always be before the first newline sequence. */
1355    
1356        if (multiline)        if (multiline & !invert)
1357          {          {
         int ellength;  
1358          char *endmatch = ptr + offsets[1];          char *endmatch = ptr + offsets[1];
1359          t = ptr;          t = ptr;
1360          while (t < endmatch)          while (t < endmatch)
1361            {            {
1362            t = end_of_line(t, endptr, &ellength);            t = end_of_line(t, endptr, &endlinelength);
1363            if (t <= endmatch) linenumber++; else break;            if (t < endmatch) linenumber++; else break;
1364            }            }
1365          endmatch = end_of_line(endmatch, endptr, &ellength);          linelength = t - ptr - endlinelength;
         linelength = endmatch - ptr - ellength;  
1366          }          }
1367    
1368        /*** NOTE: Use only fwrite() to output the data line, so that binary        /*** NOTE: Use only fwrite() to output the data line, so that binary
# Line 1092  while (ptr < endptr) Line 1377  while (ptr < endptr)
1377          {          {
1378          int first = S_arg * 2;          int first = S_arg * 2;
1379          int last  = first + 1;          int last  = first + 1;
1380          fwrite(ptr, 1, offsets[first], stdout);          FWRITE(ptr, 1, offsets[first], stdout);
1381          fprintf(stdout, "X");          fprintf(stdout, "X");
1382          fwrite(ptr + offsets[last], 1, linelength - offsets[last], stdout);          FWRITE(ptr + offsets[last], 1, linelength - offsets[last], stdout);
1383          }          }
1384        else        else
1385  #endif  #endif
1386    
1387        /* We have to split the line(s) up if colouring. */        /* We have to split the line(s) up if colouring, and search for further
1388          matches, but not of course if the line is a non-match. */
1389    
1390        if (do_colour)        if (do_colour && !invert)
1391          {          {
1392          fwrite(ptr, 1, offsets[0], stdout);          int plength;
1393            FWRITE(ptr, 1, offsets[0], stdout);
1394          fprintf(stdout, "%c[%sm", 0x1b, colour_string);          fprintf(stdout, "%c[%sm", 0x1b, colour_string);
1395          fwrite(ptr + offsets[0], 1, offsets[1] - offsets[0], stdout);          FWRITE(ptr + offsets[0], 1, offsets[1] - offsets[0], stdout);
1396          fprintf(stdout, "%c[00m", 0x1b);          fprintf(stdout, "%c[00m", 0x1b);
1397          fwrite(ptr + offsets[1], 1, linelength - offsets[1], stdout);          for (;;)
1398              {
1399              startoffset = offsets[1];
1400              if (startoffset >= (int)linelength + endlinelength ||
1401                  !match_patterns(matchptr, length, startoffset, offsets, &mrc))
1402                break;
1403              FWRITE(matchptr + startoffset, 1, offsets[0] - startoffset, stdout);
1404              fprintf(stdout, "%c[%sm", 0x1b, colour_string);
1405              FWRITE(matchptr + offsets[0], 1, offsets[1] - offsets[0], stdout);
1406              fprintf(stdout, "%c[00m", 0x1b);
1407              }
1408    
1409            /* In multiline mode, we may have already printed the complete line
1410            and its line-ending characters (if they matched the pattern), so there
1411            may be no more to print. */
1412    
1413            plength = (linelength + endlinelength) - startoffset;
1414            if (plength > 0) FWRITE(ptr + startoffset, 1, plength, stdout);
1415          }          }
1416        else fwrite(ptr, 1, linelength + endlinelength, stdout);  
1417          /* Not colouring; no need to search for further matches */
1418    
1419          else FWRITE(ptr, 1, linelength + endlinelength, stdout);
1420        }        }
1421    
1422      /* End of doing what has to be done for a match */      /* End of doing what has to be done for a match. If --line-buffered was
1423        given, flush the output. */
1424    
1425        if (line_buffered) fflush(stdout);
1426      rc = 0;    /* Had some success */      rc = 0;    /* Had some success */
1427    
1428      /* Remember where the last match happened for after_context. We remember      /* Remember where the last match happened for after_context. We remember
# Line 1123  while (ptr < endptr) Line 1432  while (ptr < endptr)
1432      lastmatchnumber = linenumber + 1;      lastmatchnumber = linenumber + 1;
1433      }      }
1434    
1435    /* Advance to after the newline and increment the line number. */    /* For a match in multiline inverted mode (which of course did not cause
1436      anything to be printed), we have to move on to the end of the match before
1437      proceeding. */
1438    
1439      if (multiline && invert && match)
1440        {
1441        int ellength;
1442        char *endmatch = ptr + offsets[1];
1443        t = ptr;
1444        while (t < endmatch)
1445          {
1446          t = end_of_line(t, endptr, &ellength);
1447          if (t <= endmatch) linenumber++; else break;
1448          }
1449        endmatch = end_of_line(endmatch, endptr, &ellength);
1450        linelength = endmatch - ptr - ellength;
1451        }
1452    
1453      /* Advance to after the newline and increment the line number. The file
1454      offset to the current line is maintained in filepos. */
1455    
1456    ptr += linelength + endlinelength;    ptr += linelength + endlinelength;
1457      filepos += (int)(linelength + endlinelength);
1458    linenumber++;    linenumber++;
1459    
1460      /* If input is line buffered, and the buffer is not yet full, read another
1461      line and add it into the buffer. */
1462    
1463      if (input_line_buffered && bufflength < (size_t)bufsize)
1464        {
1465        int add = read_one_line(ptr, bufsize - (ptr - main_buffer), in);
1466        bufflength += add;
1467        endptr += add;
1468        }
1469    
1470    /* If we haven't yet reached the end of the file (the buffer is full), and    /* If we haven't yet reached the end of the file (the buffer is full), and
1471    the current point is in the top 1/3 of the buffer, slide the buffer down by    the current point is in the top 1/3 of the buffer, slide the buffer down by
1472    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
1473    about to be lost, print them. */    about to be lost, print them. */
1474    
1475    if (bufflength >= sizeof(buffer) && ptr > buffer + 2*MBUFTHIRD)    if (bufflength >= (size_t)bufsize && ptr > main_buffer + 2*bufthird)
1476      {      {
1477      if (after_context > 0 &&      if (after_context > 0 &&
1478          lastmatchnumber > 0 &&          lastmatchnumber > 0 &&
1479          lastmatchrestart < buffer + MBUFTHIRD)          lastmatchrestart < main_buffer + bufthird)
1480        {        {
1481        do_after_lines(lastmatchnumber, lastmatchrestart, endptr, printname);        do_after_lines(lastmatchnumber, lastmatchrestart, endptr, printname);
1482        lastmatchnumber = 0;        lastmatchnumber = 0;
# Line 1145  while (ptr < endptr) Line 1484  while (ptr < endptr)
1484    
1485      /* Now do the shuffle */      /* Now do the shuffle */
1486    
1487      memmove(buffer, buffer + MBUFTHIRD, 2*MBUFTHIRD);      memmove(main_buffer, main_buffer + bufthird, 2*bufthird);
1488      ptr -= MBUFTHIRD;      ptr -= bufthird;
1489      bufflength = 2*MBUFTHIRD + fread(buffer + 2*MBUFTHIRD, 1, MBUFTHIRD, in);  
1490      endptr = buffer + bufflength;  #ifdef SUPPORT_LIBZ
1491        if (frtype == FR_LIBZ)
1492          bufflength = 2*bufthird +
1493            gzread (ingz, main_buffer + 2*bufthird, bufthird);
1494        else
1495    #endif
1496    
1497    #ifdef SUPPORT_LIBBZ2
1498        if (frtype == FR_LIBBZ2)
1499          bufflength = 2*bufthird +
1500            BZ2_bzread(inbz2, main_buffer + 2*bufthird, bufthird);
1501        else
1502    #endif
1503    
1504        bufflength = 2*bufthird +
1505          (input_line_buffered?
1506           read_one_line(main_buffer + 2*bufthird, bufthird, in) :
1507           fread(main_buffer + 2*bufthird, 1, bufthird, in));
1508        endptr = main_buffer + bufflength;
1509    
1510      /* Adjust any last match point */      /* Adjust any last match point */
1511    
1512      if (lastmatchnumber > 0) lastmatchrestart -= MBUFTHIRD;      if (lastmatchnumber > 0) lastmatchrestart -= bufthird;
1513      }      }
1514    }     /* Loop through the whole file */    }     /* Loop through the whole file */
1515    
1516  /* End of file; print final "after" lines if wanted; do_after_lines sets  /* End of file; print final "after" lines if wanted; do_after_lines sets
1517  hyphenpending if it prints something. */  hyphenpending if it prints something. */
1518    
1519  if (!only_matching && !count_only)  if (only_matching < 0 && !count_only)
1520    {    {
1521    do_after_lines(lastmatchnumber, lastmatchrestart, endptr, printname);    do_after_lines(lastmatchnumber, lastmatchrestart, endptr, printname);
1522    hyphenpending |= endhyphenpending;    hyphenpending |= endhyphenpending;
# Line 1178  if (filenames == FN_NOMATCH_ONLY) Line 1535  if (filenames == FN_NOMATCH_ONLY)
1535    
1536  if (count_only)  if (count_only)
1537    {    {
1538    if (printname != NULL) fprintf(stdout, "%s:", printname);    if (count > 0 || !omit_zero_count)
1539    fprintf(stdout, "%d\n", count);      {
1540        if (printname != NULL && filenames != FN_NONE)
1541          fprintf(stdout, "%s:", printname);
1542        fprintf(stdout, "%d\n", count);
1543        }
1544    }    }
1545    
1546  return rc;  return rc;
# Line 1211  grep_or_recurse(char *pathname, BOOL dir Line 1572  grep_or_recurse(char *pathname, BOOL dir
1572  {  {
1573  int rc = 1;  int rc = 1;
1574  int sep;  int sep;
1575  FILE *in;  int frtype;
1576    int pathlen;
1577    void *handle;
1578    FILE *in = NULL;           /* Ensure initialized */
1579    
1580    #ifdef SUPPORT_LIBZ
1581    gzFile ingz = NULL;
1582    #endif
1583    
1584    #ifdef SUPPORT_LIBBZ2
1585    BZFILE *inbz2 = NULL;
1586    #endif
1587    
1588  /* If the file name is "-" we scan stdin */  /* If the file name is "-" we scan stdin */
1589    
1590  if (strcmp(pathname, "-") == 0)  if (strcmp(pathname, "-") == 0)
1591    {    {
1592    return pcregrep(stdin,    return pcregrep(stdin, FR_PLAIN, stdin_name,
1593      (filenames > FN_DEFAULT || (filenames == FN_DEFAULT && !only_one_at_top))?      (filenames > FN_DEFAULT || (filenames == FN_DEFAULT && !only_one_at_top))?
1594        stdin_name : NULL);        stdin_name : NULL);
1595    }    }
1596    
   
1597  /* If the file is a directory, skip if skipping or if we are recursing, scan  /* If the file is a directory, skip if skipping or if we are recursing, scan
1598  each file within it, subject to any include or exclude patterns that were set.  each file and directory within it, subject to any include or exclude patterns
1599  The scanning code is localized so it can be made system-specific. */  that were set. The scanning code is localized so it can be made
1600    system-specific. */
1601    
1602  if ((sep = isdirectory(pathname)) != 0)  if ((sep = isdirectory(pathname)) != 0)
1603    {    {
# Line 1246  if ((sep = isdirectory(pathname)) != 0) Line 1618  if ((sep = isdirectory(pathname)) != 0)
1618    
1619      while ((nextfile = readdirectory(dir)) != NULL)      while ((nextfile = readdirectory(dir)) != NULL)
1620        {        {
1621        int frc, blen;        int frc, nflen;
1622        sprintf(buffer, "%.512s%c%.128s", pathname, sep, nextfile);        sprintf(buffer, "%.512s%c%.128s", pathname, sep, nextfile);
1623        blen = strlen(buffer);        nflen = (int)(strlen(nextfile));
1624    
1625        if (exclude_compiled != NULL &&        if (isdirectory(buffer))
1626            pcre_exec(exclude_compiled, NULL, buffer, blen, 0, 0, NULL, 0) >= 0)          {
1627          continue;          if (exclude_dir_compiled != NULL &&
1628                pcre_exec(exclude_dir_compiled, NULL, nextfile, nflen, 0, 0, NULL, 0) >= 0)
1629        if (include_compiled != NULL &&            continue;
1630            pcre_exec(include_compiled, NULL, buffer, blen, 0, 0, NULL, 0) < 0)  
1631          continue;          if (include_dir_compiled != NULL &&
1632                pcre_exec(include_dir_compiled, NULL, nextfile, nflen, 0, 0, NULL, 0) < 0)
1633              continue;
1634            }
1635          else
1636            {
1637            if (exclude_compiled != NULL &&
1638                pcre_exec(exclude_compiled, NULL, nextfile, nflen, 0, 0, NULL, 0) >= 0)
1639              continue;
1640    
1641            if (include_compiled != NULL &&
1642                pcre_exec(include_compiled, NULL, nextfile, nflen, 0, 0, NULL, 0) < 0)
1643              continue;
1644            }
1645    
1646        frc = grep_or_recurse(buffer, dir_recurse, FALSE);        frc = grep_or_recurse(buffer, dir_recurse, FALSE);
1647        if (frc > 1) rc = frc;        if (frc > 1) rc = frc;
# Line 1279  skipping was not requested. The scan pro Line 1664  skipping was not requested. The scan pro
1664  argument at top level, we don't show the file name, unless we are only showing  argument at top level, we don't show the file name, unless we are only showing
1665  the file name, or the filename was forced (-H). */  the file name, or the filename was forced (-H). */
1666    
1667  in = fopen(pathname, "r");  pathlen = (int)(strlen(pathname));
1668  if (in == NULL)  
1669    /* Open using zlib if it is supported and the file name ends with .gz. */
1670    
1671    #ifdef SUPPORT_LIBZ
1672    if (pathlen > 3 && strcmp(pathname + pathlen - 3, ".gz") == 0)
1673      {
1674      ingz = gzopen(pathname, "rb");
1675      if (ingz == NULL)
1676        {
1677        if (!silent)
1678          fprintf(stderr, "pcregrep: Failed to open %s: %s\n", pathname,
1679            strerror(errno));
1680        return 2;
1681        }
1682      handle = (void *)ingz;
1683      frtype = FR_LIBZ;
1684      }
1685    else
1686    #endif
1687    
1688    /* Otherwise open with bz2lib if it is supported and the name ends with .bz2. */
1689    
1690    #ifdef SUPPORT_LIBBZ2
1691    if (pathlen > 4 && strcmp(pathname + pathlen - 4, ".bz2") == 0)
1692      {
1693      inbz2 = BZ2_bzopen(pathname, "rb");
1694      handle = (void *)inbz2;
1695      frtype = FR_LIBBZ2;
1696      }
1697    else
1698    #endif
1699    
1700    /* Otherwise use plain fopen(). The label is so that we can come back here if
1701    an attempt to read a .bz2 file indicates that it really is a plain file. */
1702    
1703    #ifdef SUPPORT_LIBBZ2
1704    PLAIN_FILE:
1705    #endif
1706      {
1707      in = fopen(pathname, "rb");
1708      handle = (void *)in;
1709      frtype = FR_PLAIN;
1710      }
1711    
1712    /* All the opening methods return errno when they fail. */
1713    
1714    if (handle == NULL)
1715    {    {
1716    if (!silent)    if (!silent)
1717      fprintf(stderr, "pcregrep: Failed to open %s: %s\n", pathname,      fprintf(stderr, "pcregrep: Failed to open %s: %s\n", pathname,
# Line 1288  if (in == NULL) Line 1719  if (in == NULL)
1719    return 2;    return 2;
1720    }    }
1721    
1722  rc = pcregrep(in, (filenames > FN_DEFAULT ||  /* Now grep the file */
1723    
1724    rc = pcregrep(handle, frtype, pathname, (filenames > FN_DEFAULT ||
1725    (filenames == FN_DEFAULT && !only_one_at_top))? pathname : NULL);    (filenames == FN_DEFAULT && !only_one_at_top))? pathname : NULL);
1726    
1727    /* Close in an appropriate manner. */
1728    
1729    #ifdef SUPPORT_LIBZ
1730    if (frtype == FR_LIBZ)
1731      gzclose(ingz);
1732    else
1733    #endif
1734    
1735    /* If it is a .bz2 file and the result is 3, it means that the first attempt to
1736    read failed. If the error indicates that the file isn't in fact bzipped, try
1737    again as a normal file. */
1738    
1739    #ifdef SUPPORT_LIBBZ2
1740    if (frtype == FR_LIBBZ2)
1741      {
1742      if (rc == 3)
1743        {
1744        int errnum;
1745        const char *err = BZ2_bzerror(inbz2, &errnum);
1746        if (errnum == BZ_DATA_ERROR_MAGIC)
1747          {
1748          BZ2_bzclose(inbz2);
1749          goto PLAIN_FILE;
1750          }
1751        else if (!silent)
1752          fprintf(stderr, "pcregrep: Failed to read %s using bzlib: %s\n",
1753            pathname, err);
1754        rc = 2;    /* The normal "something went wrong" code */
1755        }
1756      BZ2_bzclose(inbz2);
1757      }
1758    else
1759    #endif
1760    
1761    /* Normal file close */
1762    
1763  fclose(in);  fclose(in);
1764    
1765    /* Pass back the yield from pcregrep(). */
1766    
1767  return rc;  return rc;
1768  }  }
1769    
# Line 1312  for (op = optionlist; op->one_char != 0; Line 1784  for (op = optionlist; op->one_char != 0;
1784    if (op->one_char > 0) fprintf(stderr, "%c", op->one_char);    if (op->one_char > 0) fprintf(stderr, "%c", op->one_char);
1785    }    }
1786  fprintf(stderr, "] [long options] [pattern] [files]\n");  fprintf(stderr, "] [long options] [pattern] [files]\n");
1787  fprintf(stderr, "Type `pcregrep --help' for more information.\n");  fprintf(stderr, "Type `pcregrep --help' for more information and the long "
1788      "options.\n");
1789  return rc;  return rc;
1790  }  }
1791    
# Line 1331  option_item *op; Line 1804  option_item *op;
1804  printf("Usage: pcregrep [OPTION]... [PATTERN] [FILE1 FILE2 ...]\n");  printf("Usage: pcregrep [OPTION]... [PATTERN] [FILE1 FILE2 ...]\n");
1805  printf("Search for PATTERN in each FILE or standard input.\n");  printf("Search for PATTERN in each FILE or standard input.\n");
1806  printf("PATTERN must be present if neither -e nor -f is used.\n");  printf("PATTERN must be present if neither -e nor -f is used.\n");
1807  printf("\"-\" can be used as a file name to mean STDIN.\n\n");  printf("\"-\" can be used as a file name to mean STDIN.\n");
 printf("Example: pcregrep -i 'hello.*world' menu.h main.c\n\n");  
1808    
1809    #ifdef SUPPORT_LIBZ
1810    printf("Files whose names end in .gz are read using zlib.\n");
1811    #endif
1812    
1813    #ifdef SUPPORT_LIBBZ2
1814    printf("Files whose names end in .bz2 are read using bzlib2.\n");
1815    #endif
1816    
1817    #if defined SUPPORT_LIBZ || defined SUPPORT_LIBBZ2
1818    printf("Other files and the standard input are read as plain files.\n\n");
1819    #else
1820    printf("All files are read as plain files, without any interpretation.\n\n");
1821    #endif
1822    
1823    printf("Example: pcregrep -i 'hello.*world' menu.h main.c\n\n");
1824  printf("Options:\n");  printf("Options:\n");
1825    
1826  for (op = optionlist; op->one_char != 0; op++)  for (op = optionlist; op->one_char != 0; op++)
1827    {    {
1828    int n;    int n;
1829    char s[4];    char s[4];
1830    
1831      /* Two options were accidentally implemented and documented with underscores
1832      instead of hyphens in their names, something that was not noticed for quite a
1833      few releases. When fixing this, I left the underscored versions in the list
1834      in case people were using them. However, we don't want to display them in the
1835      help data. There are no other options that contain underscores, and we do not
1836      expect ever to implement such options. Therefore, just omit any option that
1837      contains an underscore. */
1838    
1839      if (strchr(op->long_name, '_') != NULL) continue;
1840    
1841    if (op->one_char > 0) sprintf(s, "-%c,", op->one_char); else strcpy(s, "   ");    if (op->one_char > 0) sprintf(s, "-%c,", op->one_char); else strcpy(s, "   ");
1842    printf("  %s --%s%n", s, op->long_name, &n);    n = 31 - printf("  %s --%s", s, op->long_name);
   n = 30 - n;  
1843    if (n < 1) n = 1;    if (n < 1) n = 1;
1844    printf("%.*s%s\n", n, "                    ", op->help_text);    printf("%.*s%s\n", n, "                     ", op->help_text);
1845    }    }
1846    
1847  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");
1848    printf("The default value for --buffer-size is %d.\n", PCREGREP_BUFSIZE);
1849    printf("When reading patterns from a file instead of using a command line option,\n");
1850  printf("trailing white space is removed and blank lines are ignored.\n");  printf("trailing white space is removed and blank lines are ignored.\n");
1851  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",
1852      MAX_PATTERN_COUNT, PATBUFSIZE);
1853    
1854  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");
1855  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 1367  handle_option(int letter, int options) Line 1867  handle_option(int letter, int options)
1867  {  {
1868  switch(letter)  switch(letter)
1869    {    {
1870    case N_HELP: help(); exit(0);    case N_FOFFSETS: file_offsets = TRUE; break;
1871      case N_HELP: help(); pcregrep_exit(0);
1872      case N_LBUFFER: line_buffered = TRUE; break;
1873      case N_LOFFSETS: line_offsets = number = TRUE; break;
1874      case N_NOJIT: study_options &= ~PCRE_STUDY_JIT_COMPILE; break;
1875    case 'c': count_only = TRUE; break;    case 'c': count_only = TRUE; break;
1876    case 'F': process_options |= PO_FIXED_STRINGS; break;    case 'F': process_options |= PO_FIXED_STRINGS; break;
1877    case 'H': filenames = FN_FORCE; break;    case 'H': filenames = FN_FORCE; break;
1878    case 'h': filenames = FN_NONE; break;    case 'h': filenames = FN_NONE; break;
1879    case 'i': options |= PCRE_CASELESS; break;    case 'i': options |= PCRE_CASELESS; break;
1880    case 'l': filenames = FN_ONLY; break;    case 'l': omit_zero_count = TRUE; filenames = FN_MATCH_ONLY; break;
1881    case 'L': filenames = FN_NOMATCH_ONLY; break;    case 'L': filenames = FN_NOMATCH_ONLY; break;
1882    case 'M': multiline = TRUE; options |= PCRE_MULTILINE|PCRE_FIRSTLINE; break;    case 'M': multiline = TRUE; options |= PCRE_MULTILINE|PCRE_FIRSTLINE; break;
1883    case 'n': number = TRUE; break;    case 'n': number = TRUE; break;
1884    case 'o': only_matching = TRUE; break;    case 'o': only_matching = 0; break;
1885    case 'q': quiet = TRUE; break;    case 'q': quiet = TRUE; break;
1886    case 'r': dee_action = dee_RECURSE; break;    case 'r': dee_action = dee_RECURSE; break;
1887    case 's': silent = TRUE; break;    case 's': silent = TRUE; break;
# Line 1388  switch(letter) Line 1892  switch(letter)
1892    
1893    case 'V':    case 'V':
1894    fprintf(stderr, "pcregrep version %s\n", pcre_version());    fprintf(stderr, "pcregrep version %s\n", pcre_version());
1895    exit(0);    pcregrep_exit(0);
1896    break;    break;
1897    
1898    default:    default:
1899    fprintf(stderr, "pcregrep: Unknown option -%c\n", letter);    fprintf(stderr, "pcregrep: Unknown option -%c\n", letter);
1900    exit(usage(2));    pcregrep_exit(usage(2));
1901    }    }
1902    
1903  return options;  return options;
# Line 1448  Returns: TRUE on success, FALSE Line 1952  Returns: TRUE on success, FALSE
1952  static BOOL  static BOOL
1953  compile_single_pattern(char *pattern, int options, char *filename, int count)  compile_single_pattern(char *pattern, int options, char *filename, int count)
1954  {  {
1955  char buffer[MBUFTHIRD + 16];  char buffer[PATBUFSIZE];
1956  const char *error;  const char *error;
1957  int errptr;  int errptr;
1958    
# Line 1459  if (pattern_count >= MAX_PATTERN_COUNT) Line 1963  if (pattern_count >= MAX_PATTERN_COUNT)
1963    return FALSE;    return FALSE;
1964    }    }
1965    
1966  sprintf(buffer, "%s%.*s%s", prefix[process_options], MBUFTHIRD, pattern,  sprintf(buffer, "%s%.*s%s", prefix[process_options], bufthird, pattern,
1967    suffix[process_options]);    suffix[process_options]);
1968  pattern_list[pattern_count] =  pattern_list[pattern_count] =
1969    pcre_compile(buffer, options, &error, &errptr, pcretables);    pcre_compile(buffer, options, &error, &errptr, pcretables);
# Line 1518  compile_pattern(char *pattern, int optio Line 2022  compile_pattern(char *pattern, int optio
2022  if ((process_options & PO_FIXED_STRINGS) != 0)  if ((process_options & PO_FIXED_STRINGS) != 0)
2023    {    {
2024    char *eop = pattern + strlen(pattern);    char *eop = pattern + strlen(pattern);
2025    char buffer[MBUFTHIRD];    char buffer[PATBUFSIZE];
2026    for(;;)    for(;;)
2027      {      {
2028      int ellength;      int ellength;
# Line 1556  char *patterns[MAX_PATTERN_COUNT]; Line 2060  char *patterns[MAX_PATTERN_COUNT];
2060  const char *locale_from = "--locale";  const char *locale_from = "--locale";
2061  const char *error;  const char *error;
2062    
2063    #ifdef SUPPORT_PCREGREP_JIT
2064    pcre_jit_stack *jit_stack = NULL;
2065    #endif
2066    
2067  /* Set the default line ending value from the default in the PCRE library;  /* Set the default line ending value from the default in the PCRE library;
2068  "lf", "cr", "crlf", and "any" are supported. Anything else is treated as "lf".  "lf", "cr", "crlf", and "any" are supported. Anything else is treated as "lf".
2069  */  Note that the return values from pcre_config(), though derived from the ASCII
2070    codes, are the same in EBCDIC environments, so we must use the actual values
2071    rather than escapes such as as '\r'. */
2072    
2073  (void)pcre_config(PCRE_CONFIG_NEWLINE, &i);  (void)pcre_config(PCRE_CONFIG_NEWLINE, &i);
2074  switch(i)  switch(i)
2075    {    {
2076    default:                 newline = (char *)"lf"; break;    default:               newline = (char *)"lf"; break;
2077    case '\r':               newline = (char *)"cr"; break;    case 13:               newline = (char *)"cr"; break;
2078    case ('\r' << 8) | '\n': newline = (char *)"crlf"; break;    case (13 << 8) | 10:   newline = (char *)"crlf"; break;
2079    case -1:                 newline = (char *)"any"; break;    case -1:               newline = (char *)"any"; break;
2080    case -2:                 newline = (char *)"anycrlf"; break;    case -2:               newline = (char *)"anycrlf"; break;
2081    }    }
2082    
2083  /* Process the options */  /* Process the options */
# Line 1587  for (i = 1; i < argc; i++) Line 2097  for (i = 1; i < argc; i++)
2097    if (argv[i][1] == 0)    if (argv[i][1] == 0)
2098      {      {
2099      if (pattern_filename != NULL || pattern_count > 0) break;      if (pattern_filename != NULL || pattern_count > 0) break;
2100        else exit(usage(2));        else pcregrep_exit(usage(2));
2101      }      }
2102    
2103    /* Handle a long name option, or -- to terminate the options */    /* Handle a long name option, or -- to terminate the options */
# Line 1609  for (i = 1; i < argc; i++) Line 2119  for (i = 1; i < argc; i++)
2119      Some options have variations in the long name spelling: specifically, we      Some options have variations in the long name spelling: specifically, we
2120      allow "regexp" because GNU grep allows it, though I personally go along      allow "regexp" because GNU grep allows it, though I personally go along
2121      with Jeffrey Friedl and Larry Wall in preferring "regex" without the "p".      with Jeffrey Friedl and Larry Wall in preferring "regex" without the "p".
2122      These options are entered in the table as "regex(p)". No option is in both      These options are entered in the table as "regex(p)". Options can be in
2123      these categories, fortunately. */      both these categories. */
2124    
2125      for (op = optionlist; op->one_char != 0; op++)      for (op = optionlist; op->one_char != 0; op++)
2126        {        {
2127        char *opbra = strchr(op->long_name, '(');        char *opbra = strchr(op->long_name, '(');
2128        char *equals = strchr(op->long_name, '=');        char *equals = strchr(op->long_name, '=');
2129        if (opbra == NULL)     /* Not a (p) case */  
2130          /* Handle options with only one spelling of the name */
2131    
2132          if (opbra == NULL)     /* Does not contain '(' */
2133          {          {
2134          if (equals == NULL)  /* Not thing=data case */          if (equals == NULL)  /* Not thing=data case */
2135            {            {
# Line 1624  for (i = 1; i < argc; i++) Line 2137  for (i = 1; i < argc; i++)
2137            }            }
2138          else                 /* Special case xxx=data */          else                 /* Special case xxx=data */
2139            {            {
2140            int oplen = equals - op->long_name;            int oplen = (int)(equals - op->long_name);
2141            int arglen = (argequals == NULL)? strlen(arg) : argequals - arg;            int arglen = (argequals == NULL)?
2142                (int)strlen(arg) : (int)(argequals - arg);
2143            if (oplen == arglen && strncmp(arg, op->long_name, oplen) == 0)            if (oplen == arglen && strncmp(arg, op->long_name, oplen) == 0)
2144              {              {
2145              option_data = arg + arglen;              option_data = arg + arglen;
# Line 1638  for (i = 1; i < argc; i++) Line 2152  for (i = 1; i < argc; i++)
2152              }              }
2153            }            }
2154          }          }
2155        else                   /* Special case xxxx(p) */  
2156          /* Handle options with an alternate spelling of the name */
2157    
2158          else
2159          {          {
2160          char buff1[24];          char buff1[24];
2161          char buff2[24];          char buff2[24];
2162          int baselen = opbra - op->long_name;  
2163            int baselen = (int)(opbra - op->long_name);
2164            int fulllen = (int)(strchr(op->long_name, ')') - op->long_name + 1);
2165            int arglen = (argequals == NULL || equals == NULL)?
2166              (int)strlen(arg) : (int)(argequals - arg);
2167    
2168          sprintf(buff1, "%.*s", baselen, op->long_name);          sprintf(buff1, "%.*s", baselen, op->long_name);
2169          sprintf(buff2, "%s%.*s", buff1,          sprintf(buff2, "%s%.*s", buff1, fulllen - baselen - 2, opbra + 1);
2170            (int)strlen(op->long_name) - baselen - 2, opbra + 1);  
2171          if (strcmp(arg, buff1) == 0 || strcmp(arg, buff2) == 0)          if (strncmp(arg, buff1, arglen) == 0 ||
2172               strncmp(arg, buff2, arglen) == 0)
2173              {
2174              if (equals != NULL && argequals != NULL)
2175                {
2176                option_data = argequals;
2177                if (*option_data == '=')
2178                  {
2179                  option_data++;
2180                  longopwasequals = TRUE;
2181                  }
2182                }
2183            break;            break;
2184              }
2185          }          }
2186        }        }
2187    
2188      if (op->one_char == 0)      if (op->one_char == 0)
2189        {        {
2190        fprintf(stderr, "pcregrep: Unknown option %s\n", argv[i]);        fprintf(stderr, "pcregrep: Unknown option %s\n", argv[i]);
2191        exit(usage(2));        pcregrep_exit(usage(2));
2192        }        }
2193      }      }
2194    
   
2195    /* Jeffrey Friedl's debugging harness uses these additional options which    /* Jeffrey Friedl's debugging harness uses these additional options which
2196    are not in the right form for putting in the option table because they use    are not in the right form for putting in the option table because they use
2197    only one hyphen, yet are more than one character long. By putting them    only one hyphen, yet are more than one character long. By putting them
# Line 1692  for (i = 1; i < argc; i++) Line 2225  for (i = 1; i < argc; i++)
2225      while (*s != 0)      while (*s != 0)
2226        {        {
2227        for (op = optionlist; op->one_char != 0; op++)        for (op = optionlist; op->one_char != 0; op++)
2228          { if (*s == op->one_char) break; }          {
2229            if (*s == op->one_char) break;
2230            }
2231        if (op->one_char == 0)        if (op->one_char == 0)
2232          {          {
2233          fprintf(stderr, "pcregrep: Unknown option letter '%c' in \"%s\"\n",          fprintf(stderr, "pcregrep: Unknown option letter '%c' in \"%s\"\n",
2234            *s, argv[i]);            *s, argv[i]);
2235          exit(usage(2));          pcregrep_exit(usage(2));
2236          }          }
2237        if (op->type != OP_NODATA || s[1] == 0)  
2238          /* Check for a single-character option that has data: OP_OP_NUMBER
2239          is used for one that either has a numerical number or defaults, i.e. the
2240          data is optional. If a digit follows, there is data; if not, carry on
2241          with other single-character options in the same string. */
2242    
2243          option_data = s+1;
2244          if (op->type == OP_OP_NUMBER)
2245          {          {
2246          option_data = s+1;          if (isdigit((unsigned char)s[1])) break;
         break;  
2247          }          }
2248          else   /* Check for end or a dataless option */
2249            {
2250            if (op->type != OP_NODATA || s[1] == 0) break;
2251            }
2252    
2253          /* Handle a single-character option with no data, then loop for the
2254          next character in the string. */
2255    
2256        pcre_options = handle_option(*s++, pcre_options);        pcre_options = handle_option(*s++, pcre_options);
2257        }        }
2258      }      }
# Line 1720  for (i = 1; i < argc; i++) Line 2269  for (i = 1; i < argc; i++)
2269    
2270    /* If the option type is OP_OP_STRING or OP_OP_NUMBER, it's an option that    /* If the option type is OP_OP_STRING or OP_OP_NUMBER, it's an option that
2271    either has a value or defaults to something. It cannot have data in a    either has a value or defaults to something. It cannot have data in a
2272    separate item. At the moment, the only such options are "colo(u)r" and    separate item. At the moment, the only such options are "colo(u)r",
2273    Jeffrey Friedl's special -S debugging option. */    "only-matching", and Jeffrey Friedl's special -S debugging option. */
2274    
2275    if (*option_data == 0 &&    if (*option_data == 0 &&
2276        (op->type == OP_OP_STRING || op->type == OP_OP_NUMBER))        (op->type == OP_OP_STRING || op->type == OP_OP_NUMBER))
# Line 1731  for (i = 1; i < argc; i++) Line 2280  for (i = 1; i < argc; i++)
2280        case N_COLOUR:        case N_COLOUR:
2281        colour_option = (char *)"auto";        colour_option = (char *)"auto";
2282        break;        break;
2283    
2284          case 'o':
2285          only_matching = 0;
2286          break;
2287    
2288  #ifdef JFRIEDL_DEBUG  #ifdef JFRIEDL_DEBUG
2289        case 'S':        case 'S':
2290        S_arg = 0;        S_arg = 0;
# Line 1747  for (i = 1; i < argc; i++) Line 2301  for (i = 1; i < argc; i++)
2301      if (i >= argc - 1 || longopwasequals)      if (i >= argc - 1 || longopwasequals)
2302        {        {
2303        fprintf(stderr, "pcregrep: Data missing after %s\n", argv[i]);        fprintf(stderr, "pcregrep: Data missing after %s\n", argv[i]);
2304        exit(usage(2));        pcregrep_exit(usage(2));
2305        }        }
2306      option_data = argv[++i];      option_data = argv[++i];
2307      }      }
# Line 1768  for (i = 1; i < argc; i++) Line 2322  for (i = 1; i < argc; i++)
2322    
2323    /* Otherwise, deal with single string or numeric data values. */    /* Otherwise, deal with single string or numeric data values. */
2324    
2325    else if (op->type != OP_NUMBER && op->type != OP_OP_NUMBER)    else if (op->type != OP_NUMBER && op->type != OP_LONGNUMBER &&
2326               op->type != OP_OP_NUMBER)
2327      {      {
2328      *((char **)op->dataptr) = option_data;      *((char **)op->dataptr) = option_data;
2329      }      }
2330    
2331      /* Avoid the use of strtoul() because SunOS4 doesn't have it. This is used
2332      only for unpicking arguments, so just keep it simple. */
2333    
2334    else    else
2335      {      {
2336      char *endptr;      unsigned long int n = 0;
2337      int n = strtoul(option_data, &endptr, 10);      char *endptr = option_data;
2338        while (*endptr != 0 && isspace((unsigned char)(*endptr))) endptr++;
2339        while (isdigit((unsigned char)(*endptr)))
2340          n = n * 10 + (int)(*endptr++ - '0');
2341        if (toupper(*endptr) == 'K')
2342          {
2343          n *= 1024;
2344          endptr++;
2345          }
2346        else if (toupper(*endptr) == 'M')
2347          {
2348          n *= 1024*1024;
2349          endptr++;
2350          }
2351      if (*endptr != 0)      if (*endptr != 0)
2352        {        {
2353        if (longop)        if (longop)
2354          {          {
2355          char *equals = strchr(op->long_name, '=');          char *equals = strchr(op->long_name, '=');
2356          int nlen = (equals == NULL)? (int)strlen(op->long_name) :          int nlen = (equals == NULL)? (int)strlen(op->long_name) :
2357            equals - op->long_name;            (int)(equals - op->long_name);
2358          fprintf(stderr, "pcregrep: Malformed number \"%s\" after --%.*s\n",          fprintf(stderr, "pcregrep: Malformed number \"%s\" after --%.*s\n",
2359            option_data, nlen, op->long_name);            option_data, nlen, op->long_name);
2360          }          }
2361        else        else
2362          fprintf(stderr, "pcregrep: Malformed number \"%s\" after -%c\n",          fprintf(stderr, "pcregrep: Malformed number \"%s\" after -%c\n",
2363            option_data, op->one_char);            option_data, op->one_char);
2364        exit(usage(2));        pcregrep_exit(usage(2));
2365        }        }
2366      *((int *)op->dataptr) = n;      if (op->type == OP_LONGNUMBER)
2367            *((unsigned long int *)op->dataptr) = n;
2368        else
2369            *((int *)op->dataptr) = n;
2370      }      }
2371    }    }
2372    
# Line 1804  if (both_context > 0) Line 2379  if (both_context > 0)
2379    if (before_context == 0) before_context = both_context;    if (before_context == 0) before_context = both_context;
2380    }    }
2381    
2382    /* Only one of --only-matching, --file-offsets, or --line-offsets is permitted.
2383    However, the latter two set only_matching. */
2384    
2385    if ((only_matching >= 0 && (file_offsets || line_offsets)) ||
2386        (file_offsets && line_offsets))
2387      {
2388      fprintf(stderr, "pcregrep: Cannot mix --only-matching, --file-offsets "
2389        "and/or --line-offsets\n");
2390      pcregrep_exit(usage(2));
2391      }
2392    
2393    if (file_offsets || line_offsets) only_matching = 0;
2394    
2395  /* If a locale has not been provided as an option, see if the LC_CTYPE or  /* If a locale has not been provided as an option, see if the LC_CTYPE or
2396  LC_ALL environment variable is set, and if so, use it. */  LC_ALL environment variable is set, and if so, use it. */
2397    
# Line 1926  if (jfriedl_XT != 0 || jfriedl_XR != 0) Line 2514  if (jfriedl_XT != 0 || jfriedl_XR != 0)
2514    }    }
2515  #endif  #endif
2516    
2517  /* Get memory to store the pattern and hints lists. */  /* Get memory for the main buffer, and to store the pattern and hints lists. */
2518    
2519    bufsize = 3*bufthird;
2520    main_buffer = (char *)malloc(bufsize);
2521  pattern_list = (pcre **)malloc(MAX_PATTERN_COUNT * sizeof(pcre *));  pattern_list = (pcre **)malloc(MAX_PATTERN_COUNT * sizeof(pcre *));
2522  hints_list = (pcre_extra **)malloc(MAX_PATTERN_COUNT * sizeof(pcre_extra *));  hints_list = (pcre_extra **)malloc(MAX_PATTERN_COUNT * sizeof(pcre_extra *));
2523    
2524  if (pattern_list == NULL || hints_list == NULL)  if (main_buffer == NULL || pattern_list == NULL || hints_list == NULL)
2525    {    {
2526    fprintf(stderr, "pcregrep: malloc failed\n");    fprintf(stderr, "pcregrep: malloc failed\n");
2527    goto EXIT2;    goto EXIT2;
# Line 1963  if (pattern_filename != NULL) Line 2553  if (pattern_filename != NULL)
2553    int linenumber = 0;    int linenumber = 0;
2554    FILE *f;    FILE *f;
2555    char *filename;    char *filename;
2556    char buffer[MBUFTHIRD];    char buffer[PATBUFSIZE];
2557    
2558    if (strcmp(pattern_filename, "-") == 0)    if (strcmp(pattern_filename, "-") == 0)
2559      {      {
# Line 1982  if (pattern_filename != NULL) Line 2572  if (pattern_filename != NULL)
2572      filename = pattern_filename;      filename = pattern_filename;
2573      }      }
2574    
2575    while (fgets(buffer, MBUFTHIRD, f) != NULL)    while (fgets(buffer, PATBUFSIZE, f) != NULL)
2576      {      {
2577      char *s = buffer + (int)strlen(buffer);      char *s = buffer + (int)strlen(buffer);
2578      while (s > buffer && isspace((unsigned char)(s[-1]))) s--;      while (s > buffer && isspace((unsigned char)(s[-1]))) s--;
# Line 1996  if (pattern_filename != NULL) Line 2586  if (pattern_filename != NULL)
2586    if (f != stdin) fclose(f);    if (f != stdin) fclose(f);
2587    }    }
2588    
2589  /* Study the regular expressions, as we will be running them many times */  /* Study the regular expressions, as we will be running them many times. Unless
2590    JIT has been explicitly disabled, arrange a stack for it to use. */
2591    
2592    #ifdef SUPPORT_PCREGREP_JIT
2593    if ((study_options & PCRE_STUDY_JIT_COMPILE) != 0)
2594      jit_stack = pcre_jit_stack_alloc(32*1024, 1024*1024);
2595    #endif
2596    
2597  for (j = 0; j < pattern_count; j++)  for (j = 0; j < pattern_count; j++)
2598    {    {
2599    hints_list[j] = pcre_study(pattern_list[j], 0, &error);    hints_list[j] = pcre_study(pattern_list[j], study_options, &error);
2600    if (error != NULL)    if (error != NULL)
2601      {      {
2602      char s[16];      char s[16];
# Line 2009  for (j = 0; j < pattern_count; j++) Line 2605  for (j = 0; j < pattern_count; j++)
2605      goto EXIT2;      goto EXIT2;
2606      }      }
2607    hint_count++;    hint_count++;
2608    #ifdef SUPPORT_PCREGREP_JIT
2609      if (jit_stack != NULL && hints_list[j] != NULL)
2610        pcre_assign_jit_stack(hints_list[j], NULL, jit_stack);
2611    #endif
2612      }
2613    
2614    /* If --match-limit or --recursion-limit was set, put the value(s) into the
2615    pcre_extra block for each pattern. */
2616    
2617    if (match_limit > 0 || match_limit_recursion > 0)
2618      {
2619      for (j = 0; j < pattern_count; j++)
2620        {
2621        if (hints_list[j] == NULL)
2622          {
2623          hints_list[j] = malloc(sizeof(pcre_extra));
2624          if (hints_list[j] == NULL)
2625            {
2626            fprintf(stderr, "pcregrep: malloc failed\n");
2627            pcregrep_exit(2);
2628            }
2629          }
2630        if (match_limit > 0)
2631          {
2632          hints_list[j]->flags |= PCRE_EXTRA_MATCH_LIMIT;
2633          hints_list[j]->match_limit = match_limit;
2634          }
2635        if (match_limit_recursion > 0)
2636          {
2637          hints_list[j]->flags |= PCRE_EXTRA_MATCH_LIMIT_RECURSION;
2638          hints_list[j]->match_limit_recursion = match_limit_recursion;
2639          }
2640        }
2641    }    }
2642    
2643  /* If there are include or exclude patterns, compile them. */  /* If there are include or exclude patterns, compile them. */
# Line 2037  if (include_pattern != NULL) Line 2666  if (include_pattern != NULL)
2666      }      }
2667    }    }
2668    
2669    if (exclude_dir_pattern != NULL)
2670      {
2671      exclude_dir_compiled = pcre_compile(exclude_dir_pattern, 0, &error, &errptr,
2672        pcretables);
2673      if (exclude_dir_compiled == NULL)
2674        {
2675        fprintf(stderr, "pcregrep: Error in 'exclude_dir' regex at offset %d: %s\n",
2676          errptr, error);
2677        goto EXIT2;
2678        }
2679      }
2680    
2681    if (include_dir_pattern != NULL)
2682      {
2683      include_dir_compiled = pcre_compile(include_dir_pattern, 0, &error, &errptr,
2684        pcretables);
2685      if (include_dir_compiled == NULL)
2686        {
2687        fprintf(stderr, "pcregrep: Error in 'include_dir' regex at offset %d: %s\n",
2688          errptr, error);
2689        goto EXIT2;
2690        }
2691      }
2692    
2693  /* If there are no further arguments, do the business on stdin and exit. */  /* If there are no further arguments, do the business on stdin and exit. */
2694    
2695  if (i >= argc)  if (i >= argc)
2696    {    {
2697    rc = pcregrep(stdin, (filenames > FN_DEFAULT)? stdin_name : NULL);    rc = pcregrep(stdin, FR_PLAIN, stdin_name,
2698        (filenames > FN_DEFAULT)? stdin_name : NULL);
2699    goto EXIT;    goto EXIT;
2700    }    }
2701    
# Line 2061  for (; i < argc; i++) Line 2715  for (; i < argc; i++)
2715    }    }
2716    
2717  EXIT:  EXIT:
2718    #ifdef SUPPORT_PCREGREP_JIT
2719    if (jit_stack != NULL) pcre_jit_stack_free(jit_stack);
2720    #endif
2721    if (main_buffer != NULL) free(main_buffer);
2722  if (pattern_list != NULL)  if (pattern_list != NULL)
2723    {    {
2724    for (i = 0; i < pattern_count; i++) free(pattern_list[i]);    for (i = 0; i < pattern_count; i++) free(pattern_list[i]);
# Line 2068  if (pattern_list != NULL) Line 2726  if (pattern_list != NULL)
2726    }    }
2727  if (hints_list != NULL)  if (hints_list != NULL)
2728    {    {
2729    for (i = 0; i < hint_count; i++) free(hints_list[i]);    for (i = 0; i < hint_count; i++)
2730        {
2731        if (hints_list[i] != NULL) pcre_free_study(hints_list[i]);
2732        }
2733    free(hints_list);    free(hints_list);
2734    }    }
2735  return rc;  pcregrep_exit(rc);
2736    
2737  EXIT2:  EXIT2:
2738  rc = 2;  rc = 2;

Legend:
Removed from v.152  
changed lines
  Added in v.718

webmaster@exim.org
ViewVC Help
Powered by ViewVC 1.1.12