alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

config.c: re-enable backslash continuation in config file

Browse source
This commit is contained in:
Ian Fan 2018-12-31 23:00:49 +00:00
parent a82b8a3c14
commit a9c5158a77
1 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
sway/config.c
View file

@ -569,6 +569,36 @@ bool load_include_configs(const char *path, struct sway_config *config,
return true; return true;
} }
// get line, with backslash continuation
static ssize_t getline_with_cont(char **lineptr, size_t *line_size, FILE *file) {
char *next_line = NULL;
size_t next_line_size = 0;
ssize_t nread = getline(lineptr, line_size, file);
while (nread >= 2) {
if (strcmp(&(*lineptr)[nread - 2], "\\\n") != 0) {
break;
}
ssize_t next_nread = getline(&next_line, &next_line_size, file);
if (next_nread == -1) {
break;
}
nread += next_nread - 2;
if ((ssize_t) *line_size < nread + 1) {
*line_size = nread + 1;
*lineptr = realloc(*lineptr, *line_size);
if (!lineptr) {
nread = -1;
break;
}
}
strcpy(&(*lineptr)[nread - next_nread], next_line);
}
free(next_line);
return nread;
}
static int detect_brace(FILE *file) { static int detect_brace(FILE *file) {
int lines = 0; int lines = 0;
long pos = ftell(file); long pos = ftell(file);
@ -633,7 +663,7 @@ bool read_config(FILE *file, struct sway_config *config,
ssize_t nread; ssize_t nread;
list_t *stack = create_list(); list_t *stack = create_list();
size_t read = 0; size_t read = 0;
while ((nread = getline(&line, &line_size, file)) != -1) { while ((nread = getline_with_cont(&line, &line_size, file)) != -1) {
if (reading_main_config) { if (reading_main_config) {
if (read + nread > config_size) { if (read + nread > config_size) {
wlr_log(WLR_ERROR, "Config file changed during reading"); wlr_log(WLR_ERROR, "Config file changed during reading");