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

diff --git a/udev/udevadm-control.c b/udev/udevadm-control.c
index 68548fd1f..de4b658d5 100644
--- a/udev/udevadm-control.c
+++ b/udev/udevadm-control.c
@@ -36,118 +36,6 @@
 
 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)
-{
-	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;