6613845 setlog(), daemonize_start() should use STD{ERR,OUT}_FILENO constants

3 files changed, 14 insertions, 13 deletions

diff --git a/usr/src/cmd/svc/startd/fork.c b/usr/src/cmd/svc/startd/fork.c
index c7d0670fa2..f3b30dca1a 100644
--- a/usr/src/cmd/svc/startd/fork.c
+++ b/usr/src/cmd/svc/startd/fork.c
@@ -212,7 +212,7 @@ void
 fork_sulogin(boolean_t immediate, const char *format, ...)
 {
 	va_list args;
-	int i, fd_console;
+	int fd_console;
 
 	(void) printf("Requesting System Maintenance Mode\n");
 
@@ -245,8 +245,9 @@ fork_sulogin(boolean_t immediate, const char *format, ...)
 		 * Can't call closefrom() in this MT section
 		 * so safely close a minimum set of fds.
 		 */
-		for (i = 0; i < 3; i++)
-			(void) close(i);
+		(void) close(STDIN_FILENO);
+		(void) close(STDOUT_FILENO);
+		(void) close(STDERR_FILENO);
 	}
 
 	(void) setpgrp();
@@ -265,7 +266,7 @@ fork_sulogin(boolean_t immediate, const char *format, ...)
 			while (dup2(fd_console, STDERR_FILENO) < 0 &&
 			    errno == EINTR)
 				;
-		if (fd_console > 2)
+		if (fd_console > STDERR_FILENO)
 			(void) close(fd_console);
 	}
 
diff --git a/usr/src/cmd/svc/startd/log.c b/usr/src/cmd/svc/startd/log.c
index 46beb9a69a..050f360e35 100644
--- a/usr/src/cmd/svc/startd/log.c
+++ b/usr/src/cmd/svc/startd/log.c
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -263,10 +263,10 @@ setlog(const char *logstem)
 	if (fd == -1)
 		return;
 
-	(void) dup2(fd, 1);
-	(void) dup2(fd, 2);
+	(void) dup2(fd, STDOUT_FILENO);
+	(void) dup2(fd, STDERR_FILENO);
 
-	if (fd != 1 && fd != 2)
+	if (fd != STDOUT_FILENO && fd != STDERR_FILENO)
 		startd_close(fd);
 }
 
@@ -434,7 +434,7 @@ log_transition(const restarter_inst_t *inst, start_outcome_t outcome)
 
 		if (cname)
 			(void) snprintf(omessage, sizeof (omessage), " (%s)",
-			cname);
+			    cname);
 		else
 			*omessage = '\0';
 
diff --git a/usr/src/cmd/svc/startd/startd.c b/usr/src/cmd/svc/startd/startd.c
index 19adda1373..04078b059f 100644
--- a/usr/src/cmd/svc/startd/startd.c
+++ b/usr/src/cmd/svc/startd/startd.c
@@ -802,17 +802,17 @@ daemonize_start(void)
 	if (pid != 0)
 		exit(0);
 
-	(void) close(0);
+	(void) close(STDIN_FILENO);
 
 	if ((fd = open("/dev/null", O_RDONLY)) == -1) {
 		uu_warn(gettext("can't connect stdin to /dev/null"));
-	} else if (fd != 0) {
-		(void) dup2(fd, 0);
+	} else if (fd != STDIN_FILENO) {
+		(void) dup2(fd, STDIN_FILENO);
 		startd_close(fd);
 	}
 
 	closefrom(3);
-	(void) dup2(2, 1);
+	(void) dup2(STDERR_FILENO, STDOUT_FILENO);
 
 	(void) setsid();
 	(void) chdir("/");