X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=libudev%2Flibudev-device-private.c;h=07249c3885fe973bb0ef9cba922534e69ae66d31;hb=3c4b1738a9d591d7ddce361ea184b76b253c4e87;hp=68dc0a5b986c2a45a6c8a829aa9ddfbfed110925;hpb=98631e1c21090db8fe8800f2a6658592406670ac;p=elogind.git

diff --git a/libudev/libudev-device-private.c b/libudev/libudev-device-private.c
index 68dc0a5b9..07249c388 100644
--- a/libudev/libudev-device-private.c
+++ b/libudev/libudev-device-private.c
@@ -21,20 +21,11 @@
 #include "libudev.h"
 #include "libudev-private.h"
 
-static size_t devpath_to_db_path(struct udev *udev, const char *devpath, char *filename, size_t len)
-{
-	char *s;
-	size_t l;
-
-	s = filename;
-	l = util_strpcpyl(&s, len, udev_get_dev_path(udev), "/.udev/db/", NULL);
-	return util_path_encode(devpath, s, l);
-}
-
 int udev_device_update_db(struct udev_device *udev_device)
 {
 	struct udev *udev = udev_device_get_udev(udev_device);
 	char filename[UTIL_PATH_SIZE];
+	char filename_tmp[UTIL_PATH_SIZE];
 	FILE *f;
 	char target[232]; /* on 64bit, tmpfs inlines up to 239 bytes */
 	size_t devlen = strlen(udev_get_dev_path(udev))+1;
@@ -43,9 +34,9 @@ int udev_device_update_db(struct udev_device *udev_device)
 	struct udev_list_entry *list_entry;
 	int ret;
 
-	devpath_to_db_path(udev, udev_device_get_devpath(udev_device), filename, sizeof(filename));
-	util_create_path(udev, filename);
-	unlink(filename);
+	util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/.udev/db/",
+		      udev_device_get_subsystem(udev_device), ":", udev_device_get_sysname(udev_device), NULL);
+	util_strscpyl(filename_tmp, sizeof(filename_tmp), filename, ".tmp", NULL);
 
 	udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(udev_device))
 		if (udev_list_entry_get_flag(list_entry))
@@ -76,19 +67,24 @@ int udev_device_update_db(struct udev_device *udev_device)
 			goto file;
 		}
 	}
-	info(udev, "create db link (%s)\n", target);
-	udev_selinux_setfscreatecon(udev, filename, S_IFLNK);
-	ret = symlink(target, filename);
+	udev_selinux_setfscreatecon(udev, filename_tmp, S_IFLNK);
+	util_create_path(udev, filename_tmp);
+	ret = symlink(target, filename_tmp);
 	udev_selinux_resetfscreatecon(udev);
-	if (ret == 0)
-		goto out;
+	if (ret != 0)
+		goto file;
+	ret = rename(filename_tmp, filename);
+	if (ret != 0)
+		goto file;
+	info(udev, "created db link (%s)\n", target);
+	goto out;
 file:
-	f = fopen(filename, "w");
+	util_create_path(udev, filename_tmp);
+	f = fopen(filename_tmp, "w");
 	if (f == NULL) {
-		err(udev, "unable to create db file '%s': %m\n", filename);
+		err(udev, "unable to create temporary db file '%s': %m\n", filename_tmp);
 		return -1;
 		}
-	info(udev, "created db file for '%s' in '%s'\n", udev_device_get_devpath(udev_device), filename);
 
 	if (udev_device_get_devnode(udev_device) != NULL) {
 		fprintf(f, "N:%s\n", &udev_device_get_devnode(udev_device)[devlen]);
@@ -96,15 +92,15 @@ file:
 			fprintf(f, "S:%s\n", &udev_list_entry_get_name(list_entry)[devlen]);
 	}
 	if (udev_device_get_devlink_priority(udev_device) != 0)
-		fprintf(f, "L:%u\n", udev_device_get_devlink_priority(udev_device));
+		fprintf(f, "L:%i\n", udev_device_get_devlink_priority(udev_device));
 	if (udev_device_get_event_timeout(udev_device) >= 0)
-		fprintf(f, "T:%u\n", udev_device_get_event_timeout(udev_device));
+		fprintf(f, "T:%i\n", udev_device_get_event_timeout(udev_device));
 	if (udev_device_get_num_fake_partitions(udev_device) != 0)
-		fprintf(f, "A:%u\n", udev_device_get_num_fake_partitions(udev_device));
+		fprintf(f, "A:%i\n", udev_device_get_num_fake_partitions(udev_device));
 	if (udev_device_get_ignore_remove(udev_device))
-		fprintf(f, "R:%u\n", udev_device_get_ignore_remove(udev_device));
+		fprintf(f, "R:%i\n", udev_device_get_ignore_remove(udev_device));
 	if (udev_device_get_watch_handle(udev_device) >= 0)
-		fprintf(f, "W:%u\n", udev_device_get_watch_handle(udev_device));
+		fprintf(f, "W:%i\n", udev_device_get_watch_handle(udev_device));
 	udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(udev_device)) {
 		if (!udev_list_entry_get_flag(list_entry))
 			continue;
@@ -113,6 +109,8 @@ file:
 			udev_list_entry_get_value(list_entry));
 	}
 	fclose(f);
+	rename(filename_tmp, filename);
+	info(udev, "created db file for '%s' in '%s'\n", udev_device_get_devpath(udev_device), filename);
 out:
 	return 0;
 }
@@ -122,18 +120,21 @@ int udev_device_delete_db(struct udev_device *udev_device)
 	struct udev *udev = udev_device_get_udev(udev_device);
 	char filename[UTIL_PATH_SIZE];
 
-	devpath_to_db_path(udev, udev_device_get_devpath(udev_device), filename, sizeof(filename));
+	util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/.udev/db/",
+		      udev_device_get_subsystem(udev_device), ":", udev_device_get_sysname(udev_device), NULL);
 	unlink(filename);
 	return 0;
 }
 
-int udev_device_rename_db(struct udev_device *udev_device, const char *devpath_old)
+int udev_device_rename_db(struct udev_device *udev_device)
 {
 	struct udev *udev = udev_device_get_udev(udev_device);
 	char filename_old[UTIL_PATH_SIZE];
 	char filename[UTIL_PATH_SIZE];
 
-	devpath_to_db_path(udev, devpath_old, filename_old, sizeof(filename_old));
-	devpath_to_db_path(udev, udev_device_get_devpath(udev_device), filename, sizeof(filename));
+	util_strscpyl(filename_old, sizeof(filename_old), udev_get_dev_path(udev), "/.udev/db/",
+		      udev_device_get_subsystem(udev_device), ":", udev_device_get_sysname_old(udev_device), NULL);
+	util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/.udev/db/",
+		      udev_device_get_subsystem(udev_device), ":", udev_device_get_sysname(udev_device), NULL);
 	return rename(filename_old, filename);
 }