X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=libudev%2Flibudev-device.c;h=d87b0c6c8ac92b87a9ef791dbc588d56577de8c1;hb=4281da1fa6fda10c15bee984825fc607a8385004;hp=7e6b7f1ce72c6a2bb4c4e58a538a2fba115c1b6e;hpb=f712894dd4c2a2d8e374de133b7ed854e203fa96;p=elogind.git

diff --git a/libudev/libudev-device.c b/libudev/libudev-device.c
index 7e6b7f1ce..d87b0c6c8 100644
--- a/libudev/libudev-device.c
+++ b/libudev/libudev-device.c
@@ -54,6 +54,7 @@ struct udev_device {
 	char *devpath_old;
 	char *sysname_old;
 	char *knodename;
+	char *id_filename;
 	char **envp;
 	char *monitor_buf;
 	size_t monitor_buf_len;
@@ -67,6 +68,7 @@ struct udev_device {
 	int devlink_priority;
 	int refcount;
 	dev_t devnum;
+	int ifindex;
 	int watch_handle;
 	int maj, min;
 	bool parent_set;
@@ -187,6 +189,8 @@ void udev_device_add_property_from_string_parse(struct udev_device *udev_device,
 		udev_device_set_seqnum(udev_device, strtoull(&property[7], NULL, 10));
 	} else if (strncmp(property, "TIMEOUT=", 8) == 0) {
 		udev_device_set_timeout(udev_device, strtoull(&property[8], NULL, 10));
+	} else if (strncmp(property, "IFINDEX=", 8) == 0) {
+		udev_device_set_ifindex(udev_device, strtoull(&property[8], NULL, 10));
 	} else {
 		udev_device_add_property_from_string(udev_device, property);
 	}
@@ -227,6 +231,7 @@ const char *udev_device_get_property_value(struct udev_device *udev_device, cons
 
 int udev_device_read_db(struct udev_device *udev_device)
 {
+	const char *id;
 	struct stat stats;
 	char filename[UTIL_PATH_SIZE];
 	char line[UTIL_LINE_SIZE];
@@ -235,8 +240,10 @@ int udev_device_read_db(struct udev_device *udev_device)
 	if (udev_device->db_loaded)
 		return 0;
 
-	util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev_device->udev), "/.udev/db/",
-		      udev_device_get_subsystem(udev_device), ":", udev_device_get_sysname(udev_device), NULL);
+	id = udev_device_get_id_filename(udev_device);
+	if (id == NULL)
+		return -1;
+	util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev_device->udev), "/.udev/db/", id, NULL);
 
 	if (lstat(filename, &stats) != 0) {
 		dbg(udev_device->udev, "no db file to read %s: %m\n", filename);
@@ -279,7 +286,7 @@ int udev_device_read_db(struct udev_device *udev_device)
 		return 0;
 	}
 
