/*
- * Copyright (C) 2005-2006 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2005-2008 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * 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, either version 2 of the License, or
+ * (at your option) any later version.
*
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*/
-#include "config.h"
-
#include <time.h>
#include <errno.h>
#include <stdio.h>
#include <sys/un.h>
#include "udev.h"
-#include "udevd.h"
-
-static int udev_log = 0;
-
-struct udev_ctrl;
-extern struct udev_ctrl *udev_ctrl_new_from_socket(const char *socket_path);
-extern void udev_ctrl_unref(struct udev_ctrl *uctrl);
-extern int udev_ctrl_set_log_level(struct udev_ctrl *uctrl, int priority);
-extern int udev_ctrl_stop_exec_queue(struct udev_ctrl *uctrl);
-extern int udev_ctrl_start_exec_queue(struct udev_ctrl *uctrl);
-extern int udev_ctrl_reload_rules(struct udev_ctrl *uctrl);
-extern int udev_ctrl_set_env(struct udev_ctrl *uctrl, const char *key);
-extern int udev_ctrl_set_max_childs(struct udev_ctrl *uctrl, int count);
-extern int udev_ctrl_set_max_childs_running(struct udev_ctrl *uctrl, int count);
-
-struct udev_ctrl {
- int sock;
- struct sockaddr_un saddr;
- socklen_t addrlen;
-};
-
-struct udev_ctrl *udev_ctrl_new_from_socket(const char *socket_path)
-{
- struct udev_ctrl *uctrl;
-
- uctrl = malloc(sizeof(struct udev_ctrl));
- if (uctrl == NULL)
- return NULL;
- memset(uctrl, 0x00, sizeof(struct udev_ctrl));
-
- uctrl->sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
- if (uctrl->sock < 0) {
- err("error getting socket: %s\n", strerror(errno));
- free(uctrl);
- return NULL;
- }
-
- uctrl->saddr.sun_family = AF_LOCAL;
- strcpy(uctrl->saddr.sun_path, socket_path);
- uctrl->addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(uctrl->saddr.sun_path);
- /* translate leading '@' to abstract namespace */
- if (uctrl->saddr.sun_path[0] == '@')
- uctrl->saddr.sun_path[0] = '\0';
- return uctrl;
-}
-
-void udev_ctrl_unref(struct udev_ctrl *uctrl)
-{
- if (uctrl == NULL)
- return;
- close(uctrl->sock);
-}
-
-static int ctrl_send(struct udev_ctrl *uctrl, enum udevd_ctrl_msg_type type, int intval, const char *buf)
-{
- struct udevd_ctrl_msg ctrl_msg;
- int err;
-
- memset(&ctrl_msg, 0x00, sizeof(struct udevd_ctrl_msg));
- strcpy(ctrl_msg.magic, UDEVD_CTRL_MAGIC);
- ctrl_msg.type = type;
-
- if (buf != NULL)
- strlcpy(ctrl_msg.buf, buf, sizeof(ctrl_msg.buf));
- else
- ctrl_msg.intval = intval;
-
- err = sendto(uctrl->sock, &ctrl_msg, sizeof(ctrl_msg), 0, (struct sockaddr *)&uctrl->saddr, uctrl->addrlen);
- if (err == -1) {
- err("error sending message: %s\n", strerror(errno));
- }
- return err;
-}
-
-int udev_ctrl_set_log_level(struct udev_ctrl *uctrl, int priority)
-{
- ctrl_send(uctrl, UDEVD_CTRL_SET_LOG_LEVEL, priority, NULL);
- return 0;
-}
-
-int udev_ctrl_stop_exec_queue(struct udev_ctrl *uctrl)
-{
- ctrl_send(uctrl, UDEVD_CTRL_STOP_EXEC_QUEUE, 0, NULL);
- return 0;
-}
-
-int udev_ctrl_start_exec_queue(struct udev_ctrl *uctrl)
-{
- ctrl_send(uctrl, UDEVD_CTRL_START_EXEC_QUEUE, 0, NULL);
- return 0;
-}
-
-int udev_ctrl_reload_rules(struct udev_ctrl *uctrl)
-{
- ctrl_send(uctrl, UDEVD_CTRL_RELOAD_RULES, 0, NULL);
- return 0;
-}
-
-int udev_ctrl_set_env(struct udev_ctrl *uctrl, const char *key)
-{
- ctrl_send(uctrl, UDEVD_CTRL_ENV, 0, optarg);
- return 0;
-}
-int udev_ctrl_set_max_childs(struct udev_ctrl *uctrl, int count)
+static void print_help(void)
{
- ctrl_send(uctrl, UDEVD_CTRL_SET_MAX_CHILDS, count, NULL);
- return 0;
+ printf("Usage: udevadm control 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"
+ " --property=<KEY>=<value> set a global property for all events\n"
+ " --max-childs=<N> maximum number of childs\n"
+ " --help print this help text\n\n");
}
-int udev_ctrl_set_max_childs_running(struct udev_ctrl *uctrl, int count)
+int udevadm_control(struct udev *udev, int argc, char *argv[])
{
- ctrl_send(uctrl, UDEVD_CTRL_SET_MAX_CHILDS_RUNNING, count, NULL);
- return 0;
-}
-
-int udevcontrol(int argc, char *argv[])
-{
- struct udev_ctrl *uctrl;
- const char *env;
+ struct udev_ctrl *uctrl = NULL;
int rc = 1;
/* compat values with '_' will be removed in a future release */
static const struct option options[] = {
- { "log-priority", 1, NULL, 'l' },
- { "log_priority", 1, NULL, 'l' + 256 },
- { "stop-exec-queue", 0, NULL, 's' },
- { "stop_exec_queue", 0, NULL, 's' + 256 },
- { "start-exec-queue", 0, NULL, 'S' },
- { "start_exec_queue", 0, NULL, 'S' + 256},
- { "reload-rules", 0, NULL, 'R' },
- { "reload_rules", 0, NULL, 'R' + 256},
- { "env", 1, NULL, 'e' },
- { "max-childs", 1, NULL, 'm' },
- { "max_childs", 1, NULL, 'm' + 256},
- { "max-childs-running", 1, NULL, 'M' },
- { "max_childs_running", 1, NULL, 'M' + 256},
- { "help", 0, NULL, 'h' },
+ { "log-priority", required_argument, NULL, 'l' },
+ { "log_priority", required_argument, NULL, 'l' + 256 },
+ { "stop-exec-queue", no_argument, NULL, 's' },
+ { "stop_exec_queue", no_argument, NULL, 's' + 256 },
+ { "start-exec-queue", no_argument, NULL, 'S' },
+ { "start_exec_queue", no_argument, NULL, 'S' + 256},
+ { "reload-rules", no_argument, NULL, 'R' },
+ { "reload_rules", no_argument, NULL, 'R' + 256},
+ { "property", required_argument, NULL, 'p' },
+ { "env", required_argument, NULL, 'p' },
+ { "max-childs", required_argument, NULL, 'm' },
+ { "max_childs", required_argument, NULL, 'm' + 256},
+ { "help", no_argument, NULL, 'h' },
{}
};
- env = getenv("UDEV_LOG");
- if (env)
- udev_log = log_priority(env);
-
- logging_init("udevcontrol");
- dbg("version %s\n", VERSION);
-
if (getuid() != 0) {
fprintf(stderr, "root privileges required\n");
goto exit;
}
- uctrl = udev_ctrl_new_from_socket(UDEVD_CTRL_SOCK_PATH);
+ uctrl = udev_ctrl_new_from_socket(udev, UDEV_CTRL_SOCK_PATH);
if (uctrl == NULL)
goto exit;
int i;
char *endp;
- option = getopt_long(argc, argv, "l:sSRe:m:M:h", options, NULL);
+ option = getopt_long(argc, argv, "l:sSRp:m:M:h", options, NULL);
if (option == -1)
break;
if (option > 255) {
- info("udevadm control expects commands without underscore, "
- "this will stop working in a future release\n");
fprintf(stderr, "udevadm control expects commands without underscore, "
"this will stop working in a future release\n");
+ err(udev, "udevadm control expects commands without underscore, "
+ "this will stop working in a future release\n");
}
switch (option) {
case 'l':
case 'l' + 256:
- i = log_priority(optarg);
+ i = util_log_priority(optarg);
if (i < 0) {
fprintf(stderr, "invalid number '%s'\n", optarg);
goto exit;
}
- udev_ctrl_set_log_level(uctrl, log_priority(optarg));
+ udev_ctrl_send_set_log_level(uctrl, util_log_priority(optarg));
+ rc = 0;
break;
case 's':
case 's' + 256:
- udev_ctrl_stop_exec_queue(uctrl);
+ udev_ctrl_send_stop_exec_queue(uctrl);
+ rc = 0;
break;
case 'S':
case 'S' + 256:
- udev_ctrl_start_exec_queue(uctrl);
+ udev_ctrl_send_start_exec_queue(uctrl);
+ rc = 0;
break;
case 'R':
case 'R' + 256:
- udev_ctrl_reload_rules(uctrl);
+ udev_ctrl_send_reload_rules(uctrl);
+ rc = 0;
break;
- case 'e':
+ case 'p':
if (strchr(optarg, '=') == NULL) {
fprintf(stderr, "expect <KEY>=<valaue> instead of '%s'\n", optarg);
goto exit;
}
- udev_ctrl_set_env(uctrl, optarg);
+ udev_ctrl_send_set_env(uctrl, optarg);
+ rc = 0;
break;
case 'm':
case 'm' + 256:
fprintf(stderr, "invalid number '%s'\n", optarg);
goto exit;
}
- udev_ctrl_set_max_childs(uctrl, i);
- break;
- case 'M':
- case 'M' + 256:
- i = strtoul(optarg, &endp, 0);
- if (endp[0] != '\0' || i < 1) {
- fprintf(stderr, "invalid number '%s'\n", optarg);
- goto exit;
- }
- udev_ctrl_set_max_childs_running(uctrl, i);
- break;
+ udev_ctrl_send_set_max_childs(uctrl, i);
+ rc = 0;
break;
case 'h':
- printf("Usage: udevadm control 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"
- " --env=<KEY>=<value> set a global environment variable\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");
+ print_help();
+ rc = 0;
goto exit;
default:
goto exit;
fprintf(stderr, "udevadm control commands requires the --<command> format, "
"this will stop working in a future release\n");
- err("udevadm control commands requires the --<command> format, "
+ err(udev, "udevadm control commands requires the --<command> format, "
"this will stop working in a future release\n");
if (!strncmp(arg, "log_priority=", strlen("log_priority="))) {
- udev_ctrl_set_log_level(uctrl, log_priority(&arg[strlen("log_priority=")]));
+ udev_ctrl_send_set_log_level(uctrl, util_log_priority(&arg[strlen("log_priority=")]));
+ rc = 0;
+ goto exit;
} else if (!strcmp(arg, "stop_exec_queue")) {
- udev_ctrl_stop_exec_queue(uctrl);
+ udev_ctrl_send_stop_exec_queue(uctrl);
+ rc = 0;
+ goto exit;
} else if (!strcmp(arg, "start_exec_queue")) {
- udev_ctrl_start_exec_queue(uctrl);
+ udev_ctrl_send_start_exec_queue(uctrl);
+ rc = 0;
+ goto exit;
} else if (!strcmp(arg, "reload_rules")) {
- udev_ctrl_reload_rules(uctrl);
+ udev_ctrl_send_reload_rules(uctrl);
+ rc = 0;
+ goto exit;
} else if (!strncmp(arg, "max_childs=", strlen("max_childs="))) {
- udev_ctrl_set_max_childs(uctrl, strtoul(&arg[strlen("max_childs=")], NULL, 0));
- } else if (!strncmp(arg, "max_childs_running=", strlen("max_childs_running="))) {
- udev_ctrl_set_max_childs_running(uctrl, strtoul(&arg[strlen("max_childs_running=")], NULL, 0));
+ udev_ctrl_send_set_max_childs(uctrl, strtoul(&arg[strlen("max_childs=")], NULL, 0));
+ rc = 0;
+ goto exit;
} else if (!strncmp(arg, "env", strlen("env"))) {
- udev_ctrl_set_env(uctrl, &arg[strlen("env=")]);
- } else {
- fprintf(stderr, "unrecognized command '%s'\n", arg);
- err("unrecognized command '%s'\n", arg);
+ udev_ctrl_send_set_env(uctrl, &arg[strlen("env=")]);
+ rc = 0;
+ goto exit;
}
}
+
+ if (rc != 0) {
+ fprintf(stderr, "unrecognized command\n");
+ err(udev, "unrecognized command\n");
+ }
exit:
udev_ctrl_unref(uctrl);
- logging_close();
return rc;
}
~ianmdlvl / elogind.git / blobdiff