From e9c3a9016f1df5877404721043967431afb2f5c7 Mon Sep 17 00:00:00 2001 From: taiyu Date: Tue, 18 Aug 2015 02:48:56 -0700 Subject: [PATCH] config handles comments better --- sway/config.c | 2 +- sway/stringop.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sway/config.c b/sway/config.c index f06d55f8..44943769 100644 --- a/sway/config.c +++ b/sway/config.c @@ -188,8 +188,8 @@ bool read_config(FILE *file, bool is_active) { while (!feof(file)) { int _; char *line = read_line(file); - line = strip_whitespace(line, &_); line = strip_comments(line); + line = strip_whitespace(line, &_); if (!line[0]) { goto _continue; } diff --git a/sway/stringop.c b/sway/stringop.c index 1dff97bf..cbaa69b9 100644 --- a/sway/stringop.c +++ b/sway/stringop.c @@ -40,7 +40,7 @@ char *strip_comments(char *str) { } else if (str[i] == '\'' && !in_string) { in_character = !in_character; } else if (!in_character && !in_string) { - if (str[i] == '#' && i == 0) { + if (str[i] == '#') { str[i] = '\0'; break; }