X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fbasic%2Fstat-util.h;h=c74d1d58e042c1286519bf1e28a9d8d5ee2d2376;hp=23e00885ffd91f43ab76e42196786096afc4fc62;hb=9742b1e43855b1599bd52ff95af995d9a9d35eac;hpb=20e696d0ded4e2f95ab20e95b148c806a3112949

diff --git a/src/basic/stat-util.h b/src/basic/stat-util.h
index 23e00885f..c74d1d58e 100644
--- a/src/basic/stat-util.h
+++ b/src/basic/stat-util.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 /***
@@ -22,19 +20,19 @@
 ***/
 
 #include <stdbool.h>
+#include <stddef.h>
 #include <sys/stat.h>
+#include <sys/statfs.h>
 #include <sys/types.h>
 #include <sys/vfs.h>
 
 #include "macro.h"
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int is_symlink(const char *path);
 #endif // 0
 int is_dir(const char *path, bool follow);
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int is_device_node(const char *path);
 
 int dir_is_empty(const char *path);
@@ -50,33 +48,32 @@ static inline int dir_is_populated(const char *path) {
 
 bool null_or_empty(struct stat *st) _pure_;
 int null_or_empty_path(const char *fn);
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int null_or_empty_fd(int fd);
 #endif // 0
 
 int path_is_read_only_fs(const char *path);
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int path_is_os_tree(const char *path);
 #endif // 0
 
-int files_same(const char *filea, const char *fileb);
+int files_same(const char *filea, const char *fileb, int flags);
 
 /* The .f_type field of struct statfs is really weird defined on
- * different archs. Let's use our own type we know is sufficiently
- * larger to store the possible values. */
-typedef long statfs_f_type_t;
+ * different archs. Let's give its type a name. */
+typedef typeof(((struct statfs*)NULL)->f_type) statfs_f_type_t;
 
 bool is_fs_type(const struct statfs *s, statfs_f_type_t magic_value) _pure_;
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int fd_check_fstype(int fd, statfs_f_type_t magic_value);
 int path_check_fstype(const char *path, statfs_f_type_t magic_value);
 #endif // 0
 
 bool is_temporary_fs(const struct statfs *s) _pure_;
+#if 0 /// UNNEEDED by elogind
 int fd_is_temporary_fs(int fd);
+int path_is_temporary_fs(const char *path);
+#endif // 0
 
 /* Because statfs.t_type can be int on some architectures, we have to cast
  * the const magic to the type, otherwise the compiler warns about