X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=state.c;h=1ed70f542f13d3ec7b8a3d3cf2fcf8e31cf42cd8;hb=08cd2c661ea6ce378ce7a6ff37d11220d65e2c5f;hp=0896e1ae34f6430ad7abdee5ba5d46f3dfc238a3;hpb=3ff99010e61a0299257ffc91467a16d278a7e774;p=project%2Fprocd.git

diff --git a/state.c b/state.c
index 0896e1a..1ed70f5 100644
--- a/state.c
+++ b/state.c
@@ -43,12 +43,14 @@ static int reboot_event;
 
 static void set_stdio(const char* tty)
 {
-	chdir("/dev");
-	freopen(tty, "r", stdin);
-	freopen(tty, "w", stdout);
-	freopen(tty, "w", stderr);
-	chdir("/");
-	fcntl(STDERR_FILENO, F_SETFL, fcntl(STDERR_FILENO, F_GETFL) | O_NONBLOCK);
+	if (chdir("/dev") ||
+	    !freopen(tty, "r", stdin) ||
+	    !freopen(tty, "w", stdout) ||
+	    !freopen(tty, "w", stderr) ||
+	    chdir("/"))
+		ERROR("failed to set stdio\n");
+	else
+		fcntl(STDERR_FILENO, F_SETFL, fcntl(STDERR_FILENO, F_GETFL) | O_NONBLOCK);
 }
 
 static void set_console(void)
@@ -70,7 +72,10 @@ static void set_console(void)
 		i++;
 	}
 
-	chdir("/dev");
+	if (chdir("/dev")) {
+		ERROR("failed to change dir to /dev\n");
+		return;
+	}
 	while (tty!=NULL) {
 		f = open(tty, O_RDONLY);
 		if (f >= 0) {
@@ -81,7 +86,8 @@ static void set_console(void)
 		tty=try[i];
 		i++;
 	}
-	chdir("/");
+	if (chdir("/"))
+		ERROR("failed to change dir to /\n");
 
 	if (tty != NULL)
 		set_stdio(tty);
@@ -116,6 +122,9 @@ static void state_enter(void)
 		procd_inittab_run("askconsole");
 		procd_inittab_run("askfirst");
 		procd_inittab_run("sysinit");
+
+		// switch to syslog log channel
+		ulog_open(ULOG_SYSLOG, LOG_DAEMON, "procd");
 		break;
 
 	case STATE_RUNNING: