aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <bosrsf04@gmail.com>2019-02-11 03:59:11 -0500
committerLibravatar Drew DeVault <sir@cmpwn.com>2019-02-11 10:22:53 -0500
commit40023d45a18abb0e177818fa60b8a359680eb3c3 (patch)
tree5130af706e651c60198522070723270c9e2c78ec
parentfix misc memory leaks (diff)
downloadsway-40023d45a18abb0e177818fa60b8a359680eb3c3.tar.gz
sway-40023d45a18abb0e177818fa60b8a359680eb3c3.tar.zst
sway-40023d45a18abb0e177818fa60b8a359680eb3c3.zip
Abort early when XDG_RUNTIME_DIR is not set
This aborts sway and displays an error message about XDG_RUNTIME_DIR not being set without initializing the wl_display or logging any other information.
-rw-r--r--sway/main.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/sway/main.c b/sway/main.c
index 12f92bd8..b118a182 100644
--- a/sway/main.c
+++ b/sway/main.c
@@ -299,6 +299,14 @@ int main(int argc, char **argv) {
299 } 299 }
300 } 300 }
301 301
302 // Since wayland requires XDG_RUNTIME_DIR to be set, abort with just the
303 // clear error message (when not running as an IPC client).
304 if (!getenv("XDG_RUNTIME_DIR") && optind == argc) {
305 fprintf(stderr,
306 "XDG_RUNTIME_DIR is not set in the environment. Aborting.\n");
307 exit(EXIT_FAILURE);
308 }
309
302 // As the 'callback' function for wlr_log is equivalent to that for 310 // As the 'callback' function for wlr_log is equivalent to that for
303 // sway, we do not need to override it. 311 // sway, we do not need to override it.
304 if (debug) { 312 if (debug) {