diff options
| author | Anthony G. Basile <blueness@gentoo.org> | 2015-06-18 14:11:59 -0400 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2015-06-18 14:11:59 -0400 |
| commit | 5e11fe2da443badbc5e5f5e2fb2434e0875b4e7c (patch) | |
| tree | d5b47a19525f54917202e253658aff5806ed62c9 | |
| parent | 52a4d0c0d509e89571fdd7233b9b259c5fcafe52 (diff) | |
Rename mkdir_p -> udev_mkdir_p to avoid symbol collisions.
While usptream doesn't support a static libudev.a, we will try to
do so. However, mkdir_p() is used in lvm2 and util-linux, so
to avoid the collision, we rename it to udev_mkdir_p(). See:
https://bugs.gentoo.org/show_bug.cgi?id=520450
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
| -rw-r--r-- | src/shared/mkdir.c | 2 | ||||
| -rw-r--r-- | src/shared/mkdir.h | 2 | ||||
| -rw-r--r-- | src/udev/udev-rules.c | 2 | ||||
| -rw-r--r-- | src/udev/udevd.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/shared/mkdir.c b/src/shared/mkdir.c index 73a3c4576f..20702afa15 100644 --- a/src/shared/mkdir.c +++ b/src/shared/mkdir.c @@ -124,6 +124,6 @@ int mkdir_p_internal(const char *prefix, const char *path, mode_t mode, mkdir_fu return 0; } -int mkdir_p(const char *path, mode_t mode) { +int udev_mkdir_p(const char *path, mode_t mode) { return mkdir_p_internal(NULL, path, mode, mkdir); } diff --git a/src/shared/mkdir.h b/src/shared/mkdir.h index 7d37c89230..bb1d01bb5e 100644 --- a/src/shared/mkdir.h +++ b/src/shared/mkdir.h @@ -21,7 +21,7 @@ #include <sys/types.h> int mkdir_parents(const char *path, mode_t mode); -int mkdir_p(const char *path, mode_t mode); +int udev_mkdir_p(const char *path, mode_t mode); /* mandatory access control(MAC) versions */ int mkdir_parents_label(const char *path, mode_t mode); diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c index 3a96c8a0e5..c5e85faaaf 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -2682,7 +2682,7 @@ int udev_rules_apply_static_dev_perms(struct udev_rules *rules) { _cleanup_free_ char *unescaped_filename = NULL; strscpyl(tags_dir, sizeof(tags_dir), UDEV_ROOT_RUN "/udev/static_node-tags/", *t, "/", NULL); - r = mkdir_p(tags_dir, 0755); + r = udev_mkdir_p(tags_dir, 0755); if (r < 0) return log_error_errno(r, "failed to create %s: %m", tags_dir); diff --git a/src/udev/udevd.c b/src/udev/udevd.c index f4076b1357..e2cd9050e5 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -1301,7 +1301,7 @@ int main(int argc, char *argv[]) { IN_DELETE | IN_MOVE | IN_CLOSE_WRITE); if (access(UDEV_ROOT_RUN "/udev/rules.d", F_OK) < 0) { - mkdir_p(UDEV_ROOT_RUN "/udev/rules.d", 0755); + udev_mkdir_p(UDEV_ROOT_RUN "/udev/rules.d", 0755); } inotify_add_watch(fd_inotify, UDEV_ROOT_RUN "/udev/rules.d", IN_DELETE | IN_MOVE | IN_CLOSE_WRITE); |