From 39bdfa31f2f00c3357e2a7a5f139abee6d7c7cd3 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Fri, 26 Jul 2013 03:34:18 +0200 Subject: shared: split mkdir_*() and mkdir_*_label() from each other Avoid pulling-in selinux for tools which just create directories but not need to fix the selinux label. --- src/shared/mkdir.h | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'src/shared/mkdir.h') diff --git a/src/shared/mkdir.h b/src/shared/mkdir.h index 3d39b2910f..5b34db4229 100644 --- a/src/shared/mkdir.h +++ b/src/shared/mkdir.h @@ -7,6 +7,7 @@ This file is part of systemd. Copyright 2010 Lennart Poettering + Copyright 2013 Kay Sievers systemd is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -24,17 +25,21 @@ #include -int mkdir_label(const char *path, mode_t mode); - int mkdir_safe(const char *path, mode_t mode, uid_t uid, gid_t gid); -int mkdir_safe_label(const char *path, mode_t mode, uid_t uid, gid_t gid); - int mkdir_parents(const char *path, mode_t mode); -int mkdir_parents_label(const char *path, mode_t mode); -int mkdir_parents_prefix(const char *prefix, const char *path, mode_t mode); - int mkdir_p(const char *path, mode_t mode); -int mkdir_p_label(const char *path, mode_t mode); int mkdir_p_prefix(const char *prefix, const char *path, mode_t mode); +/* selinux versions */ +int mkdir_label(const char *path, mode_t mode); +int mkdir_safe_label(const char *path, mode_t mode, uid_t uid, gid_t gid); +int mkdir_parents_label(const char *path, mode_t mode); +int mkdir_p_label(const char *path, mode_t mode); +int mkdir_parents_prefix_label(const char *prefix, const char *path, mode_t mode); + +/* internally used */ +typedef int (*mkdir_func_t)(const char *pathname, mode_t mode); +int mkdir_safe_internal(const char *path, mode_t mode, uid_t uid, gid_t gid, mkdir_func_t _mkdir); +int mkdir_parents_internal(const char *prefix, const char *path, mode_t mode, mkdir_func_t _mkdir); +int mkdir_p_internal(const char *prefix, const char *path, mode_t mode, mkdir_func_t _mkdir); #endif -- cgit v1.2.3-54-g00ecf