aboutsummaryrefslogtreecommitdiff
path: root/sway/config.c
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2016-03-26 12:58:19 -0400
committerDrew DeVault <sir@cmpwn.com>2016-03-26 12:58:19 -0400
commit504a88434f5ec1ab9361347cd8b3716042ea6dda (patch)
treec6ed655e5db42ff40d3d1eb2bebe42f8233f7f88 /sway/config.c
parent3b849ce5a6387f2b95936ea225f2047e79a5b0c3 (diff)
parentcdc73fd95e569c02e6b22762276e975a89a90c0f (diff)
Merge pull request #546 from mikkeloscar/include-handle-dir
Don't try to read config if not a file.
Diffstat (limited to 'sway/config.c')
-rw-r--r--sway/config.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sway/config.c b/sway/config.c
index c30c1767..a877261c 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -6,6 +6,7 @@
#include <wordexp.h>
#include <sys/types.h>
#include <sys/wait.h>
+#include <sys/stat.h>
#include <signal.h>
#include <libinput.h>
#include <limits.h>
@@ -245,6 +246,11 @@ static char *get_config_path(void) {
static bool load_config(const char *path, struct sway_config *config) {
sway_log(L_INFO, "Loading config from %s", path);
+ struct stat sb;
+ if (stat(path, &sb) == 0 && S_ISDIR(sb.st_mode)) {
+ return false;
+ }
+
if (path == NULL) {
sway_log(L_ERROR, "Unable to find a config file!");
return false;