conf-parser: minor optimization in config_parse_string()

[elogind.git] / src / shared / mkdir.h

diff --git a/src/shared/mkdir.h b/src/shared/mkdir.h
index 1a332bbcf82e6c075f2b134dbab2167bbf933491..eb73902fc2c09938d80b67b46663d2b88c24fe67 100644 (file)
--- a/src/shared/mkdir.h
+++ b/src/shared/mkdir.h
@@ -1,12 +1,12 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
-#ifndef foomkdirhfoo
-#define foomkdirhfoo
+#pragma once
 
 /***
   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
@@ -22,8 +22,22 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-int mkdir_safe_label(const char *path, mode_t mode, uid_t uid, gid_t gid);
+#include <sys/types.h>
+
+int mkdir_safe(const char *path, mode_t mode, uid_t uid, gid_t gid);
+int mkdir_parents(const char *path, mode_t mode);
+int mkdir_p(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);
-#endif
+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);