diff options
| author | emersion <contact@emersion.fr> | 2019-01-10 13:29:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-10 13:29:21 +0100 |
| commit | 212baf2f75dca0279759ce6c27cfc68541b1b922 (patch) | |
| tree | 7f5697b70e4c3c679b597adec003a90459f02e4a | |
| parent | 15ac580b28a2906d799fd709e83cb75e0efc3f45 (diff) | |
| parent | 00f8d0209f814bb7c4c235383e4f00e32d964e31 (diff) | |
| download | sway-212baf2f75dca0279759ce6c27cfc68541b1b922.tar.xz | |
Merge pull request #3400 from ianyfan/config-brace
config.c: fix brace detection at end of file
| -rw-r--r-- | sway/config.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sway/config.c b/sway/config.c index f99f043c..ea9f23dd 100644 --- a/sway/config.c +++ b/sway/config.c @@ -597,6 +597,7 @@ static ssize_t getline_with_cont(char **lineptr, size_t *line_size, FILE *file) } static int detect_brace(FILE *file) { + int ret = 0; int lines = 0; long pos = ftell(file); char *line = NULL; @@ -605,15 +606,15 @@ static int detect_brace(FILE *file) { lines++; strip_whitespace(line); if (*line) { - if (strcmp(line, "{") != 0) { - fseek(file, pos, SEEK_SET); - lines = 0; + if (strcmp(line, "{") == 0) { + ret = lines; } break; } } free(line); - return lines; + fseek(file, pos, SEEK_SET); + return ret; } static char *expand_line(const char *block, const char *line, bool add_brace) { |