diff options
| author | gabor <gabor@FreeBSD.org> | 2010-07-25 08:42:18 +0000 |
|---|---|---|
| committer | gabor <gabor@FreeBSD.org> | 2010-07-25 08:42:18 +0000 |
| commit | 6a65a7e10a4189931f5ab166f4c918fd56f8ff6a (patch) | |
| tree | 1cfc486a9c000ac3f509a7af3ec225fe78b2b9a3 /usr.bin/grep/grep.h | |
| parent | 983ba731fd264c25e66b047dc2e3d3829e9cd04a (diff) | |
| download | FreeBSD-src-6a65a7e10a4189931f5ab166f4c918fd56f8ff6a.zip FreeBSD-src-6a65a7e10a4189931f5ab166f4c918fd56f8ff6a.tar.gz | |
- Fix --color behaviour to only output color sequences if stdout is a tty
or if forced mode is specified [1]
- While here, add some alternative names for the options and make then
case-insensitive
- Fix -q and -l behaviour [2]
- Some small changes to make the code easier to review
Submitted by: swell.k@gmail.com [1],
dougb [2]
Approved by: delphij (mentor)
Diffstat (limited to 'usr.bin/grep/grep.h')
| -rw-r--r-- | usr.bin/grep/grep.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/usr.bin/grep/grep.h b/usr.bin/grep/grep.h index 573de56..4a2d43f 100644 --- a/usr.bin/grep/grep.h +++ b/usr.bin/grep/grep.h @@ -60,14 +60,14 @@ extern const char *errstr[]; #define FILE_GZIP 1 #define FILE_BZIP 2 -#define DIR_GREP 0 +#define DIR_READ 0 #define DIR_SKIP 1 #define DIR_RECURSE 2 -#define DEV_GREP 0 +#define DEV_READ 0 #define DEV_SKIP 1 -#define LINK_GREP 0 +#define LINK_READ 0 #define LINK_EXPLICIT 1 #define LINK_SKIP 2 @@ -120,7 +120,8 @@ extern bool Eflag, Fflag, Gflag, Hflag, Lflag, qflag, sflag, vflag, wflag, xflag; extern bool exclflag, nullflag; extern unsigned long long Aflag, Bflag, mcount; -extern char *color, *label; +extern char *label; +extern const char *color; extern int binbehave, devbehave, dirbehave, filebehave, grepbehave, linkbehave; extern bool first, matchall, notfound, prev; |
