D10108.id27066.diff
No OneTemporary
Actions

Size

930 B

Referenced Files

None

Subscribers

None

D10108.id27066.diff
View Options

	Index: usr.bin/grep/grep.c
	===================================================================
	--- usr.bin/grep/grep.c
	+++ usr.bin/grep/grep.c
	@@ -728,7 +728,7 @@
	if ((aargc == 0 \|\| aargc == 1) && !Hflag)
	hflag = true;

	- if (aargc == 0)
	+ if (aargc == 0 && dirbehave != DIR_RECURSE)
	exit(!procfile("-"));

	if (dirbehave == DIR_RECURSE)
	Index: usr.bin/grep/util.c
	===================================================================
	--- usr.bin/grep/util.c
	+++ usr.bin/grep/util.c
	@@ -111,6 +111,7 @@
	FTSENT *p;
	int c, fts_flags;
	bool ok;
	+ const char *wd[] = { ".", NULL };

	c = fts_flags = 0;

	@@ -128,7 +129,8 @@

	fts_flags \|= FTS_NOSTAT \| FTS_NOCHDIR;

	- if (!(fts = fts_open(argv, fts_flags, NULL)))
	+ fts = fts_open((argv[0] == NULL) ? __DECONST(char * const *, wd): argv, fts_flags, NULL);
	+ if (fts == NULL)
	err(2, "fts_open");
	while ((p = fts_read(fts)) != NULL) {
	switch (p->fts_info) {