chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] udev - fix "ignore method"
[elogind.git]
/
namedev.c
diff --git
a/namedev.c
b/namedev.c
index de7f7c1b88e3c4196269385d9fd40af868645647..7984adfb31d87fc1d42ebcefe7e9d4576cdfba24 100644
(file)
--- a/
namedev.c
+++ b/
namedev.c
@@
-47,34
+47,35
@@
LIST_HEAD(perm_device_list);
/* compare string with pattern (supports * ? [0-9] [!A-Z]) */
static int strcmp_pattern(const char *p, const char *s)
{
/* compare string with pattern (supports * ? [0-9] [!A-Z]) */
static int strcmp_pattern(const char *p, const char *s)
{
- if (
*s
== '\0') {
- while (
*p
== '*')
+ if (
s[0]
== '\0') {
+ while (
p[0]
== '*')
p++;
p++;
- return (
*p
!= '\0');
+ return (
p[0]
!= '\0');
}
}
- switch (
*p
) {
+ switch (
p[0]
) {
case '[':
{
int not = 0;
p++;
case '[':
{
int not = 0;
p++;
- if (
*p
== '!') {
+ if (
p[0]
== '!') {
not = 1;
p++;
}
not = 1;
p++;
}
- while (
*p && (*p
!= ']')) {
+ while (
(p[0] != '\0') && (p[0]
!= ']')) {
int match = 0;
if (p[1] == '-') {
int match = 0;
if (p[1] == '-') {
- if ((
*s >= *p) && (*s
<= p[2]))
+ if ((
s[0] >= p[0]) && (s[0]
<= p[2]))
match = 1;
p += 3;
} else {
match = 1;
p += 3;
} else {
- match = (
*p == *s
);
+ match = (
p[0] == s[0]
);
p++;
}
if (match ^ not) {
p++;
}
if (match ^ not) {
- while (
*p && (*p
!= ']'))
+ while (
(p[0] != '\0') && (p[0]
!= ']'))
p++;
p++;
- return strcmp_pattern(p+1, s+1);
+ if (p[0] == ']')
+ return strcmp_pattern(p+1, s+1);
}
}
}
}
}
}
@@
-84,12
+85,12
@@
static int strcmp_pattern(const char *p, const char *s)
return strcmp_pattern(p+1, s);
return 0;
case '\0':
return strcmp_pattern(p+1, s);
return 0;
case '\0':
- if (
*s
== '\0') {
+ if (
s[0]
== '\0') {
return 0;
}
break;
default:
return 0;
}
break;
default:
- if ((
*p == *s) || (*p
== '?'))
+ if ((
p[0] == s[0]) || (p[0]
== '?'))
return strcmp_pattern(p+1, s+1);
break;
}
return strcmp_pattern(p+1, s+1);
break;
}
@@
-588,12
+589,12
@@
static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
if (dev->bus[0] != '\0') {
if (sysfs_device == NULL) {
dbg("device has no bus");
if (dev->bus[0] != '\0') {
if (sysfs_device == NULL) {
dbg("device has no bus");
- goto
no_good
;
+ goto
try_parent
;
}
dbg("check for " FIELD_BUS " dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
if (strcmp_pattern(dev->bus, sysfs_device->bus) != 0) {
dbg(FIELD_BUS " is not matching");
}
dbg("check for " FIELD_BUS " dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
if (strcmp_pattern(dev->bus, sysfs_device->bus) != 0) {
dbg(FIELD_BUS " is not matching");
- goto
no_good
;
+ goto
try_parent
;
} else {
dbg(FIELD_BUS " matches");
}
} else {
dbg(FIELD_BUS " matches");
}
@@
-604,7
+605,7
@@
static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
dbg("check for " FIELD_KERNEL " dev->kernel='%s' class_dev->name='%s'", dev->kernel, class_dev->name);
if (strcmp_pattern(dev->kernel, class_dev->name) != 0) {
dbg(FIELD_KERNEL " is not matching");
dbg("check for " FIELD_KERNEL " dev->kernel='%s' class_dev->name='%s'", dev->kernel, class_dev->name);
if (strcmp_pattern(dev->kernel, class_dev->name) != 0) {
dbg(FIELD_KERNEL " is not matching");
- goto
no_good
;
+ goto
try_parent
;
} else {
dbg(FIELD_KERNEL " matches");
}
} else {
dbg(FIELD_KERNEL " matches");
}
@@
-615,7
+616,7
@@
static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
dbg("check " FIELD_ID);
if (match_id(dev, class_dev, sysfs_device) != 0) {
dbg(FIELD_ID " is not matching");
dbg("check " FIELD_ID);
if (match_id(dev, class_dev, sysfs_device) != 0) {
dbg(FIELD_ID " is not matching");
- goto
no_good
;
+ goto
try_parent
;
} else {
dbg(FIELD_ID " matches");
}
} else {
dbg(FIELD_ID " matches");
}
@@
-626,7
+627,7
@@
static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
dbg("check " FIELD_PLACE);
if (match_place(dev, class_dev, sysfs_device) != 0) {
dbg(FIELD_PLACE " is not matching");
dbg("check " FIELD_PLACE);
if (match_place(dev, class_dev, sysfs_device) != 0) {
dbg(FIELD_PLACE " is not matching");
- goto
no_good
;
+ goto
try_parent
;
} else {
dbg(FIELD_PLACE " matches");
}
} else {
dbg(FIELD_PLACE " matches");
}
@@
-637,7
+638,7
@@
static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
dbg("check " FIELD_SYSFS " pairs");
if (match_sysfs_pairs(dev, class_dev, sysfs_device) != 0) {
dbg(FIELD_SYSFS " is not matching");
dbg("check " FIELD_SYSFS " pairs");
if (match_sysfs_pairs(dev, class_dev, sysfs_device) != 0) {
dbg(FIELD_SYSFS " is not matching");
- goto
no_good
;
+ goto
try_parent
;
} else {
dbg(FIELD_SYSFS " matches");
}
} else {
dbg(FIELD_SYSFS " matches");
}
@@
-649,7
+650,7
@@
static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
apply_format(udev, dev->program);
if (execute_program(dev->program, udev->program_result, NAME_SIZE) != 0) {
dbg(FIELD_PROGRAM " returned nozero");
apply_format(udev, dev->program);
if (execute_program(dev->program, udev->program_result, NAME_SIZE) != 0) {
dbg(FIELD_PROGRAM " returned nozero");
- goto
no_good
;
+ goto
try_parent
;
} else {
dbg(FIELD_PROGRAM " returned successful");
}
} else {
dbg(FIELD_PROGRAM " returned successful");
}
@@
-662,22
+663,17
@@
static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
dev->result, udev->program_result);
if (strcmp_pattern(dev->result, udev->program_result) != 0) {
dbg(FIELD_RESULT " is not matching");
dev->result, udev->program_result);
if (strcmp_pattern(dev->result, udev->program_result) != 0) {
dbg(FIELD_RESULT " is not matching");
- goto
no_good
;
+ goto
try_parent
;
} else {
dbg(FIELD_RESULT " matches");
}
}
} else {
dbg(FIELD_RESULT " matches");
}
}
- /* check if we are instructed to ignore this device */
- if (dev->name[0] == '\0') {
- dbg("instructed to ignore this device");
- return -1;
- }
-
/* Yeah, we matched! */
return 0;
/* Yeah, we matched! */
return 0;
-no_good:
+try_parent:
+ dbg("try parent sysfs device");
sysfs_device = sysfs_get_device_parent(sysfs_device);
if (sysfs_device == NULL)
return -ENODEV;
sysfs_device = sysfs_get_device_parent(sysfs_device);
if (sysfs_device == NULL)
return -ENODEV;
@@
-721,11
+717,15
@@
int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
/* look for a matching rule to apply */
list_for_each_entry(dev, &config_device_list, node) {
dbg("process rule");
/* look for a matching rule to apply */
list_for_each_entry(dev, &config_device_list, node) {
dbg("process rule");
-
if (match_rule(dev, class_dev, udev, sysfs_device) == 0) {
if (match_rule(dev, class_dev, udev, sysfs_device) == 0) {
- /* Yup, this rule belongs to us! */
+ if (dev->name[0] == '\0') {
+ info("configured rule in '%s' at line %i applied, '%s' is ignored",
+ udev_rules_filename, dev->config_line, udev->kernel_name);
+ return -1;
+ }
+
info("configured rule in '%s' at line %i applied, '%s' becomes '%s'",
info("configured rule in '%s' at line %i applied, '%s' becomes '%s'",
- udev_rules_filename, dev->config_line, udev->kernel_name, dev->name);
+
udev_rules_filename, dev->config_line, udev->kernel_name, dev->name);
strfieldcpy(udev->name, dev->name);
strfieldcpy(udev->symlink, dev->symlink);
goto found;
strfieldcpy(udev->name, dev->name);
strfieldcpy(udev->symlink, dev->symlink);
goto found;