X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev_db.c;h=e03c2782a30bf3fd517b8baa7c32f48b09d3c3f8;hb=9a997ecf4ed97becb9c546c5fad8490bcba44181;hp=8596470d4962c8694fd524d430edbcd22c02734c;hpb=55e9959b155cefc5146f7a3d1ea73e74da91f303;p=elogind.git

diff --git a/udev/udev_db.c b/udev/udev_db.c
index 8596470d4..e03c2782a 100644
--- a/udev/udev_db.c
+++ b/udev/udev_db.c
@@ -35,30 +35,30 @@ static size_t devpath_to_db_path(struct udev *udev, const char *devpath, char *f
 	size_t start;
 
 	/* translate to location of db file */
-	strlcpy(filename, udev_get_dev_path(udev), len);
-	start = strlcat(filename, "/.udev/db/", len);
-	strlcat(filename, devpath, len);
-	return path_encode(&filename[start], len - start);
+	util_strlcpy(filename, udev_get_dev_path(udev), len);
+	start = util_strlcat(filename, "/.udev/db/", len);
+	util_strlcat(filename, devpath, len);
+	return util_path_encode(&filename[start], len - start);
 }
 
 /* reverse mapping from the device file name to the devpath */
 static int name_index(struct udev *udev, const char *devpath, const char *name, int add)
 {
-	char device[PATH_SIZE];
-	char filename[PATH_SIZE * 2];
+	char device[UTIL_PATH_SIZE];
+	char filename[UTIL_PATH_SIZE * 2];
 	size_t start;
 	int fd;
 
 	/* directory with device name */
-	strlcpy(filename, udev_get_dev_path(udev), sizeof(filename));
-	start = strlcat(filename, "/.udev/names/", sizeof(filename));
-	strlcat(filename, name, sizeof(filename));
-	path_encode(&filename[start], sizeof(filename) - start);
+	util_strlcpy(filename, udev_get_dev_path(udev), sizeof(filename));
+	start = util_strlcat(filename, "/.udev/names/", sizeof(filename));
+	util_strlcat(filename, name, sizeof(filename));
+	util_path_encode(&filename[start], sizeof(filename) - start);
 	/* entry with the devpath */
-	strlcpy(device, devpath, sizeof(device));
-	path_encode(device, sizeof(device));
-	strlcat(filename, "/", sizeof(filename));
-	strlcat(filename, device, sizeof(filename));
+	util_strlcpy(device, devpath, sizeof(device));
+	util_path_encode(device, sizeof(device));
+	util_strlcat(filename, "/", sizeof(filename));
+	util_strlcat(filename, device, sizeof(filename));
 
 	if (add) {
 		info(udev, "creating index: '%s'\n", filename);
@@ -81,14 +81,14 @@ int udev_db_get_devices_by_name(struct udev *udev, const char *name, struct list
 	DIR *dir;
 	int rc = 0;
 
-	strlcpy(dirname, udev_get_dev_path(udev), sizeof(dirname));
-	start = strlcat(dirname, "/.udev/names/", sizeof(dirname));
-	strlcat(dirname, name, sizeof(dirname));
-	path_encode(&dirname[start], sizeof(dirname) - start);
+	util_strlcpy(dirname, udev_get_dev_path(udev), sizeof(dirname));
+	start = util_strlcat(dirname, "/.udev/names/", sizeof(dirname));
+	util_strlcat(dirname, name, sizeof(dirname));
+	util_path_encode(&dirname[start], sizeof(dirname) - start);
 
 	dir = opendir(dirname);
 	if (dir == NULL) {
-		info(udev, "no index directory '%s': %s\n", dirname, strerror(errno));
+		info(udev, "no index directory '%s': %m\n", dirname);
 		rc = -1;
 		goto out;
 	}
@@ -96,7 +96,7 @@ int udev_db_get_devices_by_name(struct udev *udev, const char *name, struct list
 	info(udev, "found index directory '%s'\n", dirname);
 	while (1) {
 		struct dirent *ent;
-		char device[PATH_SIZE];
+		char device[UTIL_PATH_SIZE];
 
 		ent = readdir(dir);
 		if (ent == NULL || ent->d_name[0] == '\0')
@@ -104,8 +104,8 @@ int udev_db_get_devices_by_name(struct udev *udev, const char *name, struct list
 		if (ent->d_name[0] == '.')
 			continue;
 
-		strlcpy(device, ent->d_name, sizeof(device));
-		path_decode(device);
+		util_strlcpy(device, ent->d_name, sizeof(device));
+		util_path_decode(device);
 		name_list_add(udev, name_list, device, 0);
 		rc++;
 	}
@@ -116,8 +116,8 @@ out:
 
 int udev_db_rename(struct udev *udev, const char *devpath_old, const char *devpath)
 {
-	char filename[PATH_SIZE];
-	char filename_old[PATH_SIZE];
+	char filename[UTIL_PATH_SIZE];
+	char filename_old[UTIL_PATH_SIZE];
 
 	devpath_to_db_path(udev, devpath_old, filename_old, sizeof(filename_old));
 	devpath_to_db_path(udev, devpath, filename, sizeof(filename));
@@ -126,7 +126,11 @@ int udev_db_rename(struct udev *udev, const char *devpath_old, const char *devpa
 
 int udev_db_add_device(struct udevice *udevice)
 {
-	char filename[PATH_SIZE];
+	char filename[UTIL_PATH_SIZE];
+	FILE *f;
+	struct name_entry *name_loop;
+	char target[232]; /* on 64bit, tmpfs inlines up to 239 bytes */
+	int ret;
 
 	if (udevice->test_run)
 		return 0;
@@ -135,63 +139,69 @@ int udev_db_add_device(struct udevice *udevice)
 	create_path(udevice->udev, filename);
 	unlink(filename);
 
-	/*
-	 * don't waste tmpfs memory pages, if we don't have any data to store
-	 * create fake db-file; store the node-name in a symlink target
-	 */
-	if (list_empty(&udevice->symlink_list) && list_empty(&udevice->env_list) &&
-	    !udevice->partitions && !udevice->ignore_remove) {
-		int ret;
-		dbg(udevice->udev, "nothing interesting to store, create symlink\n");
-		udev_selinux_setfscreatecon(udevice->udev, filename, S_IFLNK);
-		ret = symlink(udevice->name, filename);
-		udev_selinux_resetfscreatecon(udevice->udev);
-		if (ret != 0) {
-			err(udevice->udev, "unable to create db link '%s': %s\n", filename, strerror(errno));
-			return -1;
+	if (!list_empty(&udevice->env_list))
+		goto file;
+	if (udevice->partitions || udevice->ignore_remove)
+		goto file;
+	/* try not to waste tmpfs memory, store values, if they fit, in a symlink target */
+	util_strlcpy(target, udevice->name, sizeof(target));
+	list_for_each_entry(name_loop, &udevice->symlink_list, node) {
+		size_t len;
+
+		util_strlcat(target, " ", sizeof(target));
+		len = util_strlcat(target, name_loop->name, sizeof(target));
+		if (len >= sizeof(target)) {
+			info(udevice->udev, "size of links too large, create file\n");
+			goto file;
 		}
-	} else {
-		FILE *f;
-		struct name_entry *name_loop;
-
-		f = fopen(filename, "w");
-		if (f == NULL) {
-			err(udevice->udev, "unable to create db file '%s': %s\n", filename, strerror(errno));
-			return -1;
+	}
+	/* add symlink names to index */
+	list_for_each_entry(name_loop, &udevice->symlink_list, node) {
+		name_index(udevice->udev, udevice->dev->devpath, name_loop->name, 1);
+	}
+	info(udevice->udev, "create db link (%s)\n", target);
+	udev_selinux_setfscreatecon(udevice->udev, filename, S_IFLNK);
+	ret = symlink(target, filename);
+	udev_selinux_resetfscreatecon(udevice->udev);
+	if (ret == 0)
+		goto out;
+file:
+	f = fopen(filename, "w");
+	if (f == NULL) {
+		err(udevice->udev, "unable to create db file '%s': %m\n", filename);
+		return -1;
 		}
-		dbg(udevice->udev, "storing data for device '%s' in '%s'\n", udevice->dev->devpath, filename);
+	info(udevice->udev, "created db file for '%s' in '%s'\n", udevice->dev->devpath, filename);
 
-		fprintf(f, "N:%s\n", udevice->name);
-		list_for_each_entry(name_loop, &udevice->symlink_list, node) {
-			fprintf(f, "S:%s\n", name_loop->name);
-			/* add symlink-name to index */
-			name_index(udevice->udev, udevice->dev->devpath, name_loop->name, 1);
-		}
-		fprintf(f, "M:%u:%u\n", major(udevice->devt), minor(udevice->devt));
-		if (udevice->link_priority != 0)
-			fprintf(f, "L:%u\n", udevice->link_priority);
-		if (udevice->event_timeout >= 0)
-			fprintf(f, "T:%u\n", udevice->event_timeout);
-		if (udevice->partitions != 0)
-			fprintf(f, "A:%u\n", udevice->partitions);
-		if (udevice->ignore_remove)
-			fprintf(f, "R:%u\n", udevice->ignore_remove);
-		list_for_each_entry(name_loop, &udevice->env_list, node)
-			fprintf(f, "E:%s\n", name_loop->name);
-		fclose(f);
+	fprintf(f, "N:%s\n", udevice->name);
+	list_for_each_entry(name_loop, &udevice->symlink_list, node) {
+		fprintf(f, "S:%s\n", name_loop->name);
+		/* add symlink names to index */
+		name_index(udevice->udev, udevice->dev->devpath, name_loop->name, 1);
 	}
-
+	fprintf(f, "M:%u:%u\n", major(udevice->devt), minor(udevice->devt));
+	if (udevice->link_priority != 0)
+		fprintf(f, "L:%u\n", udevice->link_priority);
+	if (udevice->event_timeout >= 0)
+		fprintf(f, "T:%u\n", udevice->event_timeout);
+	if (udevice->partitions != 0)
+		fprintf(f, "A:%u\n", udevice->partitions);
+	if (udevice->ignore_remove)
+		fprintf(f, "R:%u\n", udevice->ignore_remove);
+	list_for_each_entry(name_loop, &udevice->env_list, node)
+		fprintf(f, "E:%s\n", name_loop->name);
+	fclose(f);
+out:
 	/* add name to index */
 	name_index(udevice->udev, udevice->dev->devpath, udevice->name, 1);
-
 	return 0;
 }
 
 int udev_db_get_device(struct udevice *udevice, const char *devpath)
 {
 	struct stat stats;
-	char filename[PATH_SIZE];
-	char line[PATH_SIZE];
+	char filename[UTIL_PATH_SIZE];
+	char line[UTIL_PATH_SIZE];
 	unsigned int maj, min;
 	char *bufline;
 	char *buf;
@@ -203,28 +213,46 @@ int udev_db_get_device(struct udevice *udevice, const char *devpath)
 	devpath_to_db_path(udevice->udev, devpath, filename, sizeof(filename));
 
 	if (lstat(filename, &stats) != 0) {
-		info(udevice->udev, "no db file to read %s: %s\n", filename, strerror(errno));
+		info(udevice->udev, "no db file to read %s: %m\n", filename);
 		return -1;
 	}
 	if ((stats.st_mode & S_IFMT) == S_IFLNK) {
-		char target[NAME_SIZE];
+		char target[UTIL_NAME_SIZE];
 		int target_len;
+		char *next;
 
-		info(udevice->udev, "found a symlink as db file\n");
+		info(udevice->udev, "found db symlink\n");
 		target_len = readlink(filename, target, sizeof(target));
 		if (target_len > 0)
 			target[target_len] = '\0';
 		else {
-			info(udevice->udev, "error reading db link %s: %s\n", filename, strerror(errno));
+			info(udevice->udev, "error reading db link %s: %m\n", filename);
 			return -1;
 		}
-		dbg(udevice->udev, "db link points to '%s'\n", target);
-		strlcpy(udevice->name, target, sizeof(udevice->name));
+		next = strchr(target, ' ');
+		if (next != NULL) {
+			next[0] = '\0';
+			next = &next[1];
+		}
+		info(udevice->udev, "got db link node: '%s'\n", target);
+		util_strlcpy(udevice->name, target, sizeof(udevice->name));
+		while (next != NULL) {
+			char *lnk;
+
+			lnk = next;
+			next = strchr(next, ' ');
+			if (next != NULL) {
+				next[0] = '\0';
+				next = &next[1];
+			}
+			info(udevice->udev, "got db link link: '%s'\n", lnk);
+			name_list_add(udevice->udev, &udevice->symlink_list, lnk, 0);
+		}
 		return 0;
 	}
 
 	if (file_map(filename, &buf, &bufsize) != 0) {
-		info(udevice->udev, "error reading db file %s: %s\n", filename, strerror(errno));
+		info(udevice->udev, "error reading db file %s: %m\n", filename);
 		return -1;
 	}
 
@@ -241,7 +269,7 @@ int udev_db_get_device(struct udevice *udevice, const char *devpath)
 
 		switch(bufline[0]) {
 		case 'N':
-			strlcpy(udevice->name, line, sizeof(udevice->name));
+			util_strlcpy(udevice->name, line, sizeof(udevice->name));
 			break;
 		case 'M':
 			sscanf(line, "%u:%u", &maj, &min);
@@ -277,7 +305,7 @@ int udev_db_get_device(struct udevice *udevice, const char *devpath)
 
 int udev_db_delete_device(struct udevice *udevice)
 {
-	char filename[PATH_SIZE];
+	char filename[UTIL_PATH_SIZE];
 	struct name_entry *name_loop;
 
 	if (udevice->test_run)
@@ -292,36 +320,3 @@ int udev_db_delete_device(struct udevice *udevice)
 
 	return 0;
 }
-
-int udev_db_get_all_entries(struct udev *udev, struct list_head *name_list)
-{
-	char dbpath[PATH_MAX];
-	DIR *dir;
-
-	strlcpy(dbpath, udev_get_dev_path(udev), sizeof(dbpath));
-	strlcat(dbpath, "/.udev/db", sizeof(dbpath));
-	dir = opendir(dbpath);
-	if (dir == NULL) {
-		info(udev, "no udev_db available '%s': %s\n", dbpath, strerror(errno));
-		return -1;
-	}
-
-	while (1) {
-		struct dirent *ent;
-		char device[PATH_SIZE];
-
-		ent = readdir(dir);
-		if (ent == NULL || ent->d_name[0] == '\0')
-			break;
-		if (ent->d_name[0] == '.')
-			continue;
-
-		strlcpy(device, ent->d_name, sizeof(device));
-		path_decode(device);
-		name_list_add(udev, name_list, device, 1);
-		dbg(udev, "added '%s'\n", device);
-	}
-
-	closedir(dir);
-	return 0;
-}