X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=initd%2Fearly.c;h=accfc1dce54c488e5cb4ab82eb9922c76b7c8a89;hb=d38403cdd3ba8427a2d24ba68f1ba79f4dd0546b;hp=5821c58f20aa8b3822cbd89809069c476612be39;hpb=45cb04fd85d788a37367a5385e5e90dd98a0a991;p=project%2Fprocd.git diff --git a/initd/early.c b/initd/early.c index 5821c58..accfc1d 100644 --- a/initd/early.c +++ b/initd/early.c @@ -21,6 +21,7 @@ #include #include +#include "../utils/utils.h" #include "init.h" #include "../libc-compat.h" @@ -35,25 +36,16 @@ static void early_console(const char *dev) { struct stat s; - int dd; if (stat(dev, &s)) { ERROR("Failed to stat %s\n", dev); return; } - dd = open(dev, O_RDWR); - if (dd < 0) - dd = open("/dev/null", O_RDWR); - - dup2(dd, STDIN_FILENO); - dup2(dd, STDOUT_FILENO); - dup2(dd, STDERR_FILENO); - - if (dd != STDIN_FILENO && - dd != STDOUT_FILENO && - dd != STDERR_FILENO) - close(dd); + if (patch_stdio(dev)) { + ERROR("Failed to setup i/o redirection\n"); + return; + } fcntl(STDERR_FILENO, F_SETFL, fcntl(STDERR_FILENO, F_GETFL) | O_NONBLOCK); } @@ -90,7 +82,7 @@ early_mounts(void) static void early_env(void) { - setenv("PATH", "/usr/sbin:/usr/bin:/sbin:/bin", 1); + setenv("PATH", EARLY_PATH, 1); } void