chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rtc in localtime: use settimeofday(NULL, tz) instead of hwclock(8)
[elogind.git]
/
src
/
util.h
diff --git
a/src/util.h
b/src/util.h
index 7fa488b0f57c0edb3e764e5a24eea8b9fe348a50..79d634bb6343b02dc0ea2dc0261740667daa4e96 100644
(file)
--- a/
src/util.h
+++ b/
src/util.h
@@
-25,6
+25,7
@@
#include <inttypes.h>
#include <time.h>
#include <sys/time.h>
#include <inttypes.h>
#include <time.h>
#include <sys/time.h>
+#include <stdarg.h>
#include <stdbool.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdbool.h>
#include <stdlib.h>
#include <stdio.h>
@@
-224,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_make_absolute_cwd(char **l);
char **strv_path_canonicalize(char **l);
+char **strv_path_remove_empty(char **l);
int reset_all_signal_handlers(void);
int reset_all_signal_handlers(void);
@@
-313,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 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);
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);
@@
-409,6
+413,11
@@
char* hostname_cleanup(char *s);
char* strshorten(char *s, size_t l);
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)
#define NULSTR_FOREACH(i, l) \
for ((i) = (l); (i) && *(i); (i) = strchr((i), 0)+1)
@@
-441,5
+450,14
@@
int signal_from_string(const char *s);
int signal_from_string_try_harder(const char *s);
int signal_from_string_try_harder(const char *s);
-char **conf_files_list(const char *suffix, const char *dir, ...);
+int conf_files_list(char ***strv, const char *suffix, const char *dir, ...);
+
+bool hwclock_is_localtime(void);
+
+int hwclock_apply_localtime_delta(void);
+
+int hwclock_get_time(struct tm *tm);
+
+int hwclock_set_time(const struct tm *tm);
+
#endif
#endif