o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

grep: update from Plan 9

Browse source 
This change fixes a segfault in grep -e when no argument
has been provided. Thanks to Sean Hinchee for reporting
this issue.

Fixes #186.
This commit is contained in:
David du Colombier 2018-10-01 17:20:35 +02:00
parent de3b6d5848
commit 93c75d2bad
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/cmd/grep/main.c
View file

@ -5,7 +5,7 @@ char *validflags = "bchiLlnsv";
void void
usage(void) usage(void)
{ {
fprint(2, "usage: grep [-%s] [-f file] [-e expr] [file ...]\n", validflags); fprint(2, "usage: grep [-%s] [-e pattern] [-f patternfile] [file ...]\n", validflags);
exits("usage"); exits("usage");
} }
@ -31,12 +31,12 @@ main(int argc, char *argv[])
case 'e': case 'e':
flags['e']++; flags['e']++;
lineno = 0; lineno = 0;
str2top(ARGF()); str2top(EARGF(usage()));
break; break;
case 'f': case 'f':
flags['f']++; flags['f']++;
filename = ARGF(); filename = EARGF(usage());
rein = Bopen(filename, OREAD); rein = Bopen(filename, OREAD);
if(rein == 0) { if(rein == 0) {
fprint(2, "grep: can't open %s: %r\n", filename); fprint(2, "grep: can't open %s: %r\n", filename);