create:
switch (udev->type) {
- case 'b':
+ case BLOCK:
mode |= S_IFBLK;
break;
- case 'c':
- case 'u':
+ case CLASS:
mode |= S_IFCHR;
break;
- case 'p':
- mode |= S_IFIFO;
- break;
default:
dbg("unknown node type %c\n", udev->type);
return -EINVAL;
{
char filename[NAME_SIZE];
char partitionname[NAME_SIZE];
+ struct name_entry *name_loop;
uid_t uid = 0;
gid_t gid = 0;
int tail;
- char *pos;
- int len;
- int i;
+ int i;
snprintf(filename, NAME_SIZE, "%s/%s", udev_root, udev->name);
filename[NAME_SIZE-1] = '\0';
for (i = 1; i <= udev->partitions; i++) {
dev_t part_devt;
- strfieldcpy(partitionname, filename);
- strintcat(partitionname, i);
+ snprintf(partitionname, NAME_SIZE, "%s%d", filename, i);
+ partitionname[NAME_SIZE-1] = '\0';
part_devt = makedev(major(udev->devt), minor(udev->devt)+1);
udev_make_node(udev, partitionname, part_devt, udev->mode, uid, gid);
}
}
/* create symlink(s) if requested */
- foreach_strpart(udev->symlink, " ", pos, len) {
- char linkname[NAME_SIZE];
+ list_for_each_entry(name_loop, &udev->symlink_list, node) {
char linktarget[NAME_SIZE];
- strfieldcpymax(linkname, pos, len+1);
- snprintf(filename, NAME_SIZE, "%s/%s", udev_root, linkname);
+ snprintf(filename, NAME_SIZE, "%s/%s", udev_root, name_loop->name);
filename[NAME_SIZE-1] = '\0';
dbg("symlink '%s' to node '%s' requested", filename, udev->name);
if (!udev->test_run)
- if (strrchr(linkname, '/'))
+ if (strchr(filename, '/'))
create_path(filename);
/* optimize relative link */
linktarget[0] = '\0';
i = 0;
tail = 0;
- while ((udev->name[i] == linkname[i]) && udev->name[i]) {
+ while (udev->name[i] && (udev->name[i] == name_loop->name[i])) {
if (udev->name[i] == '/')
tail = i+1;
i++;
}
- while (linkname[i] != '\0') {
- if (linkname[i] == '/')
+ while (name_loop->name[i] != '\0') {
+ if (name_loop->name[i] == '/')
strfieldcat(linktarget, "../");
i++;
}
char *pos;
int retval = 0;
- if (udev->type == 'b' || udev->type == 'c') {
+ if (udev->type == BLOCK || udev->type == CLASS) {
udev->devt = get_devt(class_dev);
if (!udev->devt) {
dbg("no dev-file found, do nothing");
selinux_init();
- if (udev->type == 'b' || udev->type == 'c') {
+ if (udev->type == BLOCK || udev->type == CLASS) {
retval = create_node(udev, class_dev);
if (retval != 0)
goto exit;
snprintf(udev->devname, NAME_SIZE, "%s/%s", udev_root, udev->name);
udev->devname[NAME_SIZE-1] = '\0';
- } else if (udev->type == 'n') {
+ } else if (udev->type == NET) {
/* look if we want to change the name of the netif */
if (strcmp(udev->name, udev->kernel_name) != 0) {
retval = rename_net_if(udev);