X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Futil.h;h=cacc3969b2e9f3e28cd7a5587b63d6165c10def2;hb=2c7108c40abfb1f175391aa59cf1b07ab203e690;hp=93d67081b7b843036fd7309338049d815f0eda26;hpb=9a34ec5fbb4b55413dc9d610b636fe760d34ecd7;p=elogind.git

diff --git a/src/util.h b/src/util.h
index 93d67081b..cacc3969b 100644
--- a/src/util.h
+++ b/src/util.h
@@ -32,6 +32,11 @@
 
 typedef uint64_t usec_t;
 
+typedef struct timestamp {
+        usec_t realtime;
+        usec_t monotonic;
+} timestamp;
+
 #define MSEC_PER_SEC  1000ULL
 #define USEC_PER_SEC  1000000ULL
 #define USEC_PER_MSEC 1000ULL
@@ -49,9 +54,12 @@ typedef uint64_t usec_t;
 #define NEWLINE "\n\r"
 
 #define FORMAT_TIMESTAMP_MAX 64
+#define FORMAT_TIMESPAN_MAX 64
 
 usec_t now(clockid_t clock);
 
+timestamp* timestamp_get(timestamp *ts);
+
 usec_t timespec_load(const struct timespec *ts);
 struct timespec *timespec_store(struct timespec *ts, usec_t u);
 
@@ -131,6 +139,7 @@ int read_one_line_file(const char *fn, char **line);
 char *strappend(const char *s, const char *suffix);
 
 int readlink_malloc(const char *p, char **r);
+int readlink_and_make_absolute(const char *p, char **r);
 
 char *file_name_from_path(const char *p);
 bool is_path(const char *p);
@@ -138,7 +147,9 @@ bool is_path(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);
+
 char **strv_path_make_absolute_cwd(char **l);
+char **strv_path_canonicalize(char **l);
 
 int reset_all_signal_handlers(void);
 
@@ -179,6 +190,7 @@ bool ignore_file(const char *filename);
 bool chars_intersect(const char *a, const char *b);
 
 char *format_timestamp(char *buf, size_t l, usec_t t);
+char *format_timespan(char *buf, size_t l, usec_t t);
 
 int make_stdio(int fd);
 
@@ -236,6 +248,8 @@ int path_is_mount_point(const char *path);
 
 bool is_device_path(const char *path);
 
+int dir_is_empty(const char *path);
+
 extern char * __progname;
 
 const char *ioprio_class_to_string(int i);