udevd: fix udevd read() calls to leave room for null byte

[elogind.git] / udevcontrol.c

diff --git a/udevcontrol.c b/udevcontrol.c
index 98776ccefd84f635b0b209934eac8504d096fe25..f16f6a125ab40d96b1190f06ee1d4fe933a6638a 100644 (file)
--- a/udevcontrol.c
+++ b/udevcontrol.c
@@ -1,11 +1,8 @@
 /*
  * udevcontrol.c
  *
- * Userspace devfs
- *
  * Copyright (C) 2005 Kay Sievers <kay.sievers@vrfy.org>
  *
- *
  *     This program is free software; you can redistribute it and/or modify it
  *     under the terms of the GNU General Public License as published by the
  *     Free Software Foundation version 2 of the License.
@@ -65,6 +62,9 @@ int main(int argc, char *argv[], char *envp[])
        struct sockaddr_un saddr;
        socklen_t addrlen;
        const char *env;
+       const char *val;
+       int *intval;
+       int i;
        int retval = 1;
 
        env = getenv("UDEV_LOG");
@@ -74,33 +74,55 @@ int main(int argc, char *argv[], char *envp[])
        logging_init("udevcontrol");
        dbg("version %s", UDEV_VERSION);
 
-       if (argc != 2) {
-               info("usage: udevcontrol <cmd>");
+       if (argc < 2) {
+               fprintf(stderr, "missing command\n\n");
                goto exit;
        }
 
        memset(&usend_msg, 0x00, sizeof(struct udevd_msg));
        strcpy(usend_msg.magic, UDEV_MAGIC);
 
-       if (!strcmp(argv[1], "stop_exec_queue"))
-               usend_msg.type = UDEVD_STOP_EXEC_QUEUE;
-       else if (!strcmp(argv[1], "start_exec_queue"))
-               usend_msg.type = UDEVD_START_EXEC_QUEUE;
-       else if (!strncmp(argv[1], "log_priority=", strlen("log_priority="))) {
-               int *level = (int *) usend_msg.envbuf;
-               char *prio = &argv[1][strlen("log_priority=")];
-
-               usend_msg.type = UDEVD_SET_LOG_LEVEL;
-               *level = log_priority(prio);
-               dbg("send log_priority=%i", *level);
-       } else {
-               err("unknown command\n");
-               goto exit;
+       for (i = 1 ; i < argc; i++) {
+               char *arg = argv[i];
+
+               if (!strcmp(arg, "stop_exec_queue"))
+                       usend_msg.type = UDEVD_STOP_EXEC_QUEUE;
+               else if (!strcmp(arg, "start_exec_queue"))
+                       usend_msg.type = UDEVD_START_EXEC_QUEUE;
+               else if (!strncmp(arg, "log_priority=", strlen("log_priority="))) {
+                       intval = (int *) usend_msg.envbuf;
+                       val = &arg[strlen("log_priority=")];
+                       usend_msg.type = UDEVD_SET_LOG_LEVEL;
+                       *intval = log_priority(val);
+                       info("send log_priority=%i", *intval);
+               } else if (!strncmp(arg, "max_childs=", strlen("max_childs="))) {
+                       intval = (int *) usend_msg.envbuf;
+                       val = &arg[strlen("max_childs=")];
+                       usend_msg.type = UDEVD_SET_MAX_CHILDS;
+                       *intval = atoi(val);
+                       info("send max_childs=%i", *intval);
+               } else if (strcmp(arg, "help") == 0  || strcmp(arg, "--help") == 0  || strcmp(arg, "-h") == 0) {
+                       printf("Usage: udevcontrol COMMAND\n"
+                               "  log_priority=<level> set the udev log level for the daemon\n"
+                               "  stop_exec_queue      keep udevd from executing events, queue only\n"
+                               "  start_exec_queue     execute events, flush queue\n"
+                               "  max_childs=<N>       maximum number of childs running at the same time\n"
+                               "  --help               print this help text\n\n");
+                       exit(0);
+               } else {
+                       fprintf(stderr, "unknown option\n\n");
+                       exit(1);
+               }
+       }
+
+       if (getuid() != 0) {
+               fprintf(stderr, "need to be root, exit\n\n");
+               exit(1);
        }
 
        sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
        if (sock == -1) {
-               info("error getting socket");
+               err("error getting socket");
                goto exit;
        }
 
@@ -116,7 +138,7 @@ int main(int argc, char *argv[], char *envp[])
                info("error sending message (%s)", strerror(errno));
                retval = 1;
        } else {
-               dbg("sent message '%x' (%u bytes sent)", usend_msg.type, retval);
+               dbg("sent message type=0x%02x, %u bytes sent", usend_msg.type, retval);
                retval = 0;
        }