From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 30 Jun 2005 03:43:14 +0000 (-0000)
Subject: patch by Shaun Jackman to combine dup/close funcs into dup2
X-Git-Tag: 1_1_0~924
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a87bb6080925177b0c09416a6b4e213bd9450042;p=oweals%2Fbusybox.git

patch by Shaun Jackman to combine dup/close funcs into dup2
---

diff --git a/coreutils/watch.c b/coreutils/watch.c
index 8a6a019bc..31fadfb85 100644
--- a/coreutils/watch.c
+++ b/coreutils/watch.c
@@ -82,7 +82,7 @@ extern int watch_main(int argc, char **argv)
 	header[len] = 0;
 
 	/* thanks to lye, who showed me how to redirect stdin/stdout */
-	old_stdout = dup(1);
+	old_stdout = dup(STDOUT_FILENO);
 
 	while (1) {
 		time(&t);
@@ -98,8 +98,7 @@ extern int watch_main(int argc, char **argv)
 			sleep(period);
 		} else if (0 == pid) {
 			//child
-			close(1);
-			dup(old_stdout);
+			dup2(old_stdout, STDOUT_FILENO);
 			execvp(*watched_argv, watched_argv);
 			bb_perror_msg_and_die(*watched_argv);
 		} else {