X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fbasic%2Fpath-util.h;h=cdb194d2a34bb3a02e7ae6b4984be6c394e37726;hp=90b405dc84ba2cffab83855cb0ec7fde7e58652d;hb=d96290d8fd01ba77eec7f4a5fb493bc1ff80a98b;hpb=3b22396a4b2767a98172f6915929c47738cb0a1e

diff --git a/src/basic/path-util.h b/src/basic/path-util.h
index 90b405dc8..cdb194d2a 100644
--- a/src/basic/path-util.h
+++ b/src/basic/path-util.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 /***
@@ -21,7 +19,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <alloca.h>
 #include <stdbool.h>
+#include <stddef.h>
 
 #include "macro.h"
 #include "time-util.h"
@@ -36,33 +36,57 @@
 #endif
 
 bool is_path(const char *p) _pure_;
-// UNNEEDED char** path_split_and_make_absolute(const char *p);
-int path_get_parent(const char *path, char **parent);
+#if 0 /// UNNEEDED by elogind
+int path_split_and_make_absolute(const char *p, char ***ret);
+#endif // 0
 bool path_is_absolute(const char *p) _pure_;
+#if 0 /// UNNEEDED by elogind
 char* path_make_absolute(const char *p, const char *prefix);
-char* path_make_absolute_cwd(const char *p);
-// UNNEEDED int path_make_relative(const char *from_dir, const char *to_path, char **_r);
+#endif // 0
+int path_make_absolute_cwd(const char *p, char **ret);
+#if 0 /// UNNEEDED by elogind
+int path_make_relative(const char *from_dir, const char *to_path, char **_r);
+#endif // 0
 char* path_kill_slashes(char *path);
 char* path_startswith(const char *path, const char *prefix) _pure_;
 int path_compare(const char *a, const char *b) _pure_;
 bool path_equal(const char *a, const char *b) _pure_;
-// UNNEEDED bool path_equal_or_files_same(const char *a, const char *b);
-// UNNEEDED char* path_join(const char *root, const char *path, const char *rest);
+bool path_equal_or_files_same(const char *a, const char *b);
+#if 0 /// UNNEEDED by elogind
+char* path_join(const char *root, const char *path, const char *rest);
+
+static inline bool path_equal_ptr(const char *a, const char *b) {
+        return !!a == !!b && (!a || path_equal(a, b));
+}
+#endif // 0
+
+/* Note: the search terminates on the first NULL item. */
+#define PATH_IN_SET(p, ...)                                     \
+        ({                                                      \
+                char **s;                                       \
+                bool _found = false;                            \
+                STRV_FOREACH(s, STRV_MAKE(__VA_ARGS__))         \
+                        if (path_equal(p, *s)) {                \
+                               _found = true;                   \
+                               break;                           \
+                        }                                       \
+                _found;                                         \
+        })
 
-char** path_strv_make_absolute_cwd(char **l);
+#if 0 /// UNNEEDED by elogind
+int path_strv_make_absolute_cwd(char **l);
+#endif // 0
 char** path_strv_resolve(char **l, const char *prefix);
 char** path_strv_resolve_uniq(char **l, const char *prefix);
 
-int fd_is_mount_point(int fd, const char *filename, int flags);
-int path_is_mount_point(const char *path, int flags);
-int path_is_read_only_fs(const char *path);
-// UNNEEDED int path_is_os_tree(const char *path);
-
-// UNNEEDED int find_binary(const char *name, bool local, char **filename);
+#if 0 /// UNNEEDED by elogind
+int find_binary(const char *name, char **filename);
 
-// UNNEEDED bool paths_check_timestamp(const char* const* paths, usec_t *paths_ts_usec, bool update);
+bool paths_check_timestamp(const char* const* paths, usec_t *paths_ts_usec, bool update);
 
-// UNNEEDED int fsck_exists(const char *fstype);
+int fsck_exists(const char *fstype);
+int mkfs_exists(const char *fstype);
+#endif // 0
 
 /* Iterates through the path prefixes of the specified path, going up
  * the tree, to root. Also returns "" (and not "/"!) for the root
@@ -74,7 +98,7 @@ int path_is_read_only_fs(const char *path);
 #define PATH_FOREACH_PREFIX_MORE(prefix, path) \
         for (char *_slash = ({ path_kill_slashes(strcpy(prefix, path)); if (streq(prefix, "/")) prefix[0] = 0; strrchr(prefix, 0); }); _slash && ((*_slash = 0), true); _slash = strrchr((prefix), '/'))
 
-// UNNEEDED char *prefix_root(const char *root, const char *path);
+char *prefix_root(const char *root, const char *path);
 
 /* Similar to prefix_root(), but returns an alloca() buffer, or
  * possibly a const pointer into the path parameter */
@@ -100,3 +124,23 @@ int path_is_read_only_fs(const char *path);
                 }                                                       \
                 _ret;                                                   \
         })
+
+#if 0 /// UNNEEDED by elogind
+int parse_path_argument_and_warn(const char *path, bool suppress_root, char **arg);
+#endif // 0
+
+char* dirname_malloc(const char *path);
+
+bool filename_is_valid(const char *p) _pure_;
+bool path_is_safe(const char *p) _pure_;
+
+char *file_in_same_dir(const char *path, const char *filename);
+
+bool hidden_or_backup_file(const char *filename) _pure_;
+
+#if 0 /// UNNEEDED by elogind
+bool is_device_path(const char *path);
+#endif // 0
+bool is_deviceallow_pattern(const char *path);
+
+int systemd_installation_has_version(const char *root, unsigned minimal_version);