X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudevadm-control.c;h=6e10316fbe7cdae841b89a7f7b6998b6d94c8ff5;hb=7d563a17f3967890331daf08d43f2f005418139b;hp=68548fd1fa59d37d4b061bbc43361b0e106a9e91;hpb=32bf83996b1f7d7df83f99e6bf063685146ffe06;p=elogind.git

diff --git a/udev/udevadm-control.c b/udev/udevadm-control.c
index 68548fd1f..6e10316fb 100644
--- a/udev/udevadm-control.c
+++ b/udev/udevadm-control.c
@@ -34,124 +34,9 @@
 #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)
+int udevadm_control(struct udev *udev, int argc, char *argv[])
 {
 	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)
-{
-	ctrl_send(uctrl, UDEVD_CTRL_SET_MAX_CHILDS, count, NULL);
-	return 0;
-}
-
-int udev_ctrl_set_max_childs_running(struct udev_ctrl *uctrl, int count)
-{
-	ctrl_send(uctrl, UDEVD_CTRL_SET_MAX_CHILDS_RUNNING, count, NULL);
-	return 0;
-}
-
-int udevadm_control(int argc, char *argv[])
-{
-	struct udev_ctrl *uctrl;
-	const char *env;
 	int rc = 1;
 
 	/* compat values with '_' will be removed in a future release */
@@ -173,19 +58,12 @@ int udevadm_control(int argc, char *argv[])
 		{}
 	};
 
-	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, UDEVD_CTRL_SOCK_PATH);
 	if (uctrl == NULL)
 		goto exit;
 
@@ -199,7 +77,7 @@ int udevadm_control(int argc, char *argv[])
 			break;
 
 		if (option > 255) {
-			info("udevadm control expects commands without underscore, "
+			info(udev, "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");
@@ -252,7 +130,6 @@ int udevadm_control(int argc, char *argv[])
 			}
 			udev_ctrl_set_max_childs_running(uctrl, i);
 			break;
-			break;
 		case 'h':
 			printf("Usage: udevadm control COMMAND\n"
 				"  --log-priority=<level>   set the udev log level for the daemon\n"
@@ -275,7 +152,7 @@ int udevadm_control(int argc, char *argv[])
 
 		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="))) {
@@ -294,11 +171,10 @@ int udevadm_control(int argc, char *argv[])
 			udev_ctrl_set_env(uctrl, &arg[strlen("env=")]);
 		} else {
 			fprintf(stderr, "unrecognized command '%s'\n", arg);
-			err("unrecognized command '%s'\n", arg);
+			err(udev, "unrecognized command '%s'\n", arg);
 		}
 	}
 exit:
 	udev_ctrl_unref(uctrl);
-	logging_close();
 	return rc;
 }