procd: replace exit(-1) with exit(EXIT_FAILURE)

[project/procd.git] / plug / hotplug.c

diff --git a/plug/hotplug.c b/plug/hotplug.c
index 80e6e4db9e734b708f62d4f41a695486f654188f..de0511fbd4891ff5e226f0059e29d3cf016915fe 100644 (file)
--- a/plug/hotplug.c
+++ b/plug/hotplug.c
@@ -25,6 +25,7 @@
 #include <libubox/uloop.h>
 #include <json-c/json.h>
 
+#include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -119,6 +120,30 @@ static void mkdir_p(char *dir)
        }
 }
 
+static void chgrp_error(const char *group, const char *target, const char *failed)
+{
+       ERROR("cannot set group %s for %s (%s: %d)\n",
+              group, target, failed, errno);
+}
+
+static void chgrp_target(struct blob_attr *bgroup, struct blob_attr *btarget)
+{
+       int ret = 0;
+       struct group *g = NULL;
+       const char *group = blobmsg_get_string(bgroup);
+       const char *target = blobmsg_get_string(btarget);
+
+       errno = 0;
+
+       g = getgrnam(group);
+       if (!g)
+               return chgrp_error(group, target, "getgrnam");
+
+       ret = chown(target, 0, g->gr_gid);
+       if (ret < 0)
+               return chgrp_error(group, target, "chown");
+}
+
 static void handle_makedev(struct blob_attr *msg, struct blob_attr *data)
 {
        unsigned int oldumask = umask(0);
@@ -131,7 +156,6 @@ static void handle_makedev(struct blob_attr *msg, struct blob_attr *data)
        char *minor = hotplug_msg_find_var(msg, "MINOR");
        char *major = hotplug_msg_find_var(msg, "MAJOR");
        char *subsystem = hotplug_msg_find_var(msg, "SUBSYSTEM");
-       int ret = 0;
 
        blobmsg_parse_array(mkdev_policy, 3, tb, blobmsg_data(data), blobmsg_data_len(data));
        if (tb[0] && tb[1] && minor && major && subsystem) {
@@ -147,17 +171,8 @@ static void handle_makedev(struct blob_attr *msg, struct blob_attr *data)
                mknod(blobmsg_get_string(tb[0]),
                                m | strtoul(blobmsg_data(tb[1]), NULL, 8),
                                makedev(atoi(major), atoi(minor)));
-               if (tb[2]) {
-                       struct group *g = getgrnam(blobmsg_get_string(tb[2]));
-
-                       if (g)
-                               ret = chown(blobmsg_get_string(tb[0]), 0, g->gr_gid);
-
-                       if (!g || ret < 0)
-                               ERROR("cannot set group %s for %s\n",
-                                       blobmsg_get_string(tb[2]),
-                                       blobmsg_get_string(tb[0]));
-               }
+               if (tb[2])
+                       chgrp_target(tb[2], tb[0]);
        }
        umask(oldumask);
 }
@@ -206,7 +221,7 @@ static void handle_exec(struct blob_attr *msg, struct blob_attr *data)
                argv[i] = NULL;
                execvp(argv[0], &argv[0]);
        }
-       exit(-1);
+       exit(EXIT_FAILURE);
 }
 
 static void handle_button_start(struct blob_attr *msg, struct blob_attr *data)
@@ -231,7 +246,7 @@ static void handle_firmware(struct blob_attr *msg, struct blob_attr *data)
 
        if (!file || !dir || !dev) {
                ERROR("Request for unknown firmware %s/%s\n", dir, file);
-               exit(-1);
+               exit(EXIT_FAILURE);
        }
 
        path = alloca(strlen(dir) + strlen(file) + 2);
@@ -256,11 +271,11 @@ send_to_kernel:
        load = open(loadpath, O_WRONLY);
        if (!load) {
                ERROR("Failed to open %s: %m\n", loadpath);
-               exit(-1);
+               exit(EXIT_FAILURE);
        }
        if (write(load, "1", 1) == -1) {
                ERROR("Failed to write to %s: %m\n", loadpath);
-               exit(-1);
+               exit(EXIT_FAILURE);
        }
        close(load);
 
@@ -268,7 +283,7 @@ send_to_kernel:
        fw = open(syspath, O_WRONLY);
        if (fw < 0) {
                ERROR("Failed to open %s: %m\n", syspath);
-               exit(-1);
+               exit(EXIT_FAILURE);
        }
 
        len = s.st_size;
@@ -294,7 +309,21 @@ send_to_kernel:
 
        DEBUG(2, "Done loading %s\n", path);
 
-       exit(-1);
+       exit(EXIT_FAILURE);
+}
+
+static void handle_start_console(struct blob_attr *msg, struct blob_attr *data)
+{
+       char *dev = blobmsg_get_string(blobmsg_data(data));
+
+       DEBUG(2, "Start console request for %s\n", dev);
+
+       procd_inittab_run("respawn");
+       procd_inittab_run("askfirst");
+
+       DEBUG(2, "Done starting console for %s\n", dev);
+
+       exit(EXIT_FAILURE);
 }
 
 enum {
@@ -303,6 +332,7 @@ enum {
        HANDLER_EXEC,
        HANDLER_BUTTON,
        HANDLER_FW,
+       HANDLER_START_CONSOLE,
 };
 
 static struct cmd_handler {
@@ -336,6 +366,10 @@ static struct cmd_handler {
                .name = "load-firmware",
                .handler = handle_firmware,
        },
+       [HANDLER_START_CONSOLE] = {
+               .name = "start-console",
+               .handler = handle_start_console,
+       },
 };
 
 static void queue_next(void)
@@ -545,11 +579,13 @@ static void hotplug_handler(struct uloop_fd *u, unsigned int ev)
 {
        int i = 0;
        static char buf[4096];
-       int len = recv(u->fd, buf, sizeof(buf), MSG_DONTWAIT);
+       int len = recv(u->fd, buf, sizeof(buf) - 1, MSG_DONTWAIT);
        void *index;
        if (len < 1)
                return;
 
+       buf[len] = '\0';
+
        blob_buf_init(&b, 0);
        index = blobmsg_open_table(&b, NULL);
        while (i < len) {