* Userspace devfs
*
* Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2003-2005 Kay Sievers <kay.sievers@vrfy.org>
*
*
* This program is free software; you can redistribute it and/or modify it
cur = 0;
lineno = 0;
while (cur < bufsize) {
- int i, j;
+ unsigned int i, j;
count = buf_get_line(buf, bufsize, cur);
bufline = &buf[cur];
if (retval)
break;
+ if (strcasecmp(temp2, FIELD_KERNEL) == 0) {
+ strfieldcpy(dev.kernel, temp3);
+ valid = 1;
+ continue;
+ }
+
+ if (strcasecmp(temp2, FIELD_SUBSYSTEM) == 0) {
+ strfieldcpy(dev.subsystem, temp3);
+ valid = 1;
+ continue;
+ }
+
if (strcasecmp(temp2, FIELD_BUS) == 0) {
strfieldcpy(dev.bus, temp3);
valid = 1;
continue;
}
- if (strcasecmp(temp2, FIELD_KERNEL) == 0) {
- strfieldcpy(dev.kernel, temp3);
- valid = 1;
- continue;
- }
-
- if (strcasecmp(temp2, FIELD_SUBSYSTEM) == 0) {
- strfieldcpy(dev.subsystem, temp3);
- valid = 1;
- continue;
- }
-
if (strcasecmp(temp2, FIELD_DRIVER) == 0) {
strfieldcpy(dev.driver, temp3);
valid = 1;
if (strncasecmp(temp2, FIELD_NAME, sizeof(FIELD_NAME)-1) == 0) {
attr = get_key_attribute(temp2 + sizeof(FIELD_NAME)-1);
+ /* FIXME: remove old style options and make OPTIONS= mandatory */
if (attr != NULL) {
if (strstr(attr, ATTR_PARTITIONS) != NULL) {
dbg_parse("creation of partition nodes requested");
- dev.partitions = PARTITIONS_COUNT;
+ dev.partitions = DEFAULT_PARTITIONS_COUNT;
}
if (strstr(attr, ATTR_IGNORE_REMOVE) != NULL) {
dbg_parse("remove event should be ignored");
dev.ignore_remove = 1;
}
}
- strfieldcpy(dev.name, temp3);
+ if (temp3[0] != '\0')
+ strfieldcpy(dev.name, temp3);
+ else
+ dev.ignore_device = 1;
valid = 1;
continue;
}
continue;
}
+ if (strcasecmp(temp2, FIELD_OPTIONS) == 0) {
+ if (strstr(temp3, ATTR_IGNORE_DEVICE) != NULL) {
+ dbg_parse("device should be ignored");
+ dev.ignore_device = 1;
+ }
+ if (strstr(temp3, ATTR_IGNORE_REMOVE) != NULL) {
+ dbg_parse("remove event should be ignored");
+ dev.ignore_remove = 1;
+ }
+ if (strstr(temp3, ATTR_PARTITIONS) != NULL) {
+ dbg_parse("creation of partition nodes requested");
+ dev.partitions = DEFAULT_PARTITIONS_COUNT;
+ }
+ valid = 1;
+ continue;
+ }
+
dbg("unknown type of field '%s'", temp2);
goto error;
}
return retval;
}
+
+void namedev_close(void)
+{
+ struct config_device *dev;
+
+ list_for_each_entry(dev, &config_device_list, node) {
+ list_del(&dev->node);
+ free(dev);
+ }
+}
+