Commit ee721f1e authored by antirez's avatar antirez
Browse files

CONFIG REWRITE: strip multiple empty lines.

parent c184f36d
...@@ -1397,11 +1397,20 @@ void rewriteConfigClientoutputbufferlimitOption(struct rewriteConfigState *state ...@@ -1397,11 +1397,20 @@ void rewriteConfigClientoutputbufferlimitOption(struct rewriteConfigState *state
} }
} }
/* Glue together the configuration lines in the current configuration
* rewrite state into a single string, stripping multiple empty lines. */
sds rewriteConfigGetContentFromState(struct rewriteConfigState *state) { sds rewriteConfigGetContentFromState(struct rewriteConfigState *state) {
sds content = sdsempty(); sds content = sdsempty();
int j; int j, was_empty = 0;
for (j = 0; j < state->numlines; j++) { for (j = 0; j < state->numlines; j++) {
/* Every cluster of empty lines is turned into a single empty line. */
if (sdslen(state->lines[j]) == 0) {
if (was_empty) continue;
was_empty = 1;
} else {
was_empty = 0;
}
content = sdscatsds(content,state->lines[j]); content = sdscatsds(content,state->lines[j]);
content = sdscatlen(content,"\n",1); content = sdscatlen(content,"\n",1);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment