ucx: comparison src/properties.c

-:fcebf53de51c
+:f2b63cad2142
 #include "cx/properties.h"
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
+#include <ctype.h>
 const CxPropertiesConfig cx_properties_config_default = {
 '=',
 '#',
 '\0',
 '\0',
 '\\',
 };
 void cxPropertiesInit(
 CxProperties *prop,
 return CX_PROPERTIES_NULL_INPUT;
 }
 // a pointer to the buffer we want to read from
 CxBuffer *current_buffer = &prop->input;
+char comment1 = prop->config.comment1;
+char comment2 = prop->config.comment2;
+char comment3 = prop->config.comment3;
+char delimiter = prop->config.delimiter;
+char continuation = prop->config.continuation;
 // check if we have rescued data
 if (!cxBufferEof(&prop->buffer)) {
 // check if we can now get a complete line
 cxstring input = cx_strn(prop->input.space + prop->input.pos,
 prop->input.size - prop->input.pos);
 cxstring nl = cx_strchr(input, '\n');
+while (nl.length > 0) {
+// check for line continuation
+char previous = nl.ptr > input.ptr ? nl.ptr[-1] : prop->buffer.space[prop->buffer.size-1];
+if (previous == continuation) {
+// this nl is a line continuation, check the next newline
+nl = cx_strchr(cx_strsubs(nl, 1), '\n');
+} else {
+break;
+}
+}
 if (nl.length > 0) {
 // we add as much data to the rescue buffer as we need
 // to complete the line
 size_t len_until_nl = (size_t)(nl.ptr - input.ptr) + 1;
 // reset the input buffer (make way for a re-fill)
 cxBufferReset(&prop->input);
 return CX_PROPERTIES_INCOMPLETE_DATA;
 }
 }
-char comment1 = prop->config.comment1;
-char comment2 = prop->config.comment2;
-char comment3 = prop->config.comment3;
-char delimiter = prop->config.delimiter;
 // get one line and parse it
 while (!cxBufferEof(current_buffer)) {
 const char *buf = current_buffer->space + current_buffer->pos;
 size_t len = current_buffer->size - current_buffer->pos;
 * delimiter and comment chars
 */
 size_t delimiter_index = 0;
 size_t comment_index = 0;
 bool has_comment = false;
+bool has_continuation = false;
 size_t i = 0;
 char c = 0;
 for (; i < len; i++) {
 c = buf[i];
 }
 } else if (c == delimiter) {
 if (delimiter_index == 0 && !has_comment) {
 delimiter_index = i;
 }
+} else if (delimiter_index > 0 && c == continuation && i+1 < len && buf[i+1] == '\n') {
+has_continuation = true;
+i++;
 } else if (c == '\n') {
 break;
 }
 }
 buf + delimiter_index + 1,
 line.length - delimiter_index - 1);
 k = cx_strtrim(k);
 val = cx_strtrim(val);
 if (k.length > 0) {
+current_buffer->pos += i + 1;
+assert(current_buffer->pos <= current_buffer->size);
+assert(current_buffer != &prop->buffer || current_buffer->pos == current_buffer->size);
+if (has_continuation) {
+char *ptr = (char*)val.ptr;
+if (current_buffer != &prop->buffer) {
+// move value to the rescue buffer
+if (prop->buffer.space == NULL) {
+cxBufferInit(&prop->buffer, NULL, 256, NULL, CX_BUFFER_AUTO_EXTEND);
+}
+prop->buffer.size = 0;
+prop->buffer.pos = 0;
+if (cxBufferWrite(val.ptr, 1, val.length, &prop->buffer) != val.length) {
+return CX_PROPERTIES_BUFFER_ALLOC_FAILED;
+}
+val.ptr = prop->buffer.space;
+ptr = prop->buffer.space;
+}
+// value.ptr is now inside the rescue buffer and we can
+// remove the continuation character from the value
+bool trim = false;
+size_t x = 0;
+for(size_t j=0;j<val.length;j++) {
+c = ptr[j];
+if (j+1 < val.length && c == '\\' && ptr[j+1] == '\n') {
+// skip continuation and newline character
+j++;
+trim = true; // enable trim in the next line
+continue;
+}
+if (j > x) {
+if (trim) {
+if (isspace((unsigned char)c)) {
+continue;
+}
+trim = false;
+}
+ptr[x] = c;
+}
+x++;
+}
+val.length = x;
+}
 *key = k;
 *value = val;
-current_buffer->pos += i + 1;
-assert(current_buffer->pos <= current_buffer->size);
 return CX_PROPERTIES_NO_ERROR;
 } else {
 return CX_PROPERTIES_INVALID_EMPTY_KEY;
 }
 }

Mercurial > hg > ucx / file comparison

comparison: src/properties.c

src/properties.c