Prep v228: Add remaining updates from upstream (2/3)

[elogind.git] / src / basic / path-util.h

diff --git a/src/basic/path-util.h b/src/basic/path-util.h
index 90b405dc84ba2cffab83855cb0ec7fde7e58652d..3295d62faecd9b8e2f32ed90f8ff0777918316c0 100644 (file)
--- a/src/basic/path-util.h
+++ b/src/basic/path-util.h
@@ -36,33 +36,28 @@
 #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);
+// UNNEEDED int path_split_and_make_absolute(const char *p, char ***ret);
 bool path_is_absolute(const char *p) _pure_;
 char* path_make_absolute(const char *p, const char *prefix);
-char* path_make_absolute_cwd(const char *p);
+int path_make_absolute_cwd(const char *p, char **ret);
 // UNNEEDED int path_make_relative(const char *from_dir, const char *to_path, char **_r);
 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);
+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);
 
-char** path_strv_make_absolute_cwd(char **l);
+// UNNEEDED int path_strv_make_absolute_cwd(char **l);
 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);
+// UNNEEDED int find_binary(const char *name, char **filename);
 
 // UNNEEDED bool paths_check_timestamp(const char* const* paths, usec_t *paths_ts_usec, bool update);
 
 // UNNEEDED int fsck_exists(const char *fstype);
+int mkfs_exists(const char *fstype);
 
 /* Iterates through the path prefixes of the specified path, going up
  * the tree, to root. Also returns "" (and not "/"!) for the root
@@ -100,3 +95,17 @@ int path_is_read_only_fs(const char *path);
                 }                                                       \
                 _ret;                                                   \
         })
+
+int parse_path_argument_and_warn(const char *path, bool suppress_root, char **arg);
+
+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_file_allow_backup(const char *filename);
+bool hidden_file(const char *filename) _pure_;
+
+bool is_device_path(const char *path);