diff options
| -rw-r--r-- | calmwm.c | 11 | ||||
| -rw-r--r-- | calmwm.h | 4 | ||||
| -rw-r--r-- | conf.c | 4 |
3 files changed, 9 insertions, 10 deletions
@@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: calmwm.c,v 1.99 2016/10/18 17:03:30 okan Exp $ + * $OpenBSD: calmwm.c,v 1.100 2017/12/07 15:47:14 okan Exp $ */ #include <sys/types.h> @@ -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); @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: calmwm.h,v 1.341 2017/07/14 17:23:38 okan Exp $ + * $OpenBSD: calmwm.h,v 1.342 2017/12/07 15:47:14 okan Exp $ */ #ifndef _CALMWM_H_ @@ -293,6 +293,7 @@ struct conf { Cursor cursor[CF_NITEMS]; int xrandr; int xrandr_event_base; + char *homedir; char *wm_argv; }; @@ -374,7 +375,6 @@ extern Atom cwmh[CWMH_NITEMS]; extern Atom ewmh[EWMH_NITEMS]; extern struct screen_q Screenq; extern struct conf Conf; -extern const char *homedir; __dead void usage(void); @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: conf.c,v 1.233 2017/07/14 17:23:38 okan Exp $ + * $OpenBSD: conf.c,v 1.234 2017/12/07 15:47:14 okan Exp $ */ #include <sys/types.h> @@ -297,7 +297,7 @@ conf_init(struct conf *c) conf_cmd_add(c, "term", "xterm"); (void)snprintf(c->known_hosts, sizeof(c->known_hosts), "%s/%s", - homedir, ".ssh/known_hosts"); + c->homedir, ".ssh/known_hosts"); c->font = xstrdup("sans-serif:pixelsize=14:bold"); c->wmname = xstrdup("CWM"); |