fbt
/
sbase
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Properly handle multiline patterns in grep(1) 

We should be POSIX compliant now.
This commit is contained in:
sin 2014-11-20 19:56:18 +00:00
parent b6a41b688b
commit 8767e4b320
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
grep.c
View File

@ -12,7 +12,7 @@
enum { Match = 0, NoMatch = 1, Error = 2 }; enum { Match = 0, NoMatch = 1, Error = 2 };
static void addpattern(const char *); static void addpattern(const char *);
static void addpatternfile(const char *); static void addpatternfile(FILE *);
static int grep(FILE *, const char *); static int grep(FILE *, const char *);
static int Fflag; static int Fflag;
@ -47,6 +47,7 @@ main(int argc, char *argv[])
struct pattern *pnode; struct pattern *pnode;
int i, m, flags = REG_NOSUB, match = NoMatch; int i, m, flags = REG_NOSUB, match = NoMatch;
FILE *fp; FILE *fp;
char *arg;
SLIST_INIT(&phead); SLIST_INIT(&phead);
@ -61,11 +62,19 @@ main(int argc, char *argv[])
Hflag = 1; Hflag = 1;
break; break;
case 'e': case 'e':
addpattern(EARGF(usage())); arg = EARGF(usage());
fp = fmemopen(arg, strlen(arg) + 1, "r");
addpatternfile(fp);
fclose(fp);
eflag = 1; eflag = 1;
break; break;
case 'f': case 'f':
addpatternfile(EARGF(usage())); arg = EARGF(usage());
fp = fopen(arg, "r");
if (!fp)
enprintf(Error, "fopen %s:", arg);
addpatternfile(fp);
fclose(fp);
fflag = 1; fflag = 1;
break; break;
case 'h': case 'h':
@ -99,7 +108,9 @@ main(int argc, char *argv[])
/* just add literal pattern to list */ /* just add literal pattern to list */
if (!eflag && !fflag) { if (!eflag && !fflag) {
addpattern(argv[0]); fp = fmemopen(argv[0], strlen(argv[0]) + 1, "r");
addpatternfile(fp);
fclose(fp);
argc--; argc--;
argv++; argv++;
} }
@ -163,22 +174,17 @@ addpattern(const char *pattern)
} }
static void static void
addpatternfile(const char *file) addpatternfile(FILE *fp)
{ {
FILE *fp;
char *buf = NULL; char *buf = NULL;
size_t len = 0, size = 0; size_t len = 0, size = 0;
fp = fopen(file, "r");
if (!fp)
enprintf(Error, "fopen %s:", file);
while ((len = getline(&buf, &size, fp)) != -1) { while ((len = getline(&buf, &size, fp)) != -1) {
if (len && buf[len - 1] == '\n') if (len && buf[len - 1] == '\n')
buf[len - 1] = '\0'; buf[len - 1] = '\0';
addpattern(buf); addpattern(buf);
} }
free(buf); free(buf);
fclose(fp);
} }
static int static int