X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevtrigger.c;h=e50fd4ee04e9ea4915ed9d9b0d31d605fa3941cd;hp=cebc518c432c73bb601f5a2a01fb6d2ebcf2108a;hb=798d7ab60c476a2c7bcef6918a40dce1756204d1;hpb=52434fb98b2e8920e8e254d87ecfff2789ebd6b7

diff --git a/udevtrigger.c b/udevtrigger.c
index cebc518c4..e50fd4ee0 100644
--- a/udevtrigger.c
+++ b/udevtrigger.c
@@ -133,6 +133,9 @@ static int pass_to_socket(const char *devpath, const char *action)
 	int len;
 	int err = 0;
 
+	if (verbose)
+		printf("%s\n", devpath);
+
 	udev_device_init(&udev);
 	udev_db_get_device(&udev, devpath);
 
@@ -628,12 +631,24 @@ int udevtrigger(int argc, char *argv[], char *envp[])
 	}
 
 	if (sockpath != NULL) {
+		struct stat stats;
+
 		sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
 		memset(&saddr, 0x00, sizeof(struct sockaddr_un));
 		saddr.sun_family = AF_LOCAL;
-		/* abstract namespace only */
-		strlcpy(&saddr.sun_path[1], sockpath, sizeof(saddr.sun_path)-1);
-		saddrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1;
+		if (sockpath[0] == '@') {
+			/* abstract namespace socket requested */
+			strlcpy(&saddr.sun_path[1], &sockpath[1], sizeof(saddr.sun_path)-1);
+			saddrlen = offsetof(struct sockaddr_un, sun_path) + 1 + strlen(&saddr.sun_path[1]);
+		} else if (stat(sockpath, &stats) == 0 && S_ISSOCK(stats.st_mode)) {
+			/* existing socket file */
+			strlcpy(saddr.sun_path, sockpath, sizeof(saddr.sun_path));
+			saddrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path);
+		} else {
+			/* no socket file, assume abstract namespace socket */
+			strlcpy(&saddr.sun_path[1], sockpath, sizeof(saddr.sun_path)-1);
+			saddrlen = offsetof(struct sockaddr_un, sun_path) + 1 + strlen(&saddr.sun_path[1]);
+		}
 	}
 
 	if (failed) {