diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2008-09-10 18:59:42 +0200 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2008-09-10 18:59:42 +0200 |
| commit | 31c1f537450e96f8ddd6a0fad2adaefe57996f03 (patch) | |
| tree | 816bab62c1215cd2886dd0d238ff30dbfd032ff0 /udev/udev_rules_parse.c | |
| parent | ecc9ec579feb4b7cc86bcf7caed3cb841faf3c9e (diff) | |
get rid of udev_sysdeps.c
Diffstat (limited to 'udev/udev_rules_parse.c')
| -rw-r--r-- | udev/udev_rules_parse.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/udev/udev_rules_parse.c b/udev/udev_rules_parse.c index 685260f12c..1c5f36d491 100644 --- a/udev/udev_rules_parse.c +++ b/udev/udev_rules_parse.c @@ -209,7 +209,7 @@ static int add_rule_key(struct udev_rule *rule, struct key *key, 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; @@ -229,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++; @@ -448,15 +448,15 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena 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'; @@ -750,8 +750,8 @@ 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); udev_selinux_setfscreatecon(udev, filename, S_IFDIR|0755); |