diff options
| author | Kay Sievers <kay@vrfy.org> | 2012-04-17 00:26:02 +0200 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2012-04-17 01:09:39 +0200 |
| commit | 9e13dbae509605dba1bde7e7385086b59acb428e (patch) | |
| tree | ab3b5cdbdcf358212727f2aa181186d4b5973832 /src/udev | |
| parent | f13b388f97bc3ba8db844bd3413d510e2466a0b6 (diff) | |
udev: replace util_create_path() with mkdir_parents()
Diffstat (limited to 'src/udev')
| -rw-r--r-- | src/udev/udev-builtin-firmware.c | 2 | ||||
| -rw-r--r-- | src/udev/udev-node.c | 6 | ||||
| -rw-r--r-- | src/udev/udev-watch.c | 2 | ||||
| -rw-r--r-- | src/udev/udevd.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/udev/udev-builtin-firmware.c b/src/udev/udev-builtin-firmware.c index bd2716fdc8..56dc8fcaa9 100644 --- a/src/udev/udev-builtin-firmware.c +++ b/src/udev/udev-builtin-firmware.c @@ -121,7 +121,7 @@ static int builtin_firmware(struct udev_device *dev, int argc, char *argv[], boo /* This link indicates the missing firmware file and the associated device */ log_debug("did not find firmware file '%s'\n", firmware); do { - err = util_create_path(udev, misspath); + err = mkdir_parents(misspath, 0755); if (err != 0 && err != -ENOENT) break; err = symlink(udev_device_get_devpath(dev), misspath); diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c index 26a43e9623..20aa7c865d 100644 --- a/src/udev/udev-node.c +++ b/src/udev/udev-node.c @@ -100,7 +100,7 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink) } else { log_debug("creating symlink '%s' to '%s'\n", slink, target); do { - err = util_create_path_selinux(udev, slink); + err = mkdir_parents(slink, 0755); if (err != 0 && err != -ENOENT) break; udev_selinux_setfscreatecon(udev, slink, S_IFLNK); @@ -117,7 +117,7 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink) util_strscpyl(slink_tmp, sizeof(slink_tmp), slink, TMP_FILE_EXT, NULL); unlink(slink_tmp); do { - err = util_create_path_selinux(udev, slink_tmp); + err = mkdir_parents(slink_tmp, 0755); if (err != 0 && err != -ENOENT) break; udev_selinux_setfscreatecon(udev, slink_tmp, S_IFLNK); @@ -226,7 +226,7 @@ static void link_update(struct udev_device *dev, const char *slink, bool add) do { int fd; - err = util_create_path(udev, filename); + err = mkdir_parents(filename, 0755); if (err != 0 && err != -ENOENT) break; fd = open(filename, O_WRONLY|O_CREAT|O_CLOEXEC|O_TRUNC|O_NOFOLLOW, 0444); diff --git a/src/udev/udev-watch.c b/src/udev/udev-watch.c index 7d5b30bd68..1091ec8d69 100644 --- a/src/udev/udev-watch.c +++ b/src/udev/udev-watch.c @@ -111,7 +111,7 @@ void udev_watch_begin(struct udev *udev, struct udev_device *dev) } snprintf(filename, sizeof(filename), "/run/udev/watch/%d", wd); - util_create_path(udev, filename); + mkdir_parents(filename, 0755); unlink(filename); symlink(udev_device_get_id_filename(dev), filename); diff --git a/src/udev/udevd.c b/src/udev/udevd.c index d6de2aa222..513d1de343 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -857,7 +857,7 @@ static void static_dev_create_from_modules(struct udev *udev) continue; util_strscpyl(filename, sizeof(filename), "/dev/", devname, NULL); - util_create_path_selinux(udev, filename); + mkdir_parents(filename, 0755); udev_selinux_setfscreatecon(udev, filename, mode); log_debug("mknod '%s' %c%u:%u\n", filename, type, maj, min); if (mknod(filename, mode, makedev(maj, min)) < 0 && errno == EEXIST) @@ -938,7 +938,7 @@ static int convert_db(struct udev *udev) return 0; /* make sure we do not get here again */ - util_create_path(udev, "/run/udev/data"); + mkdir_parents("/run/udev/data", 0755); mkdir(filename, 0755); /* old database */ |