aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortaiyu <taiyu.len@gmail.com>2015-08-18 02:48:56 -0700
committertaiyu <taiyu.len@gmail.com>2015-08-18 02:48:56 -0700
commite9c3a9016f1df5877404721043967431afb2f5c7 (patch)
tree80fc0c129a98dbd955bb968c63d4d816d91fe6dd
parent2f8a23924893663473e24c4ca3407e8e1005f37e (diff)
config handles comments better
-rw-r--r--sway/config.c2
-rw-r--r--sway/stringop.c2
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;
}