fixup! dir.c: regression fix for add_excludes with fscache

dscho · dscho · commit 512e5d63ecb3 · 2017-12-23T01:09:58.000+01:00
In my previous fixup, I forgot to close(fd)... D'oh. Squashed one bug,
introduced another...

Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
diff --git 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;
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -788,8 +788,9 @@ static int add_excludes(const char fname, const char base, int baselen,`
`788`	`788`	`fd = open(fname, O_RDONLY);`
`789`	`789`	`if (fd < 0)`
`790`	`790`	`warn_on_fopen_errors(fname);`
`791`		`- if (S_ISLNK(st.st_mode) && fstat(fd, &st) < 0) {`
	`791`	`+ else if (S_ISLNK(st.st_mode) && fstat(fd, &st) < 0) {`
`792`	`792`	`warn_on_fopen_errors(fname);`
	`793`	`+ close(fd);`
`793`	`794`	`fd = -1;`
`794`	`795`	`}`
`795`	`796`	`}`