chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logind: create private subdirectory for X11 socket
[elogind.git]
/
src
/
util.h
diff --git
a/src/util.h
b/src/util.h
index ceabe92cf444f93c29b0047bfbe2d05127c03097..083da2a545f8660ba4485f788f7a91549311aa0e 100644
(file)
--- a/
src/util.h
+++ b/
src/util.h
@@
-353,8
+353,8
@@
char* getlogname_malloc(void);
int getttyname_malloc(int fd, char **r);
int getttyname_harder(int fd, 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 *_devn
r);
+int get_ctty_devnr(
pid_t pid,
dev_t *d);
+int get_ctty(
pid_t, dev_t *_devnr, char **
r);
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);
@@
-442,6
+442,9
@@
int hwclock_set_time(const struct tm *tm);
int audit_session_from_pid(pid_t pid, uint32_t *id);
int audit_session_from_pid(pid_t pid, uint32_t *id);
+bool display_is_local(const char *display);
+int socket_from_display(const char *display, char **path);
+
#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)
@@
-474,4
+477,7
@@
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);
+extern int saved_argc;
+extern char **saved_argv;
+
#endif
#endif