#include <signal.h>
#include <time.h>
#include <ctype.h>
+#define BB_DECLARE_EXTERN
+#define bb_need_too_few_args
+#include "messages.c"
static const char grep_usage[] =
"grep [OPTIONS]... PATTERN [FILE]...\n"
"\t-q\tbe quiet. Returns 0 if result was found, 1 otherwise\n"
"\t-v\tselect non-matching lines\n\n"
#if defined BB_REGEXP
- "This version of grep matches full regular expresions.\n";
+ "This version of grep matches full regular expressions.\n";
#else
- "This version of grep matches strings (not regular expresions).\n"
+ "This version of grep matches strings (not regular expressions).\n"
#endif
#endif
;
static void do_grep(FILE * fp, char *needle, char *fileName, int tellName,
int ignoreCase, int tellLine, int invertSearch)
{
- char *cp;
long line = 0;
- char haystack[BUF_SIZE];
+ char *haystack;
int truth = !invertSearch;
- while (fgets(haystack, sizeof(haystack), fp)) {
+ while ((haystack = cstring_lineFromFile(fp))) {
line++;
- cp = &haystack[strlen(haystack) - 1];
-
- if (*cp != '\n')
- fprintf(stderr, "%s: Line too long\n", fileName);
-
if (find_match(haystack, needle, ignoreCase) == truth) {
if (tellName == TRUE)
printf("%s:", fileName);
match = TRUE;
}
+ free(haystack);
}
}
extern int grep_main(int argc, char **argv)
{
FILE *fp;
- char *cp;
char *needle;
char *fileName;
int tellName = TRUE;
int tellLine = FALSE;
int invertSearch = FALSE;
- argc--;
- argv++;
if (argc < 1) {
usage(grep_usage);
}
+ argv++;
- if (**argv == '-') {
- argc--;
- cp = *argv++;
-
- while (*++cp)
- switch (*cp) {
+ while (--argc >= 0 && *argv && (**argv == '-')) {
+ while (*++(*argv)) {
+ switch (**argv) {
case 'i':
ignoreCase = TRUE;
break;
default:
usage(grep_usage);
}
+ }
+ argv++;
+ }
+
+ if (argc == 0 || *argv == NULL) {
+ fatalError(too_few_args, "grep");
}
needle = *argv++;
fclose(fp);
}
}
- exit(match);
+ return(match);
}