path-util: unify code for detecting OS trees

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

diff --git a/src/shared/path-util.h b/src/shared/path-util.h
index 181b98122427ef7fe819bd51b8aef5ddaab75cc0..ea0f1730826dbc6082ef522b87d695cc53d76dcb 100644 (file)
--- a/src/shared/path-util.h
+++ b/src/shared/path-util.h
@@ -1,7 +1,6 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 

-#ifndef foopathutilhfoo
-#define foopathutilhfoo
+#pragma once

 
 /***
   This file is part of systemd.
 
 /***
   This file is part of systemd.


@@ -31,16 +30,14 @@ int path_get_parent(const char *path, char **parent);
 bool path_is_absolute(const char *p);
 char *path_make_absolute(const char *p, const char *prefix);
 char *path_make_absolute_cwd(const char *p);
 bool path_is_absolute(const char *p);
 char *path_make_absolute(const char *p, const char *prefix);
 char *path_make_absolute_cwd(const char *p);

-int path_parent(const char *path, char **parent);

 char *path_kill_slashes(char *path);
 char *path_kill_slashes(char *path);

-bool path_startswith(const char *path, const char *prefix);
+char *path_startswith(const char *path, const char *prefix);

 bool path_equal(const char *a, const char *b);
 
 char **path_strv_make_absolute_cwd(char **l);
 char **path_strv_canonicalize(char **l);
 bool path_equal(const char *a, const char *b);
 
 char **path_strv_make_absolute_cwd(char **l);
 char **path_strv_canonicalize(char **l);

-char **path_strv_remove_empty(char **l);
+char **path_strv_canonicalize_uniq(char **l);

 
 int path_is_mount_point(const char *path, bool allow_symlink);
 int path_is_read_only_fs(const char *path);
 
 int path_is_mount_point(const char *path, bool allow_symlink);
 int path_is_read_only_fs(const char *path);

-
-#endif
+int path_is_os_tree(const char *path);