X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_utils.c;h=500d595c01884f2980d0fffa5175d59c1fb44740;hp=073cde1074f921ef920a44aeddb5aa5fb2189875;hb=c5e6eaa002d457af9b5530a29edd514d5826f094;hpb=aaff09a30ab849186c0d4ad8bde83876d7a1a63d

diff --git a/udev_utils.c b/udev_utils.c
index 073cde107..500d595c0 100644
--- a/udev_utils.c
+++ b/udev_utils.c
@@ -1,7 +1,7 @@
 /*
- * udev_lib - generic stuff used by udev
+ * udev_utils.c - generic stuff used by udev
  *
- * Copyright (C) 2004 Kay Sievers <kay@vrfy.org>
+ * Copyright (C) 2004-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
@@ -28,6 +28,8 @@
 #include <ctype.h>
 #include <dirent.h>
 #include <syslog.h>
+#include <sys/socket.h>
+#include <sys/un.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
@@ -39,84 +41,57 @@
 #include "udev_utils.h"
 #include "list.h"
 
-
-int udev_init_device(struct udevice *udev, const char* devpath, const char *subsystem, const char *action)
+/* compare string with pattern (supports * ? [0-9] [!A-Z]) */
+int strcmp_pattern(const char *p, const char *s)
 {
-	char *pos;
-
-	memset(udev, 0x00, sizeof(struct udevice));
-	INIT_LIST_HEAD(&udev->symlink_list);
-	INIT_LIST_HEAD(&udev->run_list);
-	INIT_LIST_HEAD(&udev->env_list);
-
-	if (subsystem)
-		strlcpy(udev->subsystem, subsystem, sizeof(udev->subsystem));
-
-	if (action)
-		strlcpy(udev->action, action, sizeof(udev->action));
-
-	if (devpath) {
-		strlcpy(udev->devpath, devpath, sizeof(udev->devpath));
-		remove_trailing_char(udev->devpath, '/');
-
-		if (strncmp(udev->devpath, "/block/", 7) == 0)
-			udev->type = DEV_BLOCK;
-		else if (strncmp(udev->devpath, "/class/net/", 11) == 0)
-			udev->type = DEV_NET;
-		else if (strncmp(udev->devpath, "/class/", 7) == 0)
-			udev->type = DEV_CLASS;
-		else if (strncmp(udev->devpath, "/devices/", 9) == 0)
-			udev->type = DEV_DEVICE;
-
-		/* get kernel name */
-		pos = strrchr(udev->devpath, '/');
-		if (pos) {
-			strlcpy(udev->kernel_name, &pos[1], sizeof(udev->kernel_name));
-			dbg("kernel_name='%s'", udev->kernel_name);
-
-			/* Some block devices have '!' in their name, change that to '/' */
-			pos = udev->kernel_name;
-			while (pos[0] != '\0') {
-				if (pos[0] == '!')
-					pos[0] = '/';
-				pos++;
+	if (s[0] == '\0') {
+		while (p[0] == '*')
+			p++;
+		return (p[0] != '\0');
+	}
+	switch (p[0]) {
+	case '[':
+		{
+			int not = 0;
+			p++;
+			if (p[0] == '!') {
+				not = 1;
+				p++;
+			}
+			while ((p[0] != '\0') && (p[0] != ']')) {
+				int match = 0;
+				if (p[1] == '-') {
+					if ((s[0] >= p[0]) && (s[0] <= p[2]))
+						match = 1;
+					p += 3;
+				} else {
+					match = (p[0] == s[0]);
+					p++;
+				}
+				if (match ^ not) {
+					while ((p[0] != '\0') && (p[0] != ']'))
+						p++;
+					if (p[0] == ']')
+						return strcmp_pattern(p+1, s+1);
+				}
 			}
-
-			/* get kernel number */
-			pos = &udev->kernel_name[strlen(udev->kernel_name)];
-			while (isdigit(pos[-1]))
-				pos--;
-			strlcpy(udev->kernel_number, pos, sizeof(udev->kernel_number));
-			dbg("kernel_number='%s'", udev->kernel_number);
 		}
+		break;
+	case '*':
+		if (strcmp_pattern(p, s+1))
+			return strcmp_pattern(p+1, s);
+		return 0;
+	case '\0':
+		if (s[0] == '\0') {
+			return 0;
+		}
+		break;
+	default:
+		if ((p[0] == s[0]) || (p[0] == '?'))
+			return strcmp_pattern(p+1, s+1);
+		break;
 	}
-
-	if (udev->type == DEV_BLOCK || udev->type == DEV_CLASS) {
-		udev->mode = 0660;
-		strcpy(udev->owner, "root");
-		strcpy(udev->group, "root");
-	}
-
-	return 0;
-}
-
-void udev_cleanup_device(struct udevice *udev)
-{
-	struct name_entry *name_loop;
-	struct name_entry *temp_loop;
-
-	list_for_each_entry_safe(name_loop, temp_loop, &udev->symlink_list, node) {
-		list_del(&name_loop->node);
-		free(name_loop);
-	}
-	list_for_each_entry_safe(name_loop, temp_loop, &udev->run_list, node) {
-		list_del(&name_loop->node);
-		free(name_loop);
-	}
-	list_for_each_entry_safe(name_loop, temp_loop, &udev->env_list, node) {
-		list_del(&name_loop->node);
-		free(name_loop);
-	}
+	return 1;
 }
 
 int string_is_true(const char *str)
@@ -399,6 +374,39 @@ int add_matching_files(struct list_head *name_list, const char *dirname, const c
 	return 0;
 }
 
+int pass_env_to_socket(const char *sockname, const char *devpath, const char *action)
+{
+	int sock;
+	struct sockaddr_un saddr;
+	socklen_t addrlen;
+	char buf[2048];
+	size_t bufpos = 0;
+	int i;
+	int retval;
+
+	dbg("pass environment to socket '%s'", sockname);
+	sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
+	memset(&saddr, 0x00, sizeof(struct sockaddr_un));
+	saddr.sun_family = AF_LOCAL;
+	/* only abstract namespace is supported */
+	strcpy(&saddr.sun_path[1], sockname);
+	addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1;
+
+	bufpos = snprintf(buf, sizeof(buf)-1, "%s@%s", action, devpath);
+	bufpos++;
+	for (i = 0; environ[i] != NULL && bufpos < sizeof(buf); i++) {
+		bufpos += strlcpy(&buf[bufpos], environ[i], sizeof(buf) - bufpos-1);
+		bufpos++;
+	}
+
+	retval = sendto(sock, &buf, bufpos, 0, (struct sockaddr *)&saddr, addrlen);
+	if (retval != -1)
+		retval = 0;
+
+	close(sock);
+	return retval;
+}
+
 int execute_program(const char *command, const char *subsystem,
 		    char *result, size_t ressize, size_t *reslen)
 {