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=00b67dadc6fa3ff0a70b97df098a1cbbe2ad64d3;hb=fc233a874bc93ac82bed7eda1d6967d6281a6fe2;hpb=726687ad48bdececed1e7e44387c50e009e28208 diff --git a/udev/udev_utils.c b/udev/udev_utils.c index 00b67dadc..4623c30ca 100644 --- a/udev/udev_utils.c +++ b/udev/udev_utils.c @@ -1,26 +1,25 @@ /* - * Copyright (C) 2004-2005 Kay Sievers + * Copyright (C) 2004-2008 Kay Sievers * - * 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 . */ - #include #include #include #include +#include #include #include #include @@ -33,28 +32,7 @@ #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 list_head *name_list, const char *name, int sort) +struct name_entry *name_list_add(struct udev *udev, struct list_head *name_list, const char *name, int sort) { struct name_entry *name_loop; struct name_entry *name_new; @@ -62,7 +40,7 @@ struct name_entry *name_list_add(struct list_head *name_list, const char *name, /* avoid duplicate entries */ list_for_each_entry(name_loop, name_list, node) { if (strcmp(name_loop->name, name) == 0) { - dbg("'%s' is already in the list\n", name); + dbg(udev, "'%s' is already in the list\n", name); return name_loop; } } @@ -76,41 +54,44 @@ struct name_entry *name_list_add(struct list_head *name_list, const char *name, name_new = malloc(sizeof(struct name_entry)); if (name_new == NULL) return NULL; - - strlcpy(name_new->name, name, sizeof(name_new->name)); - dbg("adding '%s'\n", name_new->name); + memset(name_new, 0x00, sizeof(struct name_entry)); + 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); return name_new; } -struct name_entry *name_list_key_add(struct list_head *name_list, const char *key, const char *value) +struct name_entry *name_list_key_add(struct udev *udev, struct list_head *name_list, const char *key, const char *value) { struct name_entry *name_loop; struct name_entry *name_new; + size_t keylen = strlen(key); list_for_each_entry(name_loop, name_list, node) { - if (strncmp(name_loop->name, key, strlen(key)) == 0) { - dbg("key already present '%s', replace it\n", name_loop->name); - snprintf(name_loop->name, sizeof(name_loop->name), "%s=%s", key, value); - name_loop->name[sizeof(name_loop->name)-1] = '\0'; - return name_loop; - } + if (strncmp(name_loop->name, key, keylen) != 0) + continue; + if (name_loop->name[keylen] != '=') + continue; + dbg(udev, "key already present '%s', replace it\n", name_loop->name); + snprintf(name_loop->name, sizeof(name_loop->name), "%s=%s", key, value); + name_loop->name[sizeof(name_loop->name)-1] = '\0'; + return name_loop; } name_new = malloc(sizeof(struct name_entry)); if (name_new == NULL) return NULL; - + memset(name_new, 0x00, sizeof(struct name_entry)); snprintf(name_new->name, sizeof(name_new->name), "%s=%s", key, value); name_new->name[sizeof(name_new->name)-1] = '\0'; - dbg("adding '%s'\n", name_new->name); + dbg(udev, "adding '%s'\n", name_new->name); list_add_tail(&name_new->node, &name_loop->node); return name_new; } -int name_list_key_remove(struct list_head *name_list, const char *key) +int name_list_key_remove(struct udev *udev, struct list_head *name_list, const char *key) { struct name_entry *name_loop; struct name_entry *name_tmp; @@ -130,7 +111,7 @@ int name_list_key_remove(struct list_head *name_list, const char *key) return retval; } -void name_list_cleanup(struct list_head *name_list) +void name_list_cleanup(struct udev *udev, struct list_head *name_list) { struct name_entry *name_loop; struct name_entry *name_tmp; @@ -142,16 +123,16 @@ void name_list_cleanup(struct list_head *name_list) } /* calls function for every file found in specified directory */ -int add_matching_files(struct list_head *name_list, const char *dirname, const char *suffix) +int add_matching_files(struct udev *udev, struct list_head *name_list, const char *dirname, const char *suffix) { struct dirent *ent; DIR *dir; - char filename[PATH_SIZE]; + char filename[UTIL_PATH_SIZE]; - dbg("open directory '%s'\n", dirname); + dbg(udev, "open directory '%s'\n", dirname); dir = opendir(dirname); if (dir == NULL) { - err("unable to open '%s': %s\n", dirname, strerror(errno)); + err(udev, "unable to open '%s': %m\n", dirname); return -1; } @@ -160,7 +141,7 @@ int add_matching_files(struct list_head *name_list, const char *dirname, const c 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 */ @@ -173,18 +154,18 @@ int add_matching_files(struct list_head *name_list, const char *dirname, const c if (strcmp(ext, suffix) != 0) continue; } - dbg("put file '%s/%s' into list\n", dirname, ent->d_name); + dbg(udev, "put file '%s/%s' into list\n", dirname, ent->d_name); snprintf(filename, sizeof(filename), "%s/%s", dirname, ent->d_name); filename[sizeof(filename)-1] = '\0'; - name_list_add(name_list, filename, 1); + name_list_add(udev, name_list, filename, 1); } closedir(dir); return 0; } -uid_t lookup_user(const char *user) +uid_t lookup_user(struct udev *udev, const char *user) { struct passwd *pw; uid_t uid = 0; @@ -193,16 +174,16 @@ uid_t lookup_user(const char *user) pw = getpwnam(user); if (pw == NULL) { if (errno == 0 || errno == ENOENT || errno == ESRCH) - err("specified user '%s' unknown\n", user); + err(udev, "specified user '%s' unknown\n", user); else - err("error resolving user '%s': %s\n", user, strerror(errno)); + err(udev, "error resolving user '%s': %m\n", user); } else uid = pw->pw_uid; return uid; } -extern gid_t lookup_group(const char *group) +extern gid_t lookup_group(struct udev *udev, const char *group) { struct group *gr; gid_t gid = 0; @@ -211,9 +192,9 @@ extern gid_t lookup_group(const char *group) gr = getgrnam(group); if (gr == NULL) { if (errno == 0 || errno == ENOENT || errno == ESRCH) - err("specified group '%s' unknown\n", group); + err(udev, "specified group '%s' unknown\n", group); else - err("error resolving group '%s': %s\n", group, strerror(errno)); + err(udev, "error resolving group '%s': %m\n", group); } else gid = gr->gr_gid;