diff options
author | Drew DeVault <sir@cmpwn.com> | 2015-10-18 14:25:57 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2015-10-18 14:25:57 -0400 |
commit | 83c23f274c89e31473fd13b93f287e1c7516a040 (patch) | |
tree | 1ffdb8fcfa91ea9e37a932e58ea7d878c6639cc7 | |
parent | Merge pull request #194 from sce/ignore_no_startup_id (diff) | |
parent | main: Implement --get-socketpath switch. (diff) | |
download | sway-83c23f274c89e31473fd13b93f287e1c7516a040.tar.gz sway-83c23f274c89e31473fd13b93f287e1c7516a040.tar.zst sway-83c23f274c89e31473fd13b93f287e1c7516a040.zip |
Merge pull request #195 from sce/get_socketpath
main: Implement --get-socketpath switch.
-rw-r--r-- | include/ipc.h | 1 | ||||
-rw-r--r-- | sway/main.c | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/include/ipc.h b/include/ipc.h index 2d71c666..1932ad2d 100644 --- a/include/ipc.h +++ b/include/ipc.h | |||
@@ -14,5 +14,6 @@ enum ipc_command_type { | |||
14 | 14 | ||
15 | void ipc_init(void); | 15 | void ipc_init(void); |
16 | void ipc_terminate(void); | 16 | void ipc_terminate(void); |
17 | struct sockaddr_un *ipc_user_sockaddr(void); | ||
17 | 18 | ||
18 | #endif | 19 | #endif |
diff --git a/sway/main.c b/sway/main.c index de17f440..a4fe5823 100644 --- a/sway/main.c +++ b/sway/main.c | |||
@@ -4,6 +4,7 @@ | |||
4 | #include <wlc/wlc.h> | 4 | #include <wlc/wlc.h> |
5 | #include <sys/wait.h> | 5 | #include <sys/wait.h> |
6 | #include <sys/types.h> | 6 | #include <sys/types.h> |
7 | #include <sys/un.h> | ||
7 | #include <signal.h> | 8 | #include <signal.h> |
8 | #include <getopt.h> | 9 | #include <getopt.h> |
9 | #include "layout.h" | 10 | #include "layout.h" |
@@ -105,8 +106,11 @@ int main(int argc, char **argv) { | |||
105 | case 'V': // verbose | 106 | case 'V': // verbose |
106 | verbose = 1; | 107 | verbose = 1; |
107 | break; | 108 | break; |
108 | case 'p': // --get-socketpath | 109 | case 'p': ; // --get-socketpath |
109 | // TODO | 110 | struct sockaddr_un *ipc_sockaddr = ipc_user_sockaddr(); |
111 | fprintf(stdout, "%s\n", ipc_sockaddr->sun_path); | ||
112 | free(ipc_sockaddr); | ||
113 | exit(0); | ||
110 | break; | 114 | break; |
111 | } | 115 | } |
112 | } | 116 | } |