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.14.13~2
X-Git-Url: http://git.kaiwu.me/%7B@url%7D?a=commitdiff_plain;h=0b90d25a50410715efa9a20c803e6322ebc16dae;p=haproxy.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.
(cherry picked from commit 1700b9c3d5f06ac283ab2e254bd64b1bc7a207ca)
(cherry picked from commit ac053933b34c4c7d9e25fe75f569b70e394245fa)
---

diff --git a/src/haproxy.c b/src/haproxy.c
index e0c33a238..a1c3d9dab 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -901,7 +901,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 */
@@ -1067,7 +1066,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 */
 		}