-	f = fopen(filename, "r");
+	f = fopen(filename, "re");
 	if (f == NULL) {
 		dbg(udev_device->udev, "error reading db file %s: %m\n", filename);
 		return -1;
@@ -339,7 +346,7 @@ int udev_device_read_uevent_file(struct udev_device *udev_device)
 		return 0;
 
 	util_strscpyl(filename, sizeof(filename), udev_device->syspath, "/uevent", NULL);
-	f = fopen(filename, "r");
+	f = fopen(filename, "re");
 	if (f == NULL)
 		return -1;
 	udev_device->uevent_loaded = true;
@@ -358,6 +365,8 @@ int udev_device_read_uevent_file(struct udev_device *udev_device)
 			maj = strtoull(&line[6], NULL, 10);
 		else if (strncmp(line, "MINOR=", 6) == 0)
 			min = strtoull(&line[6], NULL, 10);
+		else if (strncmp(line, "IFINDEX=", 8) == 0)
+			udev_device_set_ifindex(udev_device, strtoull(&line[8], NULL, 10));
 		else if (strncmp(line, "DEVNAME=", 8) == 0)
 			udev_device_set_knodename(udev_device, &line[8]);
 
@@ -794,6 +803,7 @@ void udev_device_unref(struct udev_device *udev_device)
 	free(udev_device->devpath_old);
 	free(udev_device->sysname_old);
 	free(udev_device->knodename);
+	free(udev_device->id_filename);
 	free(udev_device->envp);
 	free(udev_device->monitor_buf);
 	dbg(udev_device->udev, "udev_device: %p released\n", udev_device);
@@ -871,8 +881,19 @@ const char *udev_device_get_devnode(struct udev_device *udev_device)
 {
 	if (udev_device == NULL)
 		return NULL;
-	if (!udev_device->info_loaded)
+	if (!udev_device->info_loaded) {
+		udev_device_read_uevent_file(udev_device);
 		udev_device_read_db(udev_device);
+	}
+
+	/* we might get called before we handled an event and have a db, use the kernel-provided name */
+	if (udev_device->devnode == NULL && udev_device_get_knodename(udev_device) != NULL) {
+		if (asprintf(&udev_device->devnode, "%s/%s",
+			     udev_get_dev_path(udev_device->udev), udev_device_get_knodename(udev_device)) < 0)
+			return NULL;
+		return udev_device->devnode;
+	}
+
 	return udev_device->devnode;
 }
 
@@ -1164,7 +1185,7 @@ const char *udev_device_get_sysattr_value(struct udev_device *udev_device, const
 		goto out;
 
 	/* read attribute value */
-	fd = open(path, O_RDONLY);
+	fd = open(path, O_RDONLY|O_CLOEXEC);
 	if (fd < 0) {
 		dbg(udev_device->udev, "attribute '%s' can not be opened\n", path);
 		goto out;
@@ -1271,6 +1292,40 @@ int udev_device_add_devlink(struct udev_device *udev_device, const char *devlink
 	return 0;
 }
 
+const char *udev_device_get_id_filename(struct udev_device *udev_device)
+{
+	if (udev_device->id_filename == NULL) {
+		if (udev_device_get_subsystem(udev_device) == NULL)
+			return NULL;
+
+		if (major(udev_device_get_devnum(udev_device)) > 0) {
+			/* use dev_t -- b259:131072, c254:0 */
+			if (asprintf(&udev_device->id_filename, "%c%u:%u",
+				     strcmp(udev_device_get_subsystem(udev_device), "block") == 0 ? 'b' : 'c',
+				     major(udev_device_get_devnum(udev_device)),
+				     minor(udev_device_get_devnum(udev_device))) < 0)
+				udev_device->id_filename = NULL;
+		} else if (strcmp(udev_device_get_subsystem(udev_device), "net") == 0) {
+			/* use netdev ifindex -- n3 */
+			if (asprintf(&udev_device->id_filename, "n%u", udev_device_get_ifindex(udev_device)) < 0)
+				udev_device->id_filename = NULL;
+		} else {
+			/*
+			 * use $subsys:$syname -- pci:0000:00:1f.2
+			 * sysname() has '!' translated, get it from devpath
+			 */
+			const char *sysname;
+			sysname = strrchr(udev_device->devpath, '/');
+			if (sysname == NULL)
+				return NULL;
+			sysname = &sysname[1];
+			if (asprintf(&udev_device->id_filename, "+%s:%s", udev_device_get_subsystem(udev_device), sysname) < 0)
+				udev_device->id_filename = NULL;
+		}
+	}
+	return udev_device->id_filename;
+}
+
 int udev_device_add_tag(struct udev_device *udev_device, const char *tag)
 {
 	if (strchr(tag, ':') != NULL || strchr(tag, ' ') != NULL)
@@ -1484,7 +1539,11 @@ int udev_device_get_event_timeout(struct udev_device *udev_device)
 
 int udev_device_set_event_timeout(struct udev_device *udev_device, int event_timeout)
 {
+	char num[32];
+
 	udev_device->event_timeout = event_timeout;
+	snprintf(num, sizeof(num), "%u", event_timeout);
+	udev_device_add_property(udev_device, "TIMEOUT", num);
 	return 0;
 }
 
@@ -1536,3 +1595,18 @@ int udev_device_set_watch_handle(struct udev_device *udev_device, int handle)
 	udev_device->watch_handle = handle;
 	return 0;
 }
+
+int udev_device_get_ifindex(struct udev_device *udev_device)
+{
+	return udev_device->ifindex;
+}
+
+int udev_device_set_ifindex(struct udev_device *udev_device, int ifindex)
+{
+	char num[32];
+
+	udev_device->ifindex = ifindex;
+	snprintf(num, sizeof(num), "%u", ifindex);
+	udev_device_add_property(udev_device, "IFINDEX", num);
+	return 0;
+}