D2852.diff
No OneTemporary
Actions

Size

721 B

Referenced Files

None

Subscribers

None

D2852.diff
View Options

	Index: lib/libc/gen/fts.c
	===================================================================
	--- lib/libc/gen/fts.c
	+++ lib/libc/gen/fts.c
	@@ -515,7 +515,7 @@
	fts_children(FTS *sp, int instr)
	{
	FTSENT *p;
	- int fd;
	+ int fd, rc, serrno;

	if (instr != 0 && instr != FTS_NAMEONLY) {
	errno = EINVAL;
	@@ -571,11 +571,14 @@
	if ((fd = _open(".", O_RDONLY \| O_CLOEXEC, 0)) < 0)
	return (NULL);
	sp->fts_child = fts_build(sp, instr);
	- if (fchdir(fd)) {
	- (void)_close(fd);
	- return (NULL);
	- }
	+ serrno = (sp->fts_child == NULL) ? errno : 0;
	+ rc = fchdir(fd);
	+ if (rc < 0 && serrno == 0)
	+ serrno = errno;
	(void)_close(fd);
	+ errno = serrno;
	+ if (rc < 0)
	+ return (NULL);
	return (sp->fts_child);
	}