X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Futil.h;h=79e98be20bd067cc661a616f994ba3ef9277afe2;hb=9131f660eedb29d18a29e6efff49c485e683c56c;hp=b469009bf7e151da121beb6e103f90236f1d3b28;hpb=799fd0fd23028a58e1f605c6b0d9aaab65b4fb1f;p=elogind.git

diff --git a/src/util.h b/src/util.h
index b469009bf..79e98be20 100644
--- a/src/util.h
+++ b/src/util.h
@@ -25,6 +25,7 @@
 #include <inttypes.h>
 #include <time.h>
 #include <sys/time.h>
+#include <stdarg.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -83,6 +84,9 @@ struct timespec *timespec_store(struct timespec *ts, usec_t u);
 usec_t timeval_load(const struct timeval *tv);
 struct timeval *timeval_store(struct timeval *tv, usec_t u);
 
+size_t page_size(void);
+#define PAGE_ALIGN(l) ALIGN_TO((l), page_size())
+
 #define streq(a,b) (strcmp((a),(b)) == 0)
 #define strneq(a, b, n) (strncmp((a), (b), (n)) == 0)
 
@@ -114,6 +118,10 @@ static inline bool is_path_absolute(const char *p) {
         return *p == '/';
 }
 
+static inline bool isempty(const char *p) {
+        return !p || !p[0];
+}
+
 bool endswith(const char *s, const char *postfix);
 bool startswith(const char *s, const char *prefix);
 bool startswith_no_case(const char *s, const char *prefix);
@@ -189,12 +197,15 @@ char *split_quoted(const char *c, size_t *l, char **state);
 char **split_path_and_make_absolute(const char *p);
 
 pid_t get_parent_of_pid(pid_t pid, pid_t *ppid);
+int get_starttime_of_pid(pid_t pid, unsigned long long *st);
 
 int write_one_line_file(const char *fn, const char *line);
 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);
+int write_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);
@@ -214,6 +225,7 @@ char *path_make_absolute_cwd(const char *p);
 
 char **strv_path_make_absolute_cwd(char **l);
 char **strv_path_canonicalize(char **l);
+char **strv_path_remove_empty(char **l);
 
 int reset_all_signal_handlers(void);
 
@@ -267,9 +279,6 @@ 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);
-
 unsigned long long random_ull(void);
 
 #define DEFINE_STRING_TABLE_LOOKUP(name,type)                           \
@@ -334,7 +343,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, dev_t *_devnr);
 
 int chmod_and_chown(const char *path, mode_t mode, uid_t uid, gid_t gid);
 
@@ -355,6 +369,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);
@@ -363,14 +378,40 @@ _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(const char *value, dual_timestamp *t);
 
-#define NULSTR_FOREACH(i, l) \
+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_container(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);
+
+bool plymouth_running(void);
+
+void parse_syslog_priority(char **p, int *priority);
+
+int have_effective_cap(int value);
+
+bool hostname_is_valid(const char *s);
+char* hostname_cleanup(char *s);
+
+char* strshorten(char *s, size_t l);
+
+#define NULSTR_FOREACH(i, l)                                    \
         for ((i) = (l); (i) && *(i); (i) = strchr((i), 0)+1)
 
 #define NULSTR_FOREACH_PAIR(i, j, l)                             \
@@ -382,8 +423,8 @@ int ioprio_class_from_string(const char *s);
 const char *sigchld_code_to_string(int i);
 int sigchld_code_from_string(const char *s);
 
-const char *log_facility_to_string(int i);
-int log_facility_from_string(const char *s);
+const char *log_facility_unshifted_to_string(int i);
+int log_facility_unshifted_from_string(const char *s);
 
 const char *log_level_to_string(int i);
 int log_level_from_string(const char *s);
@@ -402,4 +443,5 @@ int signal_from_string(const char *s);
 
 int signal_from_string_try_harder(const char *s);
 
+int conf_files_list(char ***strv, const char *suffix, const char *dir, ...);
 #endif