From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Fri, 27 Oct 2017 17:05:00 +0000 (+0200)
Subject: time: fix build for toolchains without O_CLOEXEC
X-Git-Tag: 1_28_0~31
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d3a7e88008880489feb0f0adf1bcf8af1af2e9a7;p=oweals%2Fbusybox.git

time: fix build for toolchains without O_CLOEXEC

Based on patch by Eugene Rudoy <gene.devel@gmail.com>

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/miscutils/time.c b/miscutils/time.c
index f4f8149d3..61f078755 100644
--- a/miscutils/time.c
+++ b/miscutils/time.c
@@ -442,11 +442,16 @@ int time_main(int argc UNUSED_PARAM, char **argv)
 		output_format = posix_format;
 	output_fd = STDERR_FILENO;
 	if (opt & OPT_o) {
+#ifndef O_CLOEXEC
+# define O_CLOEXEC 0
+#endif
 		output_fd = xopen(output_filename,
 			(opt & OPT_a) /* append? */
 			? (O_CREAT | O_WRONLY | O_CLOEXEC | O_APPEND)
 			: (O_CREAT | O_WRONLY | O_CLOEXEC | O_TRUNC)
 		);
+		if (!O_CLOEXEC)
+			close_on_exec_on(output_fd);
 	}
 
 	run_command(argv, &res);