diff options
author | Ian Fan <ianfan0@gmail.com> | 2019-01-01 09:01:09 +0000 |
---|---|---|
committer | Ian Fan <ianfan0@gmail.com> | 2019-01-01 09:01:25 +0000 |
commit | bd35879e1cfda51accc68c9890980dce59eb006a (patch) | |
tree | 1fc93c731567ec13f4818ef42bb731dcef6277c3 /sway/config.c | |
parent | config.c: re-enable backslash continuation in config file (diff) | |
download | sway-bd35879e1cfda51accc68c9890980dce59eb006a.tar.gz sway-bd35879e1cfda51accc68c9890980dce59eb006a.tar.zst sway-bd35879e1cfda51accc68c9890980dce59eb006a.zip |
fixup! config.c: re-enable backslash continuation in config file
Diffstat (limited to 'sway/config.c')
-rw-r--r-- | sway/config.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sway/config.c b/sway/config.c index 4177ea10..9f32d44c 100644 --- a/sway/config.c +++ b/sway/config.c | |||
@@ -574,11 +574,7 @@ static ssize_t getline_with_cont(char **lineptr, size_t *line_size, FILE *file) | |||
574 | char *next_line = NULL; | 574 | char *next_line = NULL; |
575 | size_t next_line_size = 0; | 575 | size_t next_line_size = 0; |
576 | ssize_t nread = getline(lineptr, line_size, file); | 576 | ssize_t nread = getline(lineptr, line_size, file); |
577 | while (nread >= 2) { | 577 | while (nread >= 2 && strcmp(&(*lineptr)[nread - 2], "\\\n") == 0) { |
578 | if (strcmp(&(*lineptr)[nread - 2], "\\\n") != 0) { | ||
579 | break; | ||
580 | } | ||
581 | |||
582 | ssize_t next_nread = getline(&next_line, &next_line_size, file); | 578 | ssize_t next_nread = getline(&next_line, &next_line_size, file); |
583 | if (next_nread == -1) { | 579 | if (next_nread == -1) { |
584 | break; | 580 | break; |
@@ -588,7 +584,7 @@ static ssize_t getline_with_cont(char **lineptr, size_t *line_size, FILE *file) | |||
588 | if ((ssize_t) *line_size < nread + 1) { | 584 | if ((ssize_t) *line_size < nread + 1) { |
589 | *line_size = nread + 1; | 585 | *line_size = nread + 1; |
590 | *lineptr = realloc(*lineptr, *line_size); | 586 | *lineptr = realloc(*lineptr, *line_size); |
591 | if (!lineptr) { | 587 | if (!*lineptr) { |
592 | nread = -1; | 588 | nread = -1; |
593 | break; | 589 | break; |
594 | } | 590 | } |