sbase

suckless unix tools
git clone git://git.2f30.org/sbase.git
Log | Files | Refs | README | LICENSE

commit e91d94a70eae0799b7e0b6364767b212455d04c8
parent d475a6bdf24f6a2c040def66676b5105b42d3b63
Author: sin <sin@2f30.org>
Date:   Thu, 22 Jan 2015 17:07:57 +0000

Add grep -w support

Require to use abuild on Alpine Linux with sbase.

Diffstat:
grep.1 | 4+++-
grep.c | 28+++++++++++++++++++++++++++-
2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/grep.1 b/grep.1 @@ -58,6 +58,8 @@ Suppress the error messages ordinarily written for nonexistent or unreadable fil Select lines which do .B not Match the pattern. +.It Fl w +The expression is search for as a word (as if surrounded by '[[:<:]]' and '[[:>:]]'). .It Fl x Consider only input lines that use all characters in the line excluding the terminating <newline> to match an entire fixed string or regular expression to be matching lines. @@ -82,5 +84,5 @@ utility is compliant with the specification. .Pp The flags -.Op Fl Hh +.Op Fl Hhw are an extension to that specification. diff --git a/grep.c b/grep.c @@ -16,6 +16,7 @@ static void addpattern(const char *); static void addpatternfile(FILE *); static int grep(FILE *, const char *); +static int Eflag; static int Fflag; static int Hflag; static int eflag; @@ -24,6 +25,7 @@ static int hflag; static int iflag; static int sflag; static int vflag; +static int wflag; static int xflag; static int many; static int mode; @@ -39,7 +41,7 @@ static SLIST_HEAD(phead, pattern) phead; static void usage(void) { - enprintf(Error, "usage: %s [-EFHchilnqsvx] [-e pattern] [-f file] [pattern] [file ...]\n", argv0); + enprintf(Error, "usage: %s [-EFHchilnqsvwx] [-e pattern] [-f file] [pattern] [file ...]\n", argv0); } int @@ -54,6 +56,7 @@ main(int argc, char *argv[]) ARGBEGIN { case 'E': + Eflag = 1; flags |= REG_EXTENDED; break; case 'F': @@ -99,6 +102,9 @@ main(int argc, char *argv[]) case 'v': vflag = 1; break; + case 'w': + wflag = 1; + break; case 'x': xflag = 1; break; @@ -147,6 +153,8 @@ addpattern(const char *pattern) { struct pattern *pnode; char *tmp; + int bol, eol; + size_t len; /* a null BRE/ERE matches every line */ if (!Fflag) @@ -161,6 +169,24 @@ addpattern(const char *pattern) pattern[0] == '^' ? "" : "^", pattern, pattern[strlen(pattern) - 1] == '$' ? "" : "$"); + } else if (!Fflag && wflag) { + len = strlen(pattern) + 15 + (Eflag ? 2 : 4); + tmp = malloc(len); + if (!tmp) + enprintf(Error, "malloc:"); + + bol = eol = 0; + if (pattern[0] == '^') + bol = 1; + if (pattern[strlen(pattern) - 1] == '$') + eol = 1; + + snprintf(tmp, len, "%s[[:<:]]%s%.*s%s[[:>:]]%s", + bol ? "^" : "", + Eflag ? "(" : "\\(", + (int)strlen(pattern) - bol - eol, pattern + bol, + Eflag ? ")" : "\\)", + eol ? "$" : ""); } else { tmp = strdup(pattern); if (!tmp)