[PATCH] oops, everything was getting created as 000 mode, try to fix this up,
This commit is contained in:
parent
08daec117c
commit
615e05f84a
65
namedev.c
65
namedev.c
|
@ -421,6 +421,7 @@ static int get_attr(struct sysfs_class_device *class_dev, struct device_attr *at
|
||||||
int retval = 0;
|
int retval = 0;
|
||||||
int found;
|
int found;
|
||||||
|
|
||||||
|
attr->mode = -1;
|
||||||
if (class_dev->sysdevice) {
|
if (class_dev->sysdevice) {
|
||||||
dbg("class_dev->sysdevice->directory->path = '%s'", class_dev->sysdevice->directory->path);
|
dbg("class_dev->sysdevice->directory->path = '%s'", class_dev->sysdevice->directory->path);
|
||||||
dbg("class_dev->sysdevice->bus_id = '%s'", class_dev->sysdevice->bus_id);
|
dbg("class_dev->sysdevice->bus_id = '%s'", class_dev->sysdevice->bus_id);
|
||||||
|
@ -488,24 +489,28 @@ static int get_attr(struct sysfs_class_device *class_dev, struct device_attr *at
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
label_found:
|
label_found:
|
||||||
dbg("file '%s' found with value '%s'", dev->sysfs_file, temp);
|
temp[strlen(temp)-1] = 0x00;
|
||||||
|
dbg("file '%s' found with value '%s' compare with '%s'", dev->sysfs_file, temp, dev->sysfs_value);
|
||||||
if (strcmp(dev->sysfs_value, temp) != 0)
|
if (strcmp(dev->sysfs_value, temp) != 0)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
strcpy(attr->name, dev->attr.name);
|
strcpy(attr->name, dev->attr.name);
|
||||||
attr->mode = dev->attr.mode;
|
if (isdigit(class_dev->directory->path[strlen(class_dev->directory->path)-1])) {
|
||||||
strcpy(attr->owner, dev->attr.owner);
|
temp[0] = class_dev->directory->path[strlen(class_dev->directory->path)-1];
|
||||||
strcpy(attr->group, dev->attr.group);
|
temp[1] = 0x00;
|
||||||
|
strcat(attr->name, temp);
|
||||||
|
}
|
||||||
|
if (dev->attr.mode != 0) {
|
||||||
|
attr->mode = dev->attr.mode;
|
||||||
|
strcpy(attr->owner, dev->attr.owner);
|
||||||
|
strcpy(attr->group, dev->attr.group);
|
||||||
|
}
|
||||||
dbg("file '%s' with value '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
|
dbg("file '%s' with value '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
|
||||||
dev->sysfs_file, dev->sysfs_value, attr->name,
|
dev->sysfs_file, dev->sysfs_value, attr->name,
|
||||||
dev->attr.owner, dev->attr.group, dev->attr.mode);
|
dev->attr.owner, dev->attr.group, dev->attr.mode);
|
||||||
return retval;
|
goto done;
|
||||||
dbg("LABEL name = '%s', bus = '%s', sysfs_file = '%s', sysfs_value = '%s'"
|
|
||||||
" owner = '%s', group = '%s', mode = '%#o'",
|
|
||||||
dev->attr.name, dev->bus, dev->sysfs_file, dev->sysfs_value,
|
|
||||||
dev->attr.owner, dev->attr.group, dev->attr.mode);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case NUMBER:
|
case NUMBER:
|
||||||
|
@ -533,13 +538,15 @@ dbg("LABEL name = '%s', bus = '%s', sysfs_file = '%s', sysfs_value = '%s'"
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
strcpy(attr->name, dev->attr.name);
|
strcpy(attr->name, dev->attr.name);
|
||||||
attr->mode = dev->attr.mode;
|
if (dev->attr.mode != 0) {
|
||||||
strcpy(attr->owner, dev->attr.owner);
|
attr->mode = dev->attr.mode;
|
||||||
strcpy(attr->group, dev->attr.group);
|
strcpy(attr->owner, dev->attr.owner);
|
||||||
|
strcpy(attr->group, dev->attr.group);
|
||||||
|
}
|
||||||
dbg("device id '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
|
dbg("device id '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
|
||||||
dev->id, attr->name,
|
dev->id, attr->name,
|
||||||
dev->attr.owner, dev->attr.group, dev->attr.mode);
|
dev->attr.owner, dev->attr.group, dev->attr.mode);
|
||||||
return retval;
|
goto done;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case TOPOLOGY:
|
case TOPOLOGY:
|
||||||
|
@ -567,26 +574,30 @@ dbg("LABEL name = '%s', bus = '%s', sysfs_file = '%s', sysfs_value = '%s'"
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
strcpy(attr->name, dev->attr.name);
|
strcpy(attr->name, dev->attr.name);
|
||||||
attr->mode = dev->attr.mode;
|
if (dev->attr.mode != 0) {
|
||||||
strcpy(attr->owner, dev->attr.owner);
|
attr->mode = dev->attr.mode;
|
||||||
strcpy(attr->group, dev->attr.group);
|
strcpy(attr->owner, dev->attr.owner);
|
||||||
|
strcpy(attr->group, dev->attr.group);
|
||||||
|
}
|
||||||
dbg("device at '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
|
dbg("device at '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
|
||||||
dev->place, attr->name,
|
dev->place, attr->name,
|
||||||
dev->attr.owner, dev->attr.group, dev->attr.mode);
|
dev->attr.owner, dev->attr.group, dev->attr.mode);
|
||||||
return retval;
|
goto done;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case REPLACE:
|
case REPLACE:
|
||||||
if (strcmp(dev->kernel_name, class_dev->name) != 0)
|
if (strcmp(dev->kernel_name, class_dev->name) != 0)
|
||||||
continue;
|
continue;
|
||||||
strcpy(attr->name, dev->attr.name);
|
strcpy(attr->name, dev->attr.name);
|
||||||
attr->mode = dev->attr.mode;
|
if (dev->attr.mode != 0) {
|
||||||
strcpy(attr->owner, dev->attr.owner);
|
attr->mode = dev->attr.mode;
|
||||||
strcpy(attr->group, dev->attr.group);
|
strcpy(attr->owner, dev->attr.owner);
|
||||||
|
strcpy(attr->group, dev->attr.group);
|
||||||
|
}
|
||||||
dbg("'%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
|
dbg("'%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
|
||||||
dev->kernel_name, attr->name,
|
dev->kernel_name, attr->name,
|
||||||
dev->attr.owner, dev->attr.group, dev->attr.mode);
|
dev->attr.owner, dev->attr.group, dev->attr.mode);
|
||||||
return retval;
|
goto done;
|
||||||
break;
|
break;
|
||||||
case KERNEL_NAME:
|
case KERNEL_NAME:
|
||||||
break;
|
break;
|
||||||
|
@ -595,10 +606,14 @@ dbg("LABEL name = '%s', bus = '%s', sysfs_file = '%s', sysfs_value = '%s'"
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
attr->mode = get_default_mode(class_dev);
|
|
||||||
attr->owner[0] = 0x00;
|
|
||||||
attr->group[0] = 0x00;
|
|
||||||
strcpy(attr->name, class_dev->name);
|
strcpy(attr->name, class_dev->name);
|
||||||
|
|
||||||
|
done:
|
||||||
|
if (attr->mode == -1) {
|
||||||
|
attr->mode = get_default_mode(class_dev);
|
||||||
|
attr->owner[0] = 0x00;
|
||||||
|
attr->group[0] = 0x00;
|
||||||
|
}
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue