DeforaOS/utils
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for "grep -s"

Browse Source
This commit is contained in:
Pierre Pronchery 2017-01-31 22:27:53 +01:00
parent df7e489bbb
commit 3f838ab334
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/grep.c
View File

@ -34,6 +34,7 @@
typedef int Prefs; typedef int Prefs;
#define GREP_PREFS_n 0x1 #define GREP_PREFS_n 0x1
#define GREP_PREFS_q 0x2 #define GREP_PREFS_q 0x2
#define GREP_PREFS_s 0x4
/* prototypes */ /* prototypes */
@ -99,9 +100,15 @@ static int _grep_files(Prefs * prefs, regex_t * reg, int filec, char * filev[])
} }
else if((fp = fopen(filev[i], "r")) == NULL) else if((fp = fopen(filev[i], "r")) == NULL)
{ {
snprintf(buf, sizeof(buf), "%s: %s", filev[i], if(prefs != NULL && (*prefs & GREP_PREFS_s)
strerror(errno)); && (errno == ENOENT || errno == EACCES))
ret = _grep_error(buf, 2); ret = 2;
else
{
snprintf(buf, sizeof(buf), "%s: %s", filev[i],
strerror(errno));
ret = _grep_error(buf, 2);
}
continue; continue;
} }
else else
@ -153,7 +160,7 @@ static int _grep_stream(Prefs * prefs, regex_t * reg, FILE * fp,
/* usage */ /* usage */
static int _usage(void) static int _usage(void)
{ {
fputs("Usage: " PROGNAME " [-Einq][file...]\n", stderr); fputs("Usage: " PROGNAME " [-Einqs][file...]\n", stderr);
return 1; return 1;
} }
@ -167,7 +174,7 @@ int main(int argc, char * argv[])
Prefs prefs = 0; Prefs prefs = 0;
int flags = 0; int flags = 0;
while((o = getopt(argc, argv, "Einq")) != -1) while((o = getopt(argc, argv, "Einqs")) != -1)
switch(o) switch(o)
{ {
case 'E': case 'E':
@ -182,6 +189,9 @@ int main(int argc, char * argv[])
case 'q': case 'q':
prefs |= GREP_PREFS_q; prefs |= GREP_PREFS_q;
break; break;
case 's':
prefs |= GREP_PREFS_s;
break;
default: default:
return _usage(); return _usage();
} }