X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Futil.h;h=13e5f6203ac9233980287f25b7cbf5a0562cbff9;hp=c8cae703a2bc8e6bce46e6050af05b77bfdf4e45;hb=05feefe0fb049bb0f7c59584058ee0350462920c;hpb=9a57c62944258c750d80bca4fe56de4dbab46d67

diff --git a/src/util.h b/src/util.h
index c8cae703a..13e5f6203 100644
--- a/src/util.h
+++ b/src/util.h
@@ -195,6 +195,7 @@ int read_one_line_file(const char *fn, char **line);
 int read_full_file(const char *fn, char **contents);
 
 int parse_env_file(const char *fname, const char *separator, ...) _sentinel_;
+int load_env_file(const char *fname, char ***l);
 
 char *strappend(const char *s, const char *suffix);
 char *strnappend(const char *s, const char *suffix, size_t length);
@@ -331,7 +332,12 @@ void sigset_add_many(sigset_t *ss, ...);
 
 char* gethostname_malloc(void);
 char* getlogname_malloc(void);
-int getttyname_malloc(char **r);
+
+int getttyname_malloc(int fd, char **r);
+int getttyname_harder(int fd, char **r);
+
+int get_ctty_devnr(dev_t *d);
+int get_ctty(char **r);
 
 int chmod_and_chown(const char *path, mode_t mode, uid_t uid, gid_t gid);
 
@@ -370,8 +376,18 @@ char *fstab_node_to_udev_node(const char *p);
 
 void filter_environ(const char *prefix);
 
+bool tty_is_vc(const char *tty);
 const char *default_term_for_tty(const char *tty);
 
+int detect_vm(const char **id);
+int detect_virtualization(const char **id);
+
+void execute_directory(const char *directory, DIR *_d, char *argv[]);
+
+int kill_and_sigcont(pid_t pid, int sig);
+
+bool nulstr_contains(const char*nulstr, const char *needle);
+
 #define NULSTR_FOREACH(i, l)                                    \
         for ((i) = (l); (i) && *(i); (i) = strchr((i), 0)+1)