chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libudev: device - read database only when needed
[elogind.git]
/
udev
/
udev_rules_parse.c
diff --git
a/udev/udev_rules_parse.c
b/udev/udev_rules_parse.c
index 685260f12cd94146bb035b042a74ec63b37cb328..541d651f0e1f1ed017d414a8667123482ccedfef 100644
(file)
--- a/
udev/udev_rules_parse.c
+++ b/
udev/udev_rules_parse.c
@@
-16,8
+16,6
@@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "config.h"
-
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
@@
-204,12
+202,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)
{
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;
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;
rule->bufsize += val_len+1;
return 0;
@@
-218,7
+216,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)
{
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");
if (pairs->count >= PAIRS_MAX) {
err(rules->udev, "skip, too many keys of the same type in a single rule\n");
@@
-229,7
+227,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;
/* 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++;
rule->bufsize += key_len+1;
pairs->count++;
@@
-239,7
+237,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)
{
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;
struct udev_rule *rule;
size_t rule_size;
int valid;
@@
-444,19
+442,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 */
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;
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) {
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';
pos = strchr(file, ' ');
if (pos)
pos[0] = '\0';
@@
-668,7
+666,7
@@
invalid:
static int parse_file(struct udev_rules *rules, const char *filename)
{
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;
char *bufline;
unsigned int lineno;
char *buf;
@@
-703,7
+701,7
@@
static int parse_file(struct udev_rules *rules, const char *filename)
continue;
/* see if this is a comment */
continue;
/* see if this is a comment */
- if (bufline[0] ==
COMMENT_CHARACTER
)
+ if (bufline[0] ==
'#'
)
continue;
if (count >= sizeof(line)) {
continue;
if (count >= sizeof(line)) {
@@
-750,8
+748,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 */
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);
if (stat(filename, &statbuf) != 0) {
create_path(udev, filename);
udev_selinux_setfscreatecon(udev, filename, S_IFDIR|0755);