/[pcre]/code/tags/pcre-3.2/pgrep.c
ViewVC logotype

Diff of /code/tags/pcre-3.2/pgrep.c

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

revision 23 by nigel, Sat Feb 24 21:38:41 2007 UTC revision 37 by nigel, Sat Feb 24 21:39:09 2007 UTC
# Line 74  while (fgets(buffer, sizeof(buffer), in) Line 74  while (fgets(buffer, sizeof(buffer), in)
74    if (length > 0 && buffer[length-1] == '\n') buffer[--length] = 0;    if (length > 0 && buffer[length-1] == '\n') buffer[--length] = 0;
75    linenumber++;    linenumber++;
76    
77    match = pcre_exec(pattern, hints, buffer, length, 0, offsets, 99) >= 0;    match = pcre_exec(pattern, hints, buffer, length, 0, 0, offsets, 99) >= 0;
78    if (match && whole_lines && offsets[1] != length) match = FALSE;    if (match && whole_lines && offsets[1] != length) match = FALSE;
79    
80    if (match != invert)    if (match != invert)
# Line 119  return rc; Line 119  return rc;
119  static int  static int
120  usage(int rc)  usage(int rc)
121  {  {
122  fprintf(stderr, "Usage: pgrep [-chilnsvx] pattern [file] ...\n");  fprintf(stderr, "Usage: pgrep [-Vchilnsvx] pattern [file] ...\n");
123  return rc;  return rc;
124  }  }
125    
# Line 159  for (i = 1; i < argc; i++) Line 159  for (i = 1; i < argc; i++)
159        case 's': silent = TRUE; break;        case 's': silent = TRUE; break;
160        case 'v': invert = TRUE; break;        case 'v': invert = TRUE; break;
161        case 'x': whole_lines = TRUE; options |= PCRE_ANCHORED; break;        case 'x': whole_lines = TRUE; options |= PCRE_ANCHORED; break;
162    
163          case 'V':
164          fprintf(stderr, "PCRE version %s\n", pcre_version());
165          break;
166    
167        default:        default:
168        fprintf(stderr, "pgrep: unknown option %c\n", s[-1]);        fprintf(stderr, "pgrep: unknown option %c\n", s[-1]);
169        return usage(2);        return usage(2);
# Line 172  if (i >= argc) return usage(0); Line 177  if (i >= argc) return usage(0);
177    
178  /* Compile the regular expression. */  /* Compile the regular expression. */
179    
180  pattern = pcre_compile(argv[i++], options, &error, &errptr);  pattern = pcre_compile(argv[i++], options, &error, &errptr, NULL);
181  if (pattern == NULL)  if (pattern == NULL)
182    {    {
183    fprintf(stderr, "pgrep: error in regex at offset %d: %s\n", errptr, error);    fprintf(stderr, "pgrep: error in regex at offset %d: %s\n", errptr, error);

Legend:
Removed from v.23  
changed lines
  Added in v.37

  ViewVC Help
Powered by ViewVC 1.1.5