X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevadm-test.c;h=ba0852871a9fa6520822ef1143cb71ee482b0789;hp=994a354960280315a321477f1ba17aa4d28fff6f;hb=bc8184ede9cff156709fe053e3e02ef309cb2920;hpb=55e9959b155cefc5146f7a3d1ea73e74da91f303

diff --git a/udev/udevadm-test.c b/udev/udevadm-test.c
index 994a35496..ba0852871 100644
--- a/udev/udevadm-test.c
+++ b/udev/udevadm-test.c
@@ -33,7 +33,7 @@
 
 static int import_uevent_var(struct udev *udev, const char *devpath)
 {
-	char path[PATH_SIZE];
+	char path[UTIL_PATH_SIZE];
 	static char value[4096]; /* must stay, used with putenv */
 	ssize_t size;
 	int fd;
@@ -42,9 +42,9 @@ static int import_uevent_var(struct udev *udev, const char *devpath)
 	int rc = -1;
 
 	/* read uevent file */
-	strlcpy(path, udev_get_sys_path(udev), sizeof(path));
-	strlcat(path, devpath, sizeof(path));
-	strlcat(path, "/uevent", sizeof(path));
+	util_strlcpy(path, udev_get_sys_path(udev), sizeof(path));
+	util_strlcat(path, devpath, sizeof(path));
+	util_strlcat(path, "/uevent", sizeof(path));
 	fd = open(path, O_RDONLY);
 	if (fd < 0)
 		goto out;
@@ -163,11 +163,11 @@ int udevadm_test(struct udev *udev, int argc, char *argv[])
 	}
 
 	if (subsystem != NULL)
-		strlcpy(dev->subsystem, subsystem, sizeof(dev->subsystem));
+		util_strlcpy(dev->subsystem, subsystem, sizeof(dev->subsystem));
 
 	/* override built-in sysfs device */
 	udevice->dev = dev;
-	strlcpy(udevice->action, action, sizeof(udevice->action));
+	util_strlcpy(udevice->action, action, sizeof(udevice->action));
 	udevice->devt = udev_device_get_devt(udevice);
 
 	/* simulate node creation with test flag */
@@ -189,9 +189,9 @@ int udevadm_test(struct udev *udev, int argc, char *argv[])
 		struct name_entry *name_loop;
 
 		list_for_each_entry(name_loop, &udevice->run_list, node) {
-			char program[PATH_SIZE];
+			char program[UTIL_PATH_SIZE];
 
-			strlcpy(program, name_loop->name, sizeof(program));
+			util_strlcpy(program, name_loop->name, sizeof(program));
 			udev_rules_apply_format(udevice, program, sizeof(program));
 			info(udev, "run: '%s'\n", program);
 		}