* Mini grep implementation for busybox using libc regex.
*
* Copyright (C) 1999,2000 by Lineo, inc.
- * Written by Mark Whitley <markw@lineo.com>, <markw@enol.com>
+ * Written by Mark Whitley <markw@lineo.com>, <markw@codepoet.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include <regex.h>
#include <string.h> /* for strerror() */
#include <errno.h>
-#include "internal.h"
+#include "busybox.h"
+
+extern void xregcomp(regex_t *preg, const char *regex, int cflags);
extern int optind; /* in unistd.h */
extern int errno; /* for use with strerror() */
/* globals */
static regex_t regex; /* storage space for compiled regular expression */
-static int nmatches = 0; /* keeps track of the number of matches */
+static int matched; /* keeps track of whether we ever matched */
static char *cur_file = NULL; /* the current file we are reading */
if (print_line_num)
printf("%i:", linenum);
- printf("%s", line);
+ puts(line);
}
static void grep_file(FILE *file)
char *line = NULL;
int ret;
int linenum = 0;
+ int nmatches = 0;
while ((line = get_line_from_file(file)) != NULL) {
+ if (line[strlen(line)-1] == '\n')
+ line[strlen(line)-1] = '\0';
linenum++;
ret = regexec(®ex, line, 0, NULL, 0);
if (ret == 0 && !invert_search) { /* match */
}
else if (ret == REG_NOMATCH && invert_search) {
+ if (be_quiet) {
+ regfree(®ex);
+ exit(0);
+ }
+
nmatches++;
print_matched_line(line, linenum);
}
printf("%i\n", nmatches);
}
- /* reset number of matches found to zero */
- nmatches = 0;
+ /* record if we matched */
+ if (nmatches != 0)
+ matched = 1;
}
extern int grep_main(int argc, char **argv)
/* compile the regular expression
* we're not going to mess with sub-expressions, and we need to
* treat newlines right. */
- reflags = REG_NOSUB | REG_NEWLINE;
+ reflags = REG_NOSUB;
if (ignore_case)
reflags |= REG_ICASE;
xregcomp(®ex, argv[optind], reflags);
file = fopen(cur_file, "r");
if (file == NULL) {
if (!suppress_err_msgs)
- errorMsg("%s: %s\n", cur_file, strerror(errno));
+ perror_msg("%s", cur_file);
}
else {
grep_file(file);
regfree(®ex);
- if (nmatches == 0)
+ if (!matched)
return 1;
return 0;