vol_id: document -L

[elogind.git] / udevcontrol.c

diff --git a/udevcontrol.c b/udevcontrol.c
index 3044d02f0b6a02e832277798c63305677e0a9427..a983f22835ffaf7d2d7738b9326e7d11876c47f9 100644 (file)
--- a/udevcontrol.c
+++ b/udevcontrol.c
@@ -1,7 +1,5 @@
 /*
- * udevcontrol.c
- *
- * Copyright (C) 2005 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2005-2006 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
@@ -14,7 +12,7 @@
  * 
  *     You should have received a copy of the GNU General Public License along
  *     with this program; if not, write to the Free Software Foundation, Inc.,
- *     675 Mass Ave, Cambridge, MA 02139, USA.
+ *     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
@@ -50,17 +48,6 @@ void log_message (int priority, const char *format, ...)
 }
 #endif
 
-static void usage(void)
-{
-       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"
-               "  reload_rules         reloads the rules files\n"
-               "  max_childs=<N>       maximum number of childs running at the same time\n"
-               "  --help               print this help text\n\n");
-}
-
 int main(int argc, char *argv[], char *envp[])
 {
        static struct udevd_ctrl_msg ctrl_msg;
@@ -81,7 +68,6 @@ int main(int argc, char *argv[], char *envp[])
 
        if (argc < 2) {
                fprintf(stderr, "missing command\n\n");
-               usage();
                goto exit;
        }
 
@@ -104,23 +90,51 @@ int main(int argc, char *argv[], char *envp[])
                        *intval = log_priority(val);
                        info("send log_priority=%i", *intval);
                } else if (!strncmp(arg, "max_childs=", strlen("max_childs="))) {
+                       char *endp;
+                       int count;
+
                        intval = (int *) ctrl_msg.buf;
                        val = &arg[strlen("max_childs=")];
                        ctrl_msg.type = UDEVD_CTRL_SET_MAX_CHILDS;
-                       *intval = atoi(val);
+                       count = strtoul(val, &endp, 0);
+                       if (endp[0] != '\0' || count < 1) {
+                               fprintf(stderr, "invalid number\n");
+                               goto exit;
+                       }
+                       *intval = count;
                        info("send max_childs=%i", *intval);
+               } else if (!strncmp(arg, "max_childs_running=", strlen("max_childs_running="))) {
+                       char *endp;
+                       int count;
+
+                       intval = (int *) ctrl_msg.buf;
+                       val = &arg[strlen("max_childs_running=")];
+                       ctrl_msg.type = UDEVD_CTRL_SET_MAX_CHILDS_RUNNING;
+                       count = strtoul(val, &endp, 0);
+                       if (endp[0] != '\0' || count < 1) {
+                               fprintf(stderr, "invalid number\n");
+                               goto exit;
+                       }
+                       *intval = count;
+                       info("send max_childs_running=%i", *intval);
                } else if (strcmp(arg, "help") == 0  || strcmp(arg, "--help") == 0  || strcmp(arg, "-h") == 0) {
-                       usage();
+                       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"
+                               "  reload_rules           reloads the rules files\n"
+                               "  max_childs=<N>         maximum number of childs\n"
+                               "  max_childs_running=<N> maximum number of childs running at the same time\n"
+                               "  --help                 print this help text\n\n");
                        goto exit;
                } else {
-                       fprintf(stderr, "unknown option\n\n");
-                       usage();
+                       fprintf(stderr, "unrecognized command '%s'\n", arg);
                        goto exit;
                }
        }
 
        if (getuid() != 0) {
-               fprintf(stderr, "need to be root, exit\n\n");
+               fprintf(stderr, "root privileges required\n");
                goto exit;
        }