X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev_utils.c;h=4623c30caf60eb7b7dc0d0d984acc41a2d05a8b7;hb=9a997ecf4ed97becb9c546c5fad8490bcba44181;hp=2df8fab1f8ace90b75aac6c58efe67b58df14e1b;hpb=cb8896cd74814acc9360db3156e37233fcfbc20c;p=elogind.git

diff --git a/udev/udev_utils.c b/udev/udev_utils.c
index 2df8fab1f..4623c30ca 100644
--- a/udev/udev_utils.c
+++ b/udev/udev_utils.c
@@ -1,22 +1,20 @@
 /*
- * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-2008 Kay Sievers <kay.sievers@vrfy.org>
  *
- *	This program is free software; you can redistribute it and/or modify it
- *	under the terms of the GNU General Public License as published by the
- *	Free Software Foundation version 2 of the License.
- * 
- *	This program is distributed in the hope that it will be useful, but
- *	WITHOUT ANY WARRANTY; without even the implied warranty of
- *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *	General Public License for more details.
- * 
- *	You should have received a copy of the GNU General Public License along
- *	with this program; if not, write to the Free Software Foundation, Inc.,
- *	51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
  *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <stddef.h>
@@ -34,27 +32,6 @@
 
 #include "udev.h"
 
-
-int log_priority(const char *priority)
-{
-	char *endptr;
-	int prio;
-
-	prio = strtol(priority, &endptr, 10);
-	if (endptr[0] == '\0')
-		return prio;
-	if (strncasecmp(priority, "err", 3) == 0)
-		return LOG_ERR;
-	if (strcasecmp(priority, "info") == 0)
-		return LOG_INFO;
-	if (strcasecmp(priority, "debug") == 0)
-		return LOG_DEBUG;
-	if (string_is_true(priority))
-		return LOG_ERR;
-
-	return 0;
-}
-
 struct name_entry *name_list_add(struct udev *udev, struct list_head *name_list, const char *name, int sort)
 {
 	struct name_entry *name_loop;
@@ -78,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);
 
@@ -150,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;
 	}
 
@@ -164,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 */
@@ -199,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;
 
@@ -217,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;