X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=libudev%2Flibudev-device-private.c;h=1bcf441237868c34296d3e7b4cf778436a62a650;hp=80a4da4c96427c63183ea84951fb025a18d0865b;hb=fbb31cd6e10fe66d2da781db0ba9a8d671a4c6aa;hpb=2ffc9cc1917b1bb6fe86881a94a47dce9aa15168

diff --git a/libudev/libudev-device-private.c b/libudev/libudev-device-private.c
index 80a4da4c9..1bcf44123 100644
--- a/libudev/libudev-device-private.c
+++ b/libudev/libudev-device-private.c
@@ -25,6 +25,7 @@ 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;
@@ -35,10 +36,10 @@ int udev_device_update_db(struct udev_device *udev_device)
 
 	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);
+	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))
+		if (udev_list_entry_get_flags(list_entry))
 			goto file;
 	if (udev_device_get_num_fake_partitions(udev_device) != 0)
 		goto file;
@@ -66,21 +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);
-	util_create_path(udev, filename);
-	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:
-	util_create_path(udev, filename);
-	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]);
@@ -88,23 +92,25 @@ 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))
+		if (!udev_list_entry_get_flags(list_entry))
 			continue;
 		fprintf(f, "E:%s=%s\n",
 			udev_list_entry_get_name(list_entry),
 			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;
 }