X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudev_utils.c;h=4623c30caf60eb7b7dc0d0d984acc41a2d05a8b7;hp=669e4f3419fa7f78b8909ae844fe082ac3108ab9;hb=fc233a874bc93ac82bed7eda1d6967d6281a6fe2;hpb=ecc9ec579feb4b7cc86bcf7caed3cb841faf3c9e;ds=sidebyside

diff --git a/udev/udev_utils.c b/udev/udev_utils.c
index 669e4f341..4623c30ca 100644
--- a/udev/udev_utils.c
+++ b/udev/udev_utils.c
@@ -55,7 +55,7 @@ struct name_entry *name_list_add(struct udev *udev, struct list_head *name_list,
 	if (name_new == NULL)
 		return NULL;
 	memset(name_new, 0x00, sizeof(struct name_entry));
-	strlcpy(name_new->name, name, sizeof(name_new->name));
+	util_strlcpy(name_new->name, name, sizeof(name_new->name));
 	dbg(udev, "adding '%s'\n", name_new->name);
 	list_add_tail(&name_new->node, &name_loop->node);
 
@@ -127,12 +127,12 @@ int add_matching_files(struct udev *udev, struct list_head *name_list, const cha
 {
 	struct dirent *ent;
 	DIR *dir;
-	char filename[PATH_SIZE];
+	char filename[UTIL_PATH_SIZE];
 
 	dbg(udev, "open directory '%s'\n", dirname);
 	dir = opendir(dirname);
 	if (dir == NULL) {
-		err(udev, "unable to open '%s': %s\n", dirname, strerror(errno));
+		err(udev, "unable to open '%s': %m\n", dirname);
 		return -1;
 	}
 
@@ -141,7 +141,7 @@ int add_matching_files(struct udev *udev, struct list_head *name_list, const cha
 		if (ent == NULL || ent->d_name[0] == '\0')
 			break;
 
-		if ((ent->d_name[0] == '.') || (ent->d_name[0] == COMMENT_CHARACTER))
+		if ((ent->d_name[0] == '.') || (ent->d_name[0] == '#'))
 			continue;
 
 		/* look for file matching with specified suffix */
@@ -176,7 +176,7 @@ uid_t lookup_user(struct udev *udev, const char *user)
 		if (errno == 0 || errno == ENOENT || errno == ESRCH)
 			err(udev, "specified user '%s' unknown\n", user);
 		else
-			err(udev, "error resolving user '%s': %s\n", user, strerror(errno));
+			err(udev, "error resolving user '%s': %m\n", user);
 	} else
 		uid = pw->pw_uid;
 
@@ -194,7 +194,7 @@ extern gid_t lookup_group(struct udev *udev, const char *group)
 		if (errno == 0 || errno == ENOENT || errno == ESRCH)
 			err(udev, "specified group '%s' unknown\n", group);
 		else
-			err(udev, "error resolving group '%s': %s\n", group, strerror(errno));
+			err(udev, "error resolving group '%s': %m\n", group);
 	} else
 		gid = gr->gr_gid;