X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Futil.h;h=04049f7d9277d802a9beb3e4a5715c8016d7b2e5;hb=572481b9094f7f1fbba69f1bd0c8f7db31550b01;hp=cc63dd1a8302f7cc15749cf81c12753aa602f97d;hpb=7d76f312889d54dcfe6fdde6eb055e890e7a615b;p=elogind.git diff --git a/src/util.h b/src/util.h index cc63dd1a8..04049f7d9 100644 --- a/src/util.h +++ b/src/util.h @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -117,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); @@ -192,6 +197,7 @@ 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); @@ -199,6 +205,7 @@ 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); @@ -218,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); @@ -307,7 +315,9 @@ 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 reset_terminal_fd(int fd); +int reset_terminal(const char *name); + int open_terminal(const char *name, int mode); int acquire_terminal(const char *name, bool fail, bool force, bool ignore_tiocstty_eperm); int release_terminal(void); @@ -394,6 +404,20 @@ 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); + +int terminal_vhangup_fd(int fd); +int terminal_vhangup(const char *name); + +int vt_disallocate(const char *name); + #define NULSTR_FOREACH(i, l) \ for ((i) = (l); (i) && *(i); (i) = strchr((i), 0)+1) @@ -426,4 +450,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