Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-01-27 21:33:05 +00:00
Code Issues Projects Releases Wiki Activity

Implemented -A, -B, and -C flags with BB_FEATURE_GREP_CONTEXT option set.

Browse Source
This commit is contained in:
Mark Whitley 2001-02-09 00:41:10 +00:00
parent d238a7bcc8
commit 2fd52989f7
3 changed files with 253 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Config.h
View File

@ -318,6 +318,9 @@
// Support for the find -mtine option. // Support for the find -mtine option.
#define BB_FEATURE_FIND_MTIME #define BB_FEATURE_FIND_MTIME
// //
// Support for the -A -B and -C context flags in grep
//#define BB_FEATURE_GREP_CONTEXT
//
// End of Features List // End of Features List
// //
// //

139
findutils/grep.c
View File

@ -28,10 +28,10 @@
#include <errno.h> #include <errno.h>
#include "busybox.h" #include "busybox.h"
extern void xregcomp(regex_t *preg, const char *regex, int cflags);
extern int optind; /* in unistd.h */ extern int optind; /* in unistd.h */
extern int errno; /* for use with strerror() */ extern int errno; /* for use with strerror() */
extern void xregcomp(regex_t *preg, const char *regex, int cflags); /* in busybox.h */
/* options */ /* options */
static int ignore_case = 0; static int ignore_case = 0;
@ -42,11 +42,34 @@ static int be_quiet = 0;
static int invert_search = 0; static int invert_search = 0;
static int suppress_err_msgs = 0; static int suppress_err_msgs = 0;
/* globals */ #ifdef BB_FEATURE_GREP_CONTEXT
extern char *optarg; /* in getopt.h */
static int lines_before = 0;
static int lines_after = 0;
static char **before_buf = NULL;
static int last_line_printed = 0;
#endif /* BB_FEATURE_GREP_CONTEXT */
/* globals used internally */
static regex_t regex; /* storage space for compiled regular expression */ static regex_t regex; /* storage space for compiled regular expression */
static int matched; /* keeps track of whether we ever matched */ static int matched; /* keeps track of whether we ever matched */
static char *cur_file = NULL; /* the current file we are reading */ static char *cur_file = NULL; /* the current file we are reading */
static void print_line(const char *line, int linenum, char decoration)
{
#ifdef BB_FEATURE_GREP_CONTEXT
/* possibly print the little '--' seperator */
if (last_line_printed && last_line_printed < linenum - 1) {
puts("--");
}
last_line_printed = linenum;
#endif
if (print_filename)
printf("%s%c", cur_file, decoration);
if (print_line_num)
printf("%i%c", linenum, decoration);
puts(line);
}
static void grep_file(FILE *file) static void grep_file(FILE *file)
{ {
@ -54,15 +77,23 @@ static void grep_file(FILE *file)
int ret; int ret;
int linenum = 0; int linenum = 0;
int nmatches = 0; int nmatches = 0;
#ifdef BB_FEATURE_GREP_CONTEXT
int print_n_lines_after = 0;
int curpos = 0; /* track where we are in the circular 'before' buffer */
int idx = 0; /* used for iteration through the circular buffer */
#endif /* BB_FEATURE_GREP_CONTEXT */
while ((line = get_line_from_file(file)) != NULL) { while ((line = get_line_from_file(file)) != NULL) {
chomp(line); chomp(line);
linenum++; linenum++;
ret = regexec(&regex, line, 0, NULL, 0);
/* test for a postitive-assertion match (regexec returned success (0) /*
* test for a postitive-assertion match (regexec returns success (0)
* and the user did not specify invert search), or a negative-assertion * and the user did not specify invert search), or a negative-assertion
* match (vice versa) */ * match (regexec returns failure (REG_NOMATCH) and the user specified
* invert search)
*/
ret = regexec(&regex, line, 0, NULL, 0);
if ((ret == 0 && !invert_search) || (ret == REG_NOMATCH && invert_search)) { if ((ret == 0 && !invert_search) || (ret == REG_NOMATCH && invert_search)) {
/* if we found a match but were told to be quiet, stop here and /* if we found a match but were told to be quiet, stop here and
@ -72,17 +103,62 @@ static void grep_file(FILE *file)
exit(0); exit(0);
} }
/* otherwise, keep track of matches, print the matched line, and /* otherwise, keep track of matches and print the matched line */
* whatever else the user wanted */
nmatches++; nmatches++;
if (!print_count_only) { if (!print_count_only) {
if (print_filename) #ifdef BB_FEATURE_GREP_CONTEXT
printf("%s:", cur_file); int prevpos = (curpos == 0) ? lines_before - 1 : curpos - 1;
if (print_line_num)
printf("%i:", linenum); /* if we were told to print 'before' lines and there is at least
puts(line); * one line in the circular buffer, print them */
if (lines_before && before_buf[prevpos] != NULL)
{
int first_buf_entry_line_num = linenum - lines_before;
/* advance to the first entry in the circular buffer, and
* figure out the line number is of the first line in the
* buffer */
idx = curpos;
while (before_buf[idx] == NULL) {
idx = (idx + 1) % lines_before;
first_buf_entry_line_num++;
}
/* now print each line in the buffer, clearing them as we go */
while (before_buf[idx] != NULL) {
print_line(before_buf[idx], first_buf_entry_line_num, '-');
free(before_buf[idx]);
before_buf[idx] = NULL;
idx = (idx + 1) % lines_before;
first_buf_entry_line_num++;
}
}
/* make a note that we need to print 'after' lines */
print_n_lines_after = lines_after;
#endif /* BB_FEATURE_GREP_CONTEXT */
print_line(line, linenum, ':');
} }
} }
#ifdef BB_FEATURE_GREP_CONTEXT
else { /* no match */
/* Add the line to the circular 'before' buffer */
if(lines_before)
{
if(before_buf[curpos])
free(before_buf[curpos]);
before_buf[curpos] = strdup(line);
curpos = (curpos + 1) % lines_before;
}
}
/* if we need to print some context lines after the last match, do so */
if (print_n_lines_after && (last_line_printed != linenum)) {
print_line(line, linenum, '-');
print_n_lines_after--;
}
#endif /* BB_FEATURE_GREP_CONTEXT */
free(line); free(line);
} }
@ -93,7 +169,7 @@ static void grep_file(FILE *file)
printf("%i\n", nmatches); printf("%i\n", nmatches);
} }
/* record if we matched */ /* remember if we matched */
if (nmatches != 0) if (nmatches != 0)
matched = 1; matched = 1;
} }
@ -102,9 +178,16 @@ extern int grep_main(int argc, char **argv)
{ {
int opt; int opt;
int reflags; int reflags;
#ifdef BB_FEATURE_GREP_CONTEXT
char *junk;
#endif
/* do normal option parsing */ /* do normal option parsing */
while ((opt = getopt(argc, argv, "iHhnqvsc")) > 0) { while ((opt = getopt(argc, argv, "iHhnqvsc"
#ifdef BB_FEATURE_GREP_CONTEXT
"A:B:C:"
#endif
)) > 0) {
switch (opt) { switch (opt) {
case 'i': case 'i':
ignore_case++; ignore_case++;
@ -130,6 +213,25 @@ extern int grep_main(int argc, char **argv)
case 'c': case 'c':
print_count_only++; print_count_only++;
break; break;
#ifdef BB_FEATURE_GREP_CONTEXT
case 'A':
lines_after = strtoul(optarg, &junk, 10);
if(*junk != '\0')
error_msg_and_die("invalid context length argument");
break;
case 'B':
lines_before = strtoul(optarg, &junk, 10);
if(*junk != '\0')
error_msg_and_die("invalid context length argument");
before_buf = (char **)calloc(lines_before, sizeof(char *));
break;
case 'C':
lines_after = lines_before = strtoul(optarg, &junk, 10);
if(*junk != '\0')
error_msg_and_die("invalid context length argument");
before_buf = (char **)calloc(lines_before, sizeof(char *));
break;
#endif /* BB_FEATURE_GREP_CONTEXT */
} }
} }
@ -137,6 +239,15 @@ extern int grep_main(int argc, char **argv)
if (argv[optind] == NULL) if (argv[optind] == NULL)
usage(grep_usage); usage(grep_usage);
/* sanity check */
if (print_count_only || be_quiet) {
print_line_num = 0;
#ifdef BB_FEATURE_GREP_CONTEXT
lines_before = 0;
lines_after = 0;
#endif
}
/* compile the regular expression /* compile the regular expression
* we're not going to mess with sub-expressions, and we need to * we're not going to mess with sub-expressions, and we need to
* treat newlines right. */ * treat newlines right. */

139
grep.c
View File

@ -28,10 +28,10 @@
#include <errno.h> #include <errno.h>
#include "busybox.h" #include "busybox.h"
extern void xregcomp(regex_t *preg, const char *regex, int cflags);
extern int optind; /* in unistd.h */ extern int optind; /* in unistd.h */
extern int errno; /* for use with strerror() */ extern int errno; /* for use with strerror() */
extern void xregcomp(regex_t *preg, const char *regex, int cflags); /* in busybox.h */
/* options */ /* options */
static int ignore_case = 0; static int ignore_case = 0;
@ -42,11 +42,34 @@ static int be_quiet = 0;
static int invert_search = 0; static int invert_search = 0;
static int suppress_err_msgs = 0; static int suppress_err_msgs = 0;
/* globals */ #ifdef BB_FEATURE_GREP_CONTEXT
extern char *optarg; /* in getopt.h */
static int lines_before = 0;
static int lines_after = 0;
static char **before_buf = NULL;
static int last_line_printed = 0;
#endif /* BB_FEATURE_GREP_CONTEXT */
/* globals used internally */
static regex_t regex; /* storage space for compiled regular expression */ static regex_t regex; /* storage space for compiled regular expression */
static int matched; /* keeps track of whether we ever matched */ static int matched; /* keeps track of whether we ever matched */
static char *cur_file = NULL; /* the current file we are reading */ static char *cur_file = NULL; /* the current file we are reading */
static void print_line(const char *line, int linenum, char decoration)
{
#ifdef BB_FEATURE_GREP_CONTEXT
/* possibly print the little '--' seperator */
if (last_line_printed && last_line_printed < linenum - 1) {
puts("--");
}
last_line_printed = linenum;
#endif
if (print_filename)
printf("%s%c", cur_file, decoration);
if (print_line_num)
printf("%i%c", linenum, decoration);
puts(line);
}
static void grep_file(FILE *file) static void grep_file(FILE *file)
{ {
@ -54,15 +77,23 @@ static void grep_file(FILE *file)
int ret; int ret;
int linenum = 0; int linenum = 0;
int nmatches = 0; int nmatches = 0;
#ifdef BB_FEATURE_GREP_CONTEXT
int print_n_lines_after = 0;
int curpos = 0; /* track where we are in the circular 'before' buffer */
int idx = 0; /* used for iteration through the circular buffer */
#endif /* BB_FEATURE_GREP_CONTEXT */
while ((line = get_line_from_file(file)) != NULL) { while ((line = get_line_from_file(file)) != NULL) {
chomp(line); chomp(line);
linenum++; linenum++;
ret = regexec(&regex, line, 0, NULL, 0);
/* test for a postitive-assertion match (regexec returned success (0) /*
* test for a postitive-assertion match (regexec returns success (0)
* and the user did not specify invert search), or a negative-assertion * and the user did not specify invert search), or a negative-assertion
* match (vice versa) */ * match (regexec returns failure (REG_NOMATCH) and the user specified
* invert search)
*/
ret = regexec(&regex, line, 0, NULL, 0);
if ((ret == 0 && !invert_search) || (ret == REG_NOMATCH && invert_search)) { if ((ret == 0 && !invert_search) || (ret == REG_NOMATCH && invert_search)) {
/* if we found a match but were told to be quiet, stop here and /* if we found a match but were told to be quiet, stop here and
@ -72,17 +103,62 @@ static void grep_file(FILE *file)
exit(0); exit(0);
} }
/* otherwise, keep track of matches, print the matched line, and /* otherwise, keep track of matches and print the matched line */
* whatever else the user wanted */
nmatches++; nmatches++;
if (!print_count_only) { if (!print_count_only) {
if (print_filename) #ifdef BB_FEATURE_GREP_CONTEXT
printf("%s:", cur_file); int prevpos = (curpos == 0) ? lines_before - 1 : curpos - 1;
if (print_line_num)
printf("%i:", linenum); /* if we were told to print 'before' lines and there is at least
puts(line); * one line in the circular buffer, print them */
if (lines_before && before_buf[prevpos] != NULL)
{
int first_buf_entry_line_num = linenum - lines_before;
/* advance to the first entry in the circular buffer, and
* figure out the line number is of the first line in the
* buffer */
idx = curpos;
while (before_buf[idx] == NULL) {
idx = (idx + 1) % lines_before;
first_buf_entry_line_num++;
}
/* now print each line in the buffer, clearing them as we go */
while (before_buf[idx] != NULL) {
print_line(before_buf[idx], first_buf_entry_line_num, '-');
free(before_buf[idx]);
before_buf[idx] = NULL;
idx = (idx + 1) % lines_before;
first_buf_entry_line_num++;
}
}
/* make a note that we need to print 'after' lines */
print_n_lines_after = lines_after;
#endif /* BB_FEATURE_GREP_CONTEXT */
print_line(line, linenum, ':');
} }
} }
#ifdef BB_FEATURE_GREP_CONTEXT
else { /* no match */
/* Add the line to the circular 'before' buffer */
if(lines_before)
{
if(before_buf[curpos])
free(before_buf[curpos]);
before_buf[curpos] = strdup(line);
curpos = (curpos + 1) % lines_before;
}
}
/* if we need to print some context lines after the last match, do so */
if (print_n_lines_after && (last_line_printed != linenum)) {
print_line(line, linenum, '-');
print_n_lines_after--;
}
#endif /* BB_FEATURE_GREP_CONTEXT */
free(line); free(line);
} }
@ -93,7 +169,7 @@ static void grep_file(FILE *file)
printf("%i\n", nmatches); printf("%i\n", nmatches);
} }
/* record if we matched */ /* remember if we matched */
if (nmatches != 0) if (nmatches != 0)
matched = 1; matched = 1;
} }
@ -102,9 +178,16 @@ extern int grep_main(int argc, char **argv)
{ {
int opt; int opt;
int reflags; int reflags;
#ifdef BB_FEATURE_GREP_CONTEXT
char *junk;
#endif
/* do normal option parsing */ /* do normal option parsing */
while ((opt = getopt(argc, argv, "iHhnqvsc")) > 0) { while ((opt = getopt(argc, argv, "iHhnqvsc"
#ifdef BB_FEATURE_GREP_CONTEXT
"A:B:C:"
#endif
)) > 0) {
switch (opt) { switch (opt) {
case 'i': case 'i':
ignore_case++; ignore_case++;
@ -130,6 +213,25 @@ extern int grep_main(int argc, char **argv)
case 'c': case 'c':
print_count_only++; print_count_only++;
break; break;
#ifdef BB_FEATURE_GREP_CONTEXT
case 'A':
lines_after = strtoul(optarg, &junk, 10);
if(*junk != '\0')
error_msg_and_die("invalid context length argument");
break;
case 'B':
lines_before = strtoul(optarg, &junk, 10);
if(*junk != '\0')
error_msg_and_die("invalid context length argument");
before_buf = (char **)calloc(lines_before, sizeof(char *));
break;
case 'C':
lines_after = lines_before = strtoul(optarg, &junk, 10);
if(*junk != '\0')
error_msg_and_die("invalid context length argument");
before_buf = (char **)calloc(lines_before, sizeof(char *));
break;
#endif /* BB_FEATURE_GREP_CONTEXT */
} }
} }
@ -137,6 +239,15 @@ extern int grep_main(int argc, char **argv)
if (argv[optind] == NULL) if (argv[optind] == NULL)
usage(grep_usage); usage(grep_usage);
/* sanity check */
if (print_count_only || be_quiet) {
print_line_num = 0;
#ifdef BB_FEATURE_GREP_CONTEXT
lines_before = 0;
lines_after = 0;
#endif
}
/* compile the regular expression /* compile the regular expression
* we're not going to mess with sub-expressions, and we need to * we're not going to mess with sub-expressions, and we need to
* treat newlines right. */ * treat newlines right. */