libudev: handle "device" link as parent, handle "class" "block" as "subsystem"

[elogind.git] / udev / udev_rules_parse.c

diff --git a/udev/udev_rules_parse.c b/udev/udev_rules_parse.c
index 81f0edb6f59a0df758eb7db3f496ff8e8eafbe4e..a46eff98e664d557ac44bb7c7fe6294609ba2d40 100644 (file)
--- a/udev/udev_rules_parse.c
+++ b/udev/udev_rules_parse.c
@@ -1,20 +1,19 @@
 /*
  * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
- * Copyright (C) 2003-2006 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2003-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 "config.h"
@@ -30,7 +29,6 @@
 
 #include "udev.h"
 #include "udev_rules.h"
-#include "udev_selinux.h"
 
 
 void udev_rules_iter_init(struct udev_rules_iter *iter, struct udev_rules *rules)
@@ -206,12 +204,12 @@ static char *get_key_attribute(struct udev_rules *rules, char *str)
 static int add_rule_key(struct udev_rule *rule, struct key *key,
                        enum key_operation operation, const char *value)
 {
-       size_t val_len = strnlen(value, PATH_SIZE);
+       size_t val_len = strnlen(value, UTIL_PATH_SIZE);
 
        key->operation = operation;
 
        key->val_off = rule->bufsize;
-       strlcpy(rule->buf + rule->bufsize, value, val_len+1);
+       util_strlcpy(rule->buf + rule->bufsize, value, val_len+1);
        rule->bufsize += val_len+1;
 
        return 0;
@@ -220,7 +218,7 @@ static int add_rule_key(struct udev_rule *rule, struct key *key,
 static int add_rule_key_pair(struct udev_rules *rules, struct udev_rule *rule, struct key_pairs *pairs,
                             enum key_operation operation, const char *key, const char *value)
 {
-       size_t key_len = strnlen(key, PATH_SIZE);
+       size_t key_len = strnlen(key, UTIL_PATH_SIZE);
 
        if (pairs->count >= PAIRS_MAX) {
                err(rules->udev, "skip, too many keys of the same type in a single rule\n");
@@ -231,7 +229,7 @@ static int add_rule_key_pair(struct udev_rules *rules, struct udev_rule *rule, s
 
        /* add the key-name of the pair */
        pairs->keys[pairs->count].key_name_off = rule->bufsize;
-       strlcpy(rule->buf + rule->bufsize, key, key_len+1);
+       util_strlcpy(rule->buf + rule->bufsize, key, key_len+1);
        rule->bufsize += key_len+1;
 
        pairs->count++;
@@ -241,7 +239,7 @@ static int add_rule_key_pair(struct udev_rules *rules, struct udev_rule *rule, s
 
 static int add_to_rules(struct udev_rules *rules, char *line, const char *filename, unsigned int lineno)
 {
-       char buf[sizeof(struct udev_rule) + LINE_SIZE];
+       char buf[sizeof(struct udev_rule) + UTIL_LINE_SIZE];
        struct udev_rule *rule;
        size_t rule_size;
        int valid;
@@ -446,19 +444,19 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
                                rule->import_type = IMPORT_PARENT;
                        } else {
                                /* figure it out if it is executable */
-                               char file[PATH_SIZE];
+                               char file[UTIL_PATH_SIZE];
                                char *pos;
                                struct stat statbuf;
 
-                               strlcpy(file, value, sizeof(file));
+                               util_strlcpy(file, value, sizeof(file));
                                pos = strchr(file, ' ');
                                if (pos)
                                        pos[0] = '\0';
 
                                /* allow programs in /lib/udev called without the path */
                                if (strchr(file, '/') == NULL) {
-                                       strlcpy(file, UDEV_PREFIX "/lib/udev/", sizeof(file));
-                                       strlcat(file, value, sizeof(file));
+                                       util_strlcpy(file, UDEV_PREFIX "/lib/udev/", sizeof(file));
+                                       util_strlcat(file, value, sizeof(file));
                                        pos = strchr(file, ' ');
                                        if (pos)
                                                pos[0] = '\0';
@@ -670,7 +668,7 @@ invalid:
 
 static int parse_file(struct udev_rules *rules, const char *filename)
 {
-       char line[LINE_SIZE];
+       char line[UTIL_LINE_SIZE];
        char *bufline;
        unsigned int lineno;
        char *buf;
@@ -705,7 +703,7 @@ static int parse_file(struct udev_rules *rules, const char *filename)
                        continue;
 
                /* see if this is a comment */
-               if (bufline[0] == COMMENT_CHARACTER)
+               if (bufline[0] == '#')
                        continue;
 
                if (count >= sizeof(line)) {
@@ -752,13 +750,13 @@ int udev_rules_init(struct udev *udev, struct udev_rules *rules, int resolve_nam
                add_matching_files(udev, &name_list, SYSCONFDIR "/udev/rules.d", ".rules");
 
                /* read dynamic/temporary rules */
-               strlcpy(filename, udev_get_dev_path(udev), sizeof(filename));
-               strlcat(filename, "/.udev/rules.d", sizeof(filename));
+               util_strlcpy(filename, udev_get_dev_path(udev), sizeof(filename));
+               util_strlcat(filename, "/.udev/rules.d", sizeof(filename));
                if (stat(filename, &statbuf) != 0) {
                        create_path(udev, filename);
-                       selinux_setfscreatecon(udev, filename, NULL, S_IFDIR|0755);
+                       udev_selinux_setfscreatecon(udev, filename, S_IFDIR|0755);
                        mkdir(filename, 0755);
-                       selinux_resetfscreatecon(udev);
+                       udev_selinux_resetfscreatecon(udev);
                }
                add_matching_files(udev, &sort_list, filename, ".rules");