chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ask-password: add basic tty agent
[elogind.git]
/
src
/
util.h
diff --git
a/src/util.h
b/src/util.h
index 4bea1ecc04a204aa1f08250cc2d133926480a028..6a252abbb153f727d7197d178217304030a3f7ad 100644
(file)
--- a/
src/util.h
+++ b/
src/util.h
@@
-31,6
+31,8
@@
#include <signal.h>
#include <sched.h>
#include <limits.h>
#include <signal.h>
#include <sched.h>
#include <limits.h>
+#include <sys/stat.h>
+#include <dirent.h>
#include "macro.h"
#include "macro.h"
@@
-58,6
+60,8
@@
typedef struct dual_timestamp {
/* What is interpreted as whitespace? */
#define WHITESPACE " \t\n\r"
#define NEWLINE "\n\r"
/* What is interpreted as whitespace? */
#define WHITESPACE " \t\n\r"
#define NEWLINE "\n\r"
+#define QUOTES "\"\'"
+#define COMMENTS "#;\n"
#define FORMAT_TIMESTAMP_MAX 64
#define FORMAT_TIMESTAMP_PRETTY_MAX 256
#define FORMAT_TIMESTAMP_MAX 64
#define FORMAT_TIMESTAMP_PRETTY_MAX 256
@@
-71,6
+75,8
@@
usec_t now(clockid_t clock);
dual_timestamp* dual_timestamp_get(dual_timestamp *ts);
dual_timestamp* dual_timestamp_get(dual_timestamp *ts);
+#define dual_timestamp_is_set(ts) ((ts)->realtime > 0)
+
usec_t timespec_load(const struct timespec *ts);
struct timespec *timespec_store(struct timespec *ts, usec_t u);
usec_t timespec_load(const struct timespec *ts);
struct timespec *timespec_store(struct timespec *ts, usec_t u);
@@
-78,6
+84,7
@@
usec_t timeval_load(const struct timeval *tv);
struct timeval *timeval_store(struct timeval *tv, usec_t u);
#define streq(a,b) (strcmp((a),(b)) == 0)
struct timeval *timeval_store(struct timeval *tv, usec_t u);
#define streq(a,b) (strcmp((a),(b)) == 0)
+#define strneq(a, b, n) (strncmp((a), (b), (n)) == 0)
bool streq_ptr(const char *a, const char *b);
bool streq_ptr(const char *a, const char *b);
@@
-185,6
+192,9
@@
pid_t get_parent_of_pid(pid_t pid, pid_t *ppid);
int write_one_line_file(const char *fn, const char *line);
int read_one_line_file(const char *fn, char **line);
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_;
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);
@@
-343,9
+353,18
@@
char *ellipsize(const char *s, unsigned length, unsigned percent);
int touch(const char *path);
int touch(const char *path);
-char *unquote(const char *s, const char quote);
+char *unquote(const char *s, const char *quotes);
+
+int wait_for_terminate(pid_t pid, siginfo_t *status);
+int wait_for_terminate_and_warn(const char *name, pid_t pid);
+
+_noreturn_ void freeze(void);
-int waitpid_loop(pid_t pid, int *status);
+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);
#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)
@@
-374,4
+393,6
@@
int ip_tos_from_string(const char *s);
const char *signal_to_string(int i);
int signal_from_string(const char *s);
const char *signal_to_string(int i);
int signal_from_string(const char *s);
+int signal_from_string_try_harder(const char *s);
+
#endif
#endif