if (add) {
info(udev, "creating index: '%s'\n", filename);
- create_path(udev, filename);
+ util_create_path(udev, filename);
fd = open(filename, O_WRONLY|O_TRUNC|O_CREAT, 0644);
if (fd > 0)
close(fd);
} else {
info(udev, "removing index: '%s'\n", filename);
unlink(filename);
- delete_path(udev, filename);
+ util_delete_path(udev, filename);
}
return 0;
}
static int node_symlink(struct udev *udev, const char *node, const char *slink)
{
struct stat stats;
- char target[UTIL_PATH_SIZE] = "";
+ char target[UTIL_PATH_SIZE];
char slink_tmp[UTIL_PATH_SIZE + sizeof(TMP_FILE_EXT)];
int i = 0;
int tail = 0;
int err = 0;
/* use relative link */
+ target[0] = '\0';
while (node[i] && (node[i] == slink[i])) {
if (node[i] == '/')
tail = i+1;
struct udev *udev = udev_device_get_udev(dev);
struct udev_list_node dev_list;
struct udev_list_entry *dev_entry;
- char target[UTIL_PATH_SIZE] = "";
+ char target[UTIL_PATH_SIZE];
int count;
int priority = 0;
int rc = 0;
info(udev, "no reference left, remove '%s'\n", slink);
if (!test) {
unlink(slink);
- delete_path(udev, slink);
+ util_delete_path(udev, slink);
}
goto out;
}
/* find the device with the highest priority */
+ target[0] = '\0';
udev_list_entry_foreach(dev_entry, udev_list_get_entry(&dev_list)) {
const char *syspath;
struct udev_device *dev_db;
/* create symlink to the target with the highest priority */
info(udev, "'%s' with target '%s' has the highest priority %i, create it\n", slink, target, priority);
if (!test) {
- create_path(udev, slink);
+ util_create_path(udev, slink);
node_symlink(udev, target, slink);
}
out:
}
}
-int udev_node_add(struct udev_device *dev, mode_t mode, const char *owner, const char *group, int test)
+int udev_node_add(struct udev_device *dev, mode_t mode, uid_t uid, gid_t gid, int test)
{
struct udev *udev = udev_device_get_udev(dev);
- uid_t uid;
- gid_t gid;
int i;
int num;
struct udev_list_entry *list_entry;
int err = 0;
- create_path(udev, udev_device_get_devnode(dev));
-
- if (strcmp(owner, "root") == 0)
- uid = 0;
- else {
- char *endptr;
- unsigned long id;
-
- id = strtoul(owner, &endptr, 10);
- if (endptr[0] == '\0')
- uid = (uid_t) id;
- else
- uid = lookup_user(udev, owner);
- }
-
- if (strcmp(group, "root") == 0)
- gid = 0;
- else {
- char *endptr;
- unsigned long id;
-
- id = strtoul(group, &endptr, 10);
- if (endptr[0] == '\0')
- gid = (gid_t) id;
- else
- gid = lookup_group(udev, group);
- }
-
info(udev, "creating device node '%s', devnum=%d:%d, mode=%#o, uid=%d, gid=%d\n",
udev_device_get_devnode(dev),
major(udev_device_get_devnum(dev)), minor(udev_device_get_devnum(dev)),
mode, uid, gid);
+ util_create_path(udev, udev_device_get_devnode(dev));
if (!test)
if (udev_node_mknod(dev, NULL, makedev(0,0), mode, uid, gid) != 0) {
err = -1;
info(udev, "removing device node '%s'\n", devnode);
if (!test)
- err = unlink_secure(udev, devnode);
+ err = util_unlink_secure(udev, devnode);
if (err)
return err;
snprintf(partitionname, sizeof(partitionname), "%s%d", devnode, i);
partitionname[sizeof(partitionname)-1] = '\0';
if (!test)
- unlink_secure(udev, partitionname);
+ util_unlink_secure(udev, partitionname);
}
}
- delete_path(udev, devnode);
+ util_delete_path(udev, devnode);
return err;
}