From 512e5d63ecb3be594daee6ef81bd28a3b2bb2dc7 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 21 Dec 2017 14:34:42 +0100 Subject: [PATCH] fixup! dir.c: regression fix for add_excludes with fscache In my previous fixup, I forgot to close(fd)... D'oh. Squashed one bug, introduced another... Signed-off-by: Johannes Schindelin --- dir.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dir.c b/dir.c index 086242d80a..7dc285c7dc 100644 --- a/dir.c +++ b/dir.c @@ -788,8 +788,9 @@ static int add_excludes(const char *fname, const char *base, int baselen, fd = open(fname, O_RDONLY); if (fd < 0) warn_on_fopen_errors(fname); - if (S_ISLNK(st.st_mode) && fstat(fd, &st) < 0) { + else if (S_ISLNK(st.st_mode) && fstat(fd, &st) < 0) { warn_on_fopen_errors(fname); + close(fd); fd = -1; } }