X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=util.h;h=ecf3b15e33721596950fd039513abeedce0b567e;hp=4881c981b9dedf1a6d41dd58127e7d37aa71f2f2;hb=25e870b5f79f158ba6ac0b715248b0c3d3549325;hpb=e05797fba258d7a58987cc8870fae6e34b94fe46

diff --git a/util.h b/util.h
index 4881c981b..ecf3b15e3 100644
--- a/util.h
+++ b/util.h
@@ -27,6 +27,7 @@
 #include <sys/time.h>
 #include <stdbool.h>
 #include <stdlib.h>
+#include <stdio.h>
 
 typedef uint64_t usec_t;
 
@@ -37,10 +38,17 @@ typedef uint64_t usec_t;
 #define NSEC_PER_MSEC 1000000ULL
 #define NSEC_PER_USEC 1000ULL
 
+#define USEC_PER_MINUTE (60ULL*USEC_PER_SEC)
+#define USEC_PER_HOUR (60ULL*USEC_PER_MINUTE)
+#define USEC_PER_DAY (24ULL*USEC_PER_HOUR)
+#define USEC_PER_WEEK (7ULL*USEC_PER_DAY)
+
 /* What is interpreted as whitespace? */
 #define WHITESPACE " \t\n\r"
 #define NEWLINE "\n\r"
 
+#define FORMAT_TIMESTAMP_MAX 64
+
 usec_t now(clockid_t clock);
 
 usec_t timespec_load(const struct timespec *ts);
@@ -88,6 +96,7 @@ int close_nointr(int fd);
 void close_nointr_nofail(int fd);
 
 int parse_boolean(const char *v);
+int parse_usec(const char *t, usec_t *usec);
 
 int safe_atou(const char *s, unsigned *ret_u);
 int safe_atoi(const char *s, int *ret_i);
@@ -137,6 +146,7 @@ char *truncate_nl(char *s);
 
 char *file_in_same_dir(const char *path, const char *filename);
 int mkdir_parents(const char *path, mode_t mode);
+int mkdir_p(const char *path, mode_t mode);
 
 int get_process_name(pid_t pid, char **name);
 
@@ -153,6 +163,7 @@ char *cunescape(const char *s);
 char *path_kill_slashes(char *path);
 
 bool path_startswith(const char *path, const char *prefix);
+bool path_equal(const char *a, const char *b);
 
 char *ascii_strlower(char *path);
 
@@ -165,6 +176,8 @@ 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);
+
 #define DEFINE_STRING_TABLE_LOOKUP(name,type)                           \
         const char *name##_to_string(type i) {                          \
                 if (i < 0 || i >= (type) ELEMENTSOF(name##_table))      \
@@ -191,6 +204,28 @@ int fd_cloexec(int fd, bool cloexec);
 
 int close_all_fds(const int except[], unsigned n_except);
 
+bool fstype_is_network(const char *fstype);
+
+int chvt(int vt);
+
+int read_one_char(FILE *f, char *ret, bool *need_nl);
+int ask(char *ret, const char *replies, const char *text, ...);
+
+int reset_terminal(int fd);
+int open_terminal(const char *name, int mode);
+int acquire_terminal(const char *name, bool fail, bool force);
+int release_terminal(void);
+
+int flush_fd(int fd);
+
+int ignore_signal(int sig);
+
+int close_pipe(int p[]);
+
+ssize_t loop_read(int fd, void *buf, size_t nbytes);
+
+int path_is_mount_point(const char *path);
+
 extern char * __progname;
 
 const char *ioprio_class_to_string(int i);