mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-06 13:29:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Abstracted load_config

Browse source
This commit is contained in:
Luminarys 2015-08-10 14:22:22 -05:00
parent 7c02a1967b
commit 508980e3ab
4 changed files with 26 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

22
sway/main.c
View file

@ -9,24 +9,6 @@
struct sway_config *config;
void load_config() {
// TODO: Allow use of more config file locations
const char *name = "/.sway/config";
const char *home = getenv("HOME");
char *temp = malloc(strlen(home) + strlen(name) + 1);
strcpy(temp, home);
strcat(temp, name);
FILE *f = fopen(temp, "r");
if (!f) {
fprintf(stderr, "Unable to open %s for reading", temp);
free(temp);
exit(1);
}
free(temp);
config = read_config(f, false);
fclose(f);
}
int main(int argc, char **argv) {
init_log(L_DEBUG); // TODO: Control this with command line arg
init_layout();
@ -61,7 +43,9 @@ int main(int argc, char **argv) {
}
setenv("DISPLAY", ":1", 1);
load_config();
if (load_config()) {
exit(1);
}
wlc_run();
return 0;