X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Futil.h;h=e9ad881e9cd50c356e019dae532296061dff5b2c;hb=86a3475bc5087da2a28015247ff18672905044f4;hp=71889f1425762b256a0874870995896d51dca50a;hpb=10717a1a8d48e50463abf2f6b47e2618eaa529e7;p=elogind.git

diff --git a/src/util.h b/src/util.h
index 71889f142..e9ad881e9 100644
--- a/src/util.h
+++ b/src/util.h
@@ -265,6 +265,7 @@ char *format_timestamp_pretty(char *buf, size_t l, usec_t t);
 char *format_timespan(char *buf, size_t l, usec_t t);
 
 int make_stdio(int fd);
+int make_null_stdio(void);
 
 bool is_clean_exit(int code, int status);
 bool is_clean_exit_lsb(int code, int status);
@@ -354,6 +355,7 @@ char *ellipsize(const char *s, unsigned length, unsigned percent);
 int touch(const char *path);
 
 char *unquote(const char *s, const char *quotes);
+char *normalize_env_assignment(const char *s);
 
 int wait_for_terminate(pid_t pid, siginfo_t *status);
 int wait_for_terminate_and_warn(const char *name, pid_t pid);
@@ -362,16 +364,23 @@ _noreturn_ void freeze(void);
 
 bool null_or_empty(struct stat *st);
 
-DIR *xopendirat(int dirfd, const char *name);
-
-int ask_password_tty(const char *message, usec_t until, const char *flag_file, char **_passphrase);
+DIR *xopendirat(int dirfd, const char *name, int flags);
 
 void dual_timestamp_serialize(FILE *f, const char *name, dual_timestamp *t);
-void dual_timestamp_deserialize(FILE *f, const char *line, dual_timestamp *t);
+void dual_timestamp_deserialize(const char *value, dual_timestamp *t);
+
+char *fstab_node_to_udev_node(const char *p);
+
+void filter_environ(const char *prefix);
 
-#define NULSTR_FOREACH(i, l) \
+const char *default_term_for_tty(const char *tty);
+
+#define NULSTR_FOREACH(i, l)                                    \
         for ((i) = (l); (i) && *(i); (i) = strchr((i), 0)+1)
 
+#define NULSTR_FOREACH_PAIR(i, j, l)                             \
+        for ((i) = (l), (j) = strchr((i), 0)+1; (i) && *(i); (i) = strchr((j), 0)+1, (j) = *(i) ? strchr((i), 0)+1 : (i))
+
 const char *ioprio_class_to_string(int i);
 int ioprio_class_from_string(const char *s);