mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-04 23:43:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3412 from RedSoxFan/fix-cont-line-num

Browse source 
config: fix line number with continued lines
This commit is contained in:
Ian Fan 2019-01-12 22:05:18 +00:00 committed by GitHub
parent bc808680b1 b43345a1a3
commit a43863aa60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sway/config.c
View file

@ -571,15 +571,18 @@ bool load_include_configs(const char *path, struct sway_config *config,
} }
// get line, with backslash continuation // get line, with backslash continuation
static ssize_t getline_with_cont(char **lineptr, size_t *line_size, FILE *file) { static ssize_t getline_with_cont(char **lineptr, size_t *line_size, FILE *file,
int *nlines) {
char *next_line = NULL; char *next_line = NULL;
size_t next_line_size = 0; size_t next_line_size = 0;
ssize_t nread = getline(lineptr, line_size, file); ssize_t nread = getline(lineptr, line_size, file);
*nlines = nread == -1 ? 0 : 1;
while (nread >= 2 && strcmp(&(*lineptr)[nread - 2], "\\\n") == 0) { while (nread >= 2 && strcmp(&(*lineptr)[nread - 2], "\\\n") == 0) {
ssize_t next_nread = getline(&next_line, &next_line_size, file); ssize_t next_nread = getline(&next_line, &next_line_size, file);
if (next_nread == -1) { if (next_nread == -1) {
break; break;
} }
(*nlines)++;
nread += next_nread - 2; nread += next_nread - 2;
if ((ssize_t) *line_size < nread + 1) { if ((ssize_t) *line_size < nread + 1) {
@ -663,7 +666,8 @@ 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_with_cont(&line, &line_size, file)) != -1) { int nlines = 0;
while ((nread = getline_with_cont(&line, &line_size, file, &nlines)) != -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");
@ -679,7 +683,7 @@ bool read_config(FILE *file, struct sway_config *config,
line[nread - 1] = '\0'; line[nread - 1] = '\0';
} }
line_number++; line_number += nlines;
wlr_log(WLR_DEBUG, "Read line %d: %s", line_number, line); wlr_log(WLR_DEBUG, "Read line %d: %s", line_number, line);
strip_whitespace(line); strip_whitespace(line);