nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2012-02-12 10:21:01 +00:00
parent fd2ff3a6ef 630a820ccd
commit 51728bab77
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
i3-config-wizard/main.c
View File

@ -295,6 +295,7 @@ static void finish() {
FILE *ks_config = fopen(config_path, "w"); FILE *ks_config = fopen(config_path, "w");
if (ks_config == NULL) if (ks_config == NULL)
err(1, "Could not open output config file \"%s\"", config_path); err(1, "Could not open output config file \"%s\"", config_path);
free(config_path);
char *line = NULL; char *line = NULL;
size_t len = 0; size_t len = 0;
@ -331,8 +332,11 @@ static void finish() {
/* Skip leading whitespace */ /* Skip leading whitespace */
char *walk = line; char *walk = line;
while (isspace(*walk) && walk < (line + len)) while (isspace(*walk) && walk < (line + len)) {
/* Pre-output the skipped whitespaces to keep proper indentation */
fputc(*walk, ks_config);
walk++; walk++;
}
/* Set the modifier the user chose */ /* Set the modifier the user chose */
if (strncmp(walk, "set $mod ", strlen("set $mod ")) == 0) { if (strncmp(walk, "set $mod ", strlen("set $mod ")) == 0) {
@ -345,7 +349,7 @@ static void finish() {
/* Check for 'bindcode'. If it’s not a bindcode line, we /* Check for 'bindcode'. If it’s not a bindcode line, we
* just copy it to the output file */ * just copy it to the output file */
if (strncmp(walk, "bindcode", strlen("bindcode")) != 0) { if (strncmp(walk, "bindcode", strlen("bindcode")) != 0) {
fputs(line, ks_config); fputs(walk, ks_config);
continue; continue;
} }
char *result = rewrite_binding(walk); char *result = rewrite_binding(walk);