projects
/
unix-history
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
tags
|
clone url
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
BSD 4_2 release
[unix-history]
/
usr
/
src
/
usr.bin
/
egrep.y
diff --git
a/usr/src/usr.bin/egrep.y
b/usr/src/usr.bin/egrep.y
index
9123dd9
..
d87a619
100644
(file)
--- a/
usr/src/usr.bin/egrep.y
+++ b/
usr/src/usr.bin/egrep.y
@@
-13,7
+13,7
@@
%left STAR PLUS QUEST
%{
%left STAR PLUS QUEST
%{
-static char *sccsid = "@(#)egrep.y 4.
2 (Berkeley) 11/8/82
";
+static char *sccsid = "@(#)egrep.y 4.
3 (Berkeley) 3/13/83
";
#include <stdio.h>
#define MAXLIN 350
#include <stdio.h>
#define MAXLIN 350
@@
-51,6
+51,7
@@
int nflag;
int hflag = 1;
int sflag;
int vflag;
int hflag = 1;
int sflag;
int vflag;
+int retcode = 0;
int nfile;
int blkno;
long tln;
int nfile;
int blkno;
long tln;
@@
-491,7
+492,7
@@
out:
execute(*argv);
argv++;
}
execute(*argv);
argv++;
}
- exit(nsucc == 0);
+ exit(
retcode != 0 ? retcode :
nsucc == 0);
}
execute(file)
}
execute(file)
@@
-506,7
+507,8
@@
char *file;
if (file) {
if ((f = open(file, 0)) < 0) {
fprintf(stderr, "egrep: can't open %s\n", file);
if (file) {
if ((f = open(file, 0)) < 0) {
fprintf(stderr, "egrep: can't open %s\n", file);
- exit(2);
+ retcode = 2;
+ return;
}
}
else f = 0;
}
}
else f = 0;