grep: ARGBEGIN
This commit is contained in:
parent
171ef71c74
commit
c2c5ea9c60
35
grep.c
35
grep.c
|
@ -11,6 +11,7 @@
|
|||
enum { Match = 0, NoMatch = 1, Error = 2 };
|
||||
|
||||
static void grep(FILE *, const char *, regex_t *);
|
||||
static void usage(void);
|
||||
|
||||
static bool vflag = false;
|
||||
static bool many;
|
||||
|
@ -21,12 +22,11 @@ int
|
|||
main(int argc, char *argv[])
|
||||
{
|
||||
char c;
|
||||
int n, flags = REG_NOSUB;
|
||||
int i, n, flags = REG_NOSUB;
|
||||
regex_t preg;
|
||||
FILE *fp;
|
||||
|
||||
while((c = getopt(argc, argv, "Ecilnqv")) != -1)
|
||||
switch(c) {
|
||||
ARGBEGIN {
|
||||
case 'E':
|
||||
flags |= REG_EXTENDED;
|
||||
break;
|
||||
|
@ -43,24 +43,25 @@ main(int argc, char *argv[])
|
|||
vflag = true;
|
||||
break;
|
||||
default:
|
||||
exit(Error);
|
||||
}
|
||||
if(optind == argc)
|
||||
enprintf(Error, "usage: %s [-Ecilnqv] pattern [files...]\n", argv[0]);
|
||||
usage();
|
||||
} ARGEND;
|
||||
|
||||
if((n = regcomp(&preg, argv[optind++], flags)) != 0) {
|
||||
if(argc == 0)
|
||||
usage(); /* no pattern */
|
||||
|
||||
if((n = regcomp(&preg, argv[0], flags)) != 0) {
|
||||
char buf[BUFSIZ];
|
||||
|
||||
regerror(n, &preg, buf, sizeof buf);
|
||||
enprintf(Error, "invalid pattern: %s\n", buf);
|
||||
}
|
||||
many = (argc > optind+1);
|
||||
if(optind == argc)
|
||||
many = (argc > 1);
|
||||
if(argc == 1)
|
||||
grep(stdin, "<stdin>", &preg);
|
||||
else for(; optind < argc; optind++) {
|
||||
if(!(fp = fopen(argv[optind], "r")))
|
||||
enprintf(Error, "fopen %s:", argv[optind]);
|
||||
grep(fp, argv[optind], &preg);
|
||||
else for(i = 1; i < argc; i++) {
|
||||
if(!(fp = fopen(argv[i], "r")))
|
||||
enprintf(Error, "fopen %s:", argv[i]);
|
||||
grep(fp, argv[i], &preg);
|
||||
fclose(fp);
|
||||
}
|
||||
return match ? Match : NoMatch;
|
||||
|
@ -104,3 +105,9 @@ end:
|
|||
enprintf(Error, "%s: read error:", str);
|
||||
free(buf);
|
||||
}
|
||||
|
||||
void
|
||||
usage(void)
|
||||
{
|
||||
enprintf(Error, "usage: %s [-Ecilnqv] pattern [files...]\n", argv0);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user