chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build-sys: bump version
[elogind.git]
/
src
/
util.h
diff --git
a/src/util.h
b/src/util.h
index 3898b89ff1ba49b02c36a1e3d2e45faed36cc3a7..04afc731e9d29f1d48fb518ee78cefb17f0fc856 100644
(file)
--- a/
src/util.h
+++ b/
src/util.h
@@
-83,6
+83,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);
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)
#define streq(a,b) (strcmp((a),(b)) == 0)
#define strneq(a, b, n) (strncmp((a), (b), (n)) == 0)
@@
-195,6
+198,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 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);
char *strappend(const char *s, const char *suffix);
char *strnappend(const char *s, const char *suffix, size_t length);
@@
-331,7
+335,12
@@
void sigset_add_many(sigset_t *ss, ...);
char* gethostname_malloc(void);
char* getlogname_malloc(void);
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);
int chmod_and_chown(const char *path, mode_t mode, uid_t uid, gid_t gid);
@@
-373,10
+382,16
@@
void filter_environ(const char *prefix);
bool tty_is_vc(const char *tty);
const char *default_term_for_tty(const char *tty);
bool tty_is_vc(const char *tty);
const char *default_term_for_tty(const char *tty);
-bool running_in_vm(void);
+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[]);
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)
#define NULSTR_FOREACH(i, l) \
for ((i) = (l); (i) && *(i); (i) = strchr((i), 0)+1)