diff options
| author | okan <okan> | 2017-12-07 15:47:14 +0000 |
|---|---|---|
| committer | okan <okan> | 2017-12-07 15:47:14 +0000 |
| commit | b06ddae6249cca671046d04c0cf709cd0c48fd90 (patch) | |
| tree | 371aa4a0628e34c2b3b5ae4c16e0c03d948763a7 /calmwm.c | |
| parent | 0d76265e23f497624e5390759e612a2b16a6b5b9 (diff) | |
| download | cwm-b06ddae6249cca671046d04c0cf709cd0c48fd90.tar.gz cwm-b06ddae6249cca671046d04c0cf709cd0c48fd90.tar.xz cwm-b06ddae6249cca671046d04c0cf709cd0c48fd90.zip | |
stash dir into conf since it'll be of use
Diffstat (limited to 'calmwm.c')
| -rw-r--r-- | calmwm.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/calmwm.c b/calmwm.c index 25df3b8..03d594b 100644 --- a/calmwm.c +++ b/calmwm.c @@ -42,7 +42,6 @@ Atom cwmh[CWMH_NITEMS]; Atom ewmh[EWMH_NITEMS]; struct screen_q Screenq = TAILQ_HEAD_INITIALIZER(Screenq); struct conf Conf; -const char *homedir; volatile sig_atomic_t cwm_status; static void sighdlr(int); @@ -82,16 +81,16 @@ main(int argc, char **argv) if (signal(SIGCHLD, sighdlr) == SIG_ERR) err(1, "signal"); - if ((homedir = getenv("HOME")) == NULL || *homedir == '\0') { + if ((Conf.homedir = getenv("HOME")) == NULL || Conf.homedir[0] == '\0') { pw = getpwuid(getuid()); if (pw != NULL && pw->pw_dir != NULL && *pw->pw_dir != '\0') - homedir = pw->pw_dir; + Conf.homedir = pw->pw_dir; else - homedir = "/"; + Conf.homedir = "/"; } if (conf_file == NULL) - xasprintf(&conf_path, "%s/%s", homedir, CONFFILE); + xasprintf(&conf_path, "%s/%s", Conf.homedir, CONFFILE); else conf_path = xstrdup(conf_file); |