add ifdefs to make service/instance.c compile on non-linux systems

[project/procd.git] / inittab.c

diff --git a/inittab.c b/inittab.c
index 2efbf4d69174240bf897ec02df52a16d16671d47..f8f0218f219b01023de4270483cf09eda134a3e8 100644 (file)
--- a/inittab.c
+++ b/inittab.c
@@ -70,9 +70,11 @@ static int dev_open(const char *dev)
        int fd = -1;
 
        if (dev) {
-               chdir("/dev");
-               fd = open( dev, O_RDWR);
-               chdir("/");
+               if (chdir("/dev"))
+                       ERROR("failed to change dir to /dev\n");
+               fd = open(dev, O_RDWR);
+               if (chdir("/"))
+                       ERROR("failed to change dir to /\n");
        }
 
        return fd;
@@ -83,9 +85,8 @@ static int dev_exist(const char *dev)
        int res;
 
        res = dev_open(dev);
-       if (res != -1) {
+       if (res != -1)
                close(res);
-       }
 
        return (res != -1);
 }
@@ -99,10 +100,6 @@ static void fork_worker(struct init_action *a)
        if (!a->proc.pid) {
                p = setsid();
 
-               close(STDIN_FILENO);
-               close(STDOUT_FILENO);
-               close(STDERR_FILENO);
-
                fd = dev_open(a->id);
                if (fd != -1)
                {
@@ -154,7 +151,10 @@ static void runrc(struct init_action *a)
                ERROR("valid format is rcS <S|K> <param>\n");
                return;
        }
-       rcS(a->argv[1], a->argv[2], rcdone);
+
+       /* proceed even if no init or shutdown scripts run */
+       if (rcS(a->argv[1], a->argv[2], rcdone))
+               rcdone(NULL);
 }
 
 static void askfirst(struct init_action *a)