From: Willy Tarreau <w@1wt.eu>
Date: Sun, 10 May 2009 08:33:29 +0000 (+0200)
Subject: [MINOR] don't close stdio fds twice
X-Git-Tag: v1.3.18~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1700b9c3d5f06ac283ab2e254bd64b1bc7a207ca;p=thirdparty%2Fhaproxy.git

[MINOR] don't close stdio fds twice

This minor harmless bug dates back to v1.1. When fclose() was added,
the close() calls were not removed, so the fds 0,1,2 are closed twice.
---

diff --git a/src/haproxy.c b/src/haproxy.c
index 31c48e1c05..1c4501a1d4 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -980,7 +980,6 @@ int main(int argc, char **argv)
 	if ((global.mode & MODE_QUIET) && !(global.mode & MODE_VERBOSE)) {
 		/* detach from the tty */
 		fclose(stdin); fclose(stdout); fclose(stderr);
-		close(0); close(1); close(2);
 	}
 
 	/* open log & pid files before the chroot */
@@ -1158,7 +1157,6 @@ int main(int argc, char **argv)
 		if (!(global.mode & MODE_QUIET) || (global.mode & MODE_VERBOSE)) {
 			/* detach from the tty */
 			fclose(stdin); fclose(stdout); fclose(stderr);
-			close(0); close(1); close(2); /* close all fd's */
 			global.mode &= ~MODE_VERBOSE;
 			global.mode |= MODE_QUIET; /* ensure that we won't say anything from now */
 		}