src/properties.c

Wed, 10 Dec 2025 13:12:27 +0100

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Wed, 10 Dec 2025 13:12:27 +0100
changeset 1562
f2b63cad2142
parent 1559
9e50f45f8736
permissions
-rw-r--r--

add support for line continuation in the properties parser - resolves #457

923
45da884269c8 add ucx2.1 style interface for a properties parser
Mike Becker <universe@uap-core.de>
parents:
diff changeset
1 /*
45da884269c8 add ucx2.1 style interface for a properties parser
Mike Becker <universe@uap-core.de>
parents:
diff changeset
2 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
45da884269c8 add ucx2.1 style interface for a properties parser
Mike Becker <universe@uap-core.de>
parents:
diff changeset
3 *
45da884269c8 add ucx2.1 style interface for a properties parser
Mike Becker <universe@uap-core.de>
parents:
diff changeset
4 * Copyright 2024 Mike Becker, Olaf Wintermann All rights reserved.
45da884269c8 add ucx2.1 style interface for a properties parser
Mike Becker <universe@uap-core.de>
parents:
diff changeset
5 *
45da884269c8 add ucx2.1 style interface for a properties parser
Mike Becker <universe@uap-core.de>
parents:
diff changeset
6 * Redistribution and use in source and binary forms, with or without
45da884269c8 add ucx2.1 style interface for a properties parser
Mike Becker <universe@uap-core.de>
parents:
diff changeset
7 * modification, are permitted provided that the following conditions are met:
45da884269c8 add ucx2.1 style interface for a properties parser
Mike Becker <universe@uap-core.de>
parents:
diff changeset
8 *
45da884269c8 add ucx2.1 style interface for a properties parser
Mike Becker <universe@uap-core.de>
parents:
diff changeset
9 * 1. Redistributions of source code must retain the above copyright
45da884269c8 add ucx2.1 style interface for a properties parser
Mike Becker <universe@uap-core.de>
parents:
diff changeset
10 * notice, this list of conditions and the following disclaimer.
45da884269c8 add ucx2.1 style interface for a properties parser
Mike Becker <universe@uap-core.de>
parents:
diff changeset
11 *
45da884269c8 add ucx2.1 style interface for a properties parser
Mike Becker <universe@uap-core.de>
parents:
diff changeset
12 * 2. Redistributions in binary form must reproduce the above copyright
45da884269c8 add ucx2.1 style interface for a properties parser
Mike Becker <universe@uap-core.de>
parents:
diff changeset
13 * notice, this list of conditions and the following disclaimer in the
45da884269c8 add ucx2.1 style interface for a properties parser
Mike Becker <universe@uap-core.de>
parents:
diff changeset
14 * documentation and/or other materials provided with the distribution.
45da884269c8 add ucx2.1 style interface for a properties parser
Mike Becker <universe@uap-core.de>
parents:
diff changeset
15 *
45da884269c8 add ucx2.1 style interface for a properties parser
Mike Becker <universe@uap-core.de>
parents:
diff changeset
16 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
45da884269c8 add ucx2.1 style interface for a properties parser
Mike Becker <universe@uap-core.de>
parents:
diff changeset
17 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
45da884269c8 add ucx2.1 style interface for a properties parser
Mike Becker <universe@uap-core.de>
parents:
diff changeset
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
45da884269c8 add ucx2.1 style interface for a properties parser
Mike Becker <universe@uap-core.de>
parents:
diff changeset
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
45da884269c8 add ucx2.1 style interface for a properties parser
Mike Becker <universe@uap-core.de>
parents:
diff changeset
20 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
45da884269c8 add ucx2.1 style interface for a properties parser
Mike Becker <universe@uap-core.de>
parents:
diff changeset
21 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
45da884269c8 add ucx2.1 style interface for a properties parser
Mike Becker <universe@uap-core.de>
parents:
diff changeset
22 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
45da884269c8 add ucx2.1 style interface for a properties parser
Mike Becker <universe@uap-core.de>
parents:
diff changeset
23 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
45da884269c8 add ucx2.1 style interface for a properties parser
Mike Becker <universe@uap-core.de>
parents:
diff changeset
24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
45da884269c8 add ucx2.1 style interface for a properties parser
Mike Becker <universe@uap-core.de>
parents:
diff changeset
25 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
45da884269c8 add ucx2.1 style interface for a properties parser
Mike Becker <universe@uap-core.de>
parents:
diff changeset
26 * POSSIBILITY OF SUCH DAMAGE.
45da884269c8 add ucx2.1 style interface for a properties parser
Mike Becker <universe@uap-core.de>
parents:
diff changeset
27 */
45da884269c8 add ucx2.1 style interface for a properties parser
Mike Becker <universe@uap-core.de>
parents:
diff changeset
28
45da884269c8 add ucx2.1 style interface for a properties parser
Mike Becker <universe@uap-core.de>
parents:
diff changeset
29 #include "cx/properties.h"
45da884269c8 add ucx2.1 style interface for a properties parser
Mike Becker <universe@uap-core.de>
parents:
diff changeset
30
924
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
31 #include <assert.h>
1555
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
32 #include <stdio.h>
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
33 #include <string.h>
1562
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
34 #include <ctype.h>
924
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
35
923
45da884269c8 add ucx2.1 style interface for a properties parser
Mike Becker <universe@uap-core.de>
parents:
diff changeset
36 const CxPropertiesConfig cx_properties_config_default = {
1562
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
37 '=',
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
38 '#',
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
39 '\0',
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
40 '\0',
1193
cfa44f3f5e3b last minute fixes for issue #548
Mike Becker <universe@uap-core.de>
parents: 1180
diff changeset
41 '\\',
923
45da884269c8 add ucx2.1 style interface for a properties parser
Mike Becker <universe@uap-core.de>
parents:
diff changeset
42 };
924
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
43
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
44 void cxPropertiesInit(
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
45 CxProperties *prop,
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
46 CxPropertiesConfig config
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
47 ) {
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
48 memset(prop, 0, sizeof(CxProperties));
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
49 prop->config = config;
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
50 }
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
51
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
52 void cxPropertiesDestroy(CxProperties *prop) {
1031
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
53 cxBufferDestroy(&prop->input);
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
54 cxBufferDestroy(&prop->buffer);
924
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
55 }
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
56
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1408
diff changeset
57 void cxPropertiesReset(CxProperties *prop) {
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1408
diff changeset
58 CxPropertiesConfig config = prop->config;
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1408
diff changeset
59 cxPropertiesDestroy(prop);
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1408
diff changeset
60 cxPropertiesInit(prop, config);
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1408
diff changeset
61 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1408
diff changeset
62
972
a9a1d07a6840 add support for UCX strings in cxPropertiesFill()
Mike Becker <universe@uap-core.de>
parents: 929
diff changeset
63 int cxPropertiesFilln(
924
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
64 CxProperties *prop,
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
65 const char *buf,
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
66 size_t len
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
67 ) {
1031
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
68 if (cxBufferEof(&prop->input)) {
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
69 // destroy a possible previously initialized buffer
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
70 cxBufferDestroy(&prop->input);
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
71 cxBufferInit(&prop->input, (void*) buf, len,
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
72 NULL, CX_BUFFER_COPY_ON_WRITE | CX_BUFFER_AUTO_EXTEND);
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
73 prop->input.size = len;
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
74 } else {
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
75 if (cxBufferAppend(buf, 1, len, &prop->input) < len) return -1;
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
76 }
924
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
77 return 0;
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
78 }
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
79
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
80 void cxPropertiesUseStack(
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
81 CxProperties *prop,
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
82 char *buf,
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
83 size_t capacity
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
84 ) {
1031
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
85 cxBufferInit(&prop->buffer, buf, capacity, NULL, CX_BUFFER_COPY_ON_EXTEND);
924
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
86 }
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
87
928
d2d42cb1d59e add source/sink facility for properties - fixes #430
Mike Becker <universe@uap-core.de>
parents: 924
diff changeset
88 CxPropertiesStatus cxPropertiesNext(
924
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
89 CxProperties *prop,
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
90 cxstring *key,
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
91 cxstring *value
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
92 ) {
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
93 // check if we have a text buffer
1031
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
94 if (prop->input.space == NULL) {
924
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
95 return CX_PROPERTIES_NULL_INPUT;
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
96 }
1031
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
97
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
98 // a pointer to the buffer we want to read from
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
99 CxBuffer *current_buffer = &prop->input;
1562
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
100
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
101 char comment1 = prop->config.comment1;
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
102 char comment2 = prop->config.comment2;
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
103 char comment3 = prop->config.comment3;
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
104 char delimiter = prop->config.delimiter;
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
105 char continuation = prop->config.continuation;
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
106
924
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
107 // check if we have rescued data
1031
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
108 if (!cxBufferEof(&prop->buffer)) {
924
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
109 // check if we can now get a complete line
1031
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
110 cxstring input = cx_strn(prop->input.space + prop->input.pos,
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
111 prop->input.size - prop->input.pos);
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
112 cxstring nl = cx_strchr(input, '\n');
1562
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
113 while (nl.length > 0) {
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
114 // check for line continuation
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
115 char previous = nl.ptr > input.ptr ? nl.ptr[-1] : prop->buffer.space[prop->buffer.size-1];
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
116 if (previous == continuation) {
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
117 // this nl is a line continuation, check the next newline
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
118 nl = cx_strchr(cx_strsubs(nl, 1), '\n');
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
119 } else {
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
120 break;
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
121 }
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
122 }
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
123
1031
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
124 if (nl.length > 0) {
924
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
125 // we add as much data to the rescue buffer as we need
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
126 // to complete the line
1031
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
127 size_t len_until_nl = (size_t)(nl.ptr - input.ptr) + 1;
924
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
128
1031
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
129 if (cxBufferAppend(input.ptr, 1,
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
130 len_until_nl, &prop->buffer) < len_until_nl) {
924
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
131 return CX_PROPERTIES_BUFFER_ALLOC_FAILED;
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
132 }
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
133
1031
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
134 // advance the position in the input buffer
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
135 prop->input.pos += len_until_nl;
924
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
136
1031
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
137 // we now want to read from the rescue buffer
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
138 current_buffer = &prop->buffer;
924
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
139 } else {
1031
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
140 // still not enough data, copy input buffer to internal buffer
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
141 if (cxBufferAppend(input.ptr, 1,
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
142 input.length, &prop->buffer) < input.length) {
1503
48993e0e0dba add coverage exclusions for properties.c
Mike Becker <universe@uap-core.de>
parents: 1426
diff changeset
143 return CX_PROPERTIES_BUFFER_ALLOC_FAILED; // LCOV_EXCL_LINE
928
d2d42cb1d59e add source/sink facility for properties - fixes #430
Mike Becker <universe@uap-core.de>
parents: 924
diff changeset
144 }
1031
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
145 // reset the input buffer (make way for a re-fill)
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
146 cxBufferReset(&prop->input);
924
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
147 return CX_PROPERTIES_INCOMPLETE_DATA;
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
148 }
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
149 }
1562
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
150
924
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
151 // get one line and parse it
1031
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
152 while (!cxBufferEof(current_buffer)) {
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
153 const char *buf = current_buffer->space + current_buffer->pos;
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
154 size_t len = current_buffer->size - current_buffer->pos;
924
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
155
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
156 /*
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
157 * First we check if we have at least one line. We also get indices of
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
158 * delimiter and comment chars
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
159 */
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
160 size_t delimiter_index = 0;
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
161 size_t comment_index = 0;
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
162 bool has_comment = false;
1562
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
163 bool has_continuation = false;
924
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
164
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
165 size_t i = 0;
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
166 char c = 0;
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
167 for (; i < len; i++) {
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
168 c = buf[i];
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
169 if (c == comment1 || c == comment2 || c == comment3) {
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
170 if (comment_index == 0) {
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
171 comment_index = i;
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
172 has_comment = true;
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
173 }
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
174 } else if (c == delimiter) {
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
175 if (delimiter_index == 0 && !has_comment) {
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
176 delimiter_index = i;
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
177 }
1562
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
178 } else if (delimiter_index > 0 && c == continuation && i+1 < len && buf[i+1] == '\n') {
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
179 has_continuation = true;
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
180 i++;
924
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
181 } else if (c == '\n') {
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
182 break;
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
183 }
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
184 }
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
185
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
186 if (c != '\n') {
1031
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
187 // we don't have enough data for a line, use the rescue buffer
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
188 assert(current_buffer != &prop->buffer);
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
189 // make sure that the rescue buffer does not already contain something
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
190 assert(cxBufferEof(&prop->buffer));
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
191 if (prop->buffer.space == NULL) {
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
192 // initialize a rescue buffer, if the user did not provide one
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
193 cxBufferInit(&prop->buffer, NULL, 256, NULL, CX_BUFFER_AUTO_EXTEND);
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
194 } else {
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
195 // from a previous rescue there might be already read data
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
196 // reset the buffer to avoid unnecessary buffer extension
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
197 cxBufferReset(&prop->buffer);
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
198 }
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
199 if (cxBufferAppend(buf, 1, len, &prop->buffer) < len) {
928
d2d42cb1d59e add source/sink facility for properties - fixes #430
Mike Becker <universe@uap-core.de>
parents: 924
diff changeset
200 return CX_PROPERTIES_BUFFER_ALLOC_FAILED;
d2d42cb1d59e add source/sink facility for properties - fixes #430
Mike Becker <universe@uap-core.de>
parents: 924
diff changeset
201 }
1031
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
202 // reset the input buffer (make way for a re-fill)
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
203 cxBufferReset(&prop->input);
924
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
204 return CX_PROPERTIES_INCOMPLETE_DATA;
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
205 }
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
206
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
207 cxstring line = has_comment ?
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
208 cx_strn(buf, comment_index) :
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
209 cx_strn(buf, i);
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
210 // check line
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
211 if (delimiter_index == 0) {
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
212 // if line is not blank ...
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
213 line = cx_strtrim(line);
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
214 // ... either no delimiter found, or key is empty
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
215 if (line.length > 0) {
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
216 if (line.ptr[0] == delimiter) {
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
217 return CX_PROPERTIES_INVALID_EMPTY_KEY;
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
218 } else {
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
219 return CX_PROPERTIES_INVALID_MISSING_DELIMITER;
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
220 }
1031
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
221 } else {
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
222 // skip blank line
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
223 // if it was the rescue buffer, return to the original buffer
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
224 if (current_buffer == &prop->buffer) {
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
225 // assert that the rescue buffer really does not contain more data
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
226 assert(current_buffer->pos + i + 1 == current_buffer->size);
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
227 // reset the rescue buffer, but don't destroy it!
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
228 cxBufferReset(&prop->buffer);
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
229 // continue with the input buffer
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
230 current_buffer = &prop->input;
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
231 } else {
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
232 // if it was the input buffer already, just advance the position
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
233 current_buffer->pos += i + 1;
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
234 }
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
235 continue;
924
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
236 }
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
237 } else {
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
238 cxstring k = cx_strn(buf, delimiter_index);
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
239 cxstring val = cx_strn(
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
240 buf + delimiter_index + 1,
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
241 line.length - delimiter_index - 1);
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
242 k = cx_strtrim(k);
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
243 val = cx_strtrim(val);
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
244 if (k.length > 0) {
1562
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
245 current_buffer->pos += i + 1;
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
246 assert(current_buffer->pos <= current_buffer->size);
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
247 assert(current_buffer != &prop->buffer || current_buffer->pos == current_buffer->size);
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
248
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
249 if (has_continuation) {
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
250 char *ptr = (char*)val.ptr;
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
251 if (current_buffer != &prop->buffer) {
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
252 // move value to the rescue buffer
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
253 if (prop->buffer.space == NULL) {
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
254 cxBufferInit(&prop->buffer, NULL, 256, NULL, CX_BUFFER_AUTO_EXTEND);
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
255 }
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
256 prop->buffer.size = 0;
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
257 prop->buffer.pos = 0;
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
258 if (cxBufferWrite(val.ptr, 1, val.length, &prop->buffer) != val.length) {
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
259 return CX_PROPERTIES_BUFFER_ALLOC_FAILED;
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
260 }
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
261 val.ptr = prop->buffer.space;
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
262 ptr = prop->buffer.space;
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
263 }
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
264 // value.ptr is now inside the rescue buffer and we can
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
265 // remove the continuation character from the value
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
266 bool trim = false;
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
267 size_t x = 0;
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
268 for(size_t j=0;j<val.length;j++) {
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
269 c = ptr[j];
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
270 if (j+1 < val.length && c == '\\' && ptr[j+1] == '\n') {
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
271 // skip continuation and newline character
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
272 j++;
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
273 trim = true; // enable trim in the next line
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
274 continue;
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
275 }
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
276 if (j > x) {
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
277 if (trim) {
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
278 if (isspace((unsigned char)c)) {
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
279 continue;
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
280 }
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
281 trim = false;
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
282 }
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
283 ptr[x] = c;
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
284 }
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
285 x++;
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
286 }
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
287 val.length = x;
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
288 }
924
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
289 *key = k;
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
290 *value = val;
1562
f2b63cad2142 add support for line continuation in the properties parser - resolves #457
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1559
diff changeset
291
924
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
292 return CX_PROPERTIES_NO_ERROR;
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
293 } else {
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
294 return CX_PROPERTIES_INVALID_EMPTY_KEY;
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
295 }
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
296 }
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
297 }
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
298
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
299 // when we come to this point, all data must have been read
1031
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
300 assert(cxBufferEof(&prop->buffer));
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
301 assert(cxBufferEof(&prop->input));
8a90552bba29 rework of properties parser - fixes #529 and resolves #458
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
302
924
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
303 return CX_PROPERTIES_NO_DATA;
3c90dfc35f06 add implementation for the properties parser
Mike Becker <universe@uap-core.de>
parents: 923
diff changeset
304 }
928
d2d42cb1d59e add source/sink facility for properties - fixes #430
Mike Becker <universe@uap-core.de>
parents: 924
diff changeset
305
1555
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
306 #ifndef CX_PROPERTIES_LOAD_FILL_SIZE
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
307 #define CX_PROPERTIES_LOAD_FILL_SIZE 1024
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
308 #endif
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
309 const unsigned cx_properties_load_fill_size = CX_PROPERTIES_LOAD_FILL_SIZE;
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
310 #ifndef CX_PROPERTIES_LOAD_BUF_SIZE
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
311 #define CX_PROPERTIES_LOAD_BUF_SIZE 256
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
312 #endif
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
313 const unsigned cx_properties_load_buf_size = CX_PROPERTIES_LOAD_BUF_SIZE;
928
d2d42cb1d59e add source/sink facility for properties - fixes #430
Mike Becker <universe@uap-core.de>
parents: 924
diff changeset
314
1555
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
315 CxPropertiesStatus cx_properties_load(CxPropertiesConfig config,
1557
03fbf1c99e73 add allocator support to cxPropertiesLoad() - resolves #776
Mike Becker <universe@uap-core.de>
parents: 1555
diff changeset
316 const CxAllocator *allocator, cxstring filename, CxMap *target) {
1559
9e50f45f8736 fix that cxPropertiesLoad() is not falling back to the default allocator when the allocator is NULL
Mike Becker <universe@uap-core.de>
parents: 1558
diff changeset
317 if (allocator == NULL) {
9e50f45f8736 fix that cxPropertiesLoad() is not falling back to the default allocator when the allocator is NULL
Mike Becker <universe@uap-core.de>
parents: 1558
diff changeset
318 allocator = cxDefaultAllocator;
9e50f45f8736 fix that cxPropertiesLoad() is not falling back to the default allocator when the allocator is NULL
Mike Becker <universe@uap-core.de>
parents: 1558
diff changeset
319 }
9e50f45f8736 fix that cxPropertiesLoad() is not falling back to the default allocator when the allocator is NULL
Mike Becker <universe@uap-core.de>
parents: 1558
diff changeset
320
1555
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
321 // sanity check for the map
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
322 const bool use_cstring = cxCollectionStoresPointers(target);
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
323 if (!use_cstring && cxCollectionElementSize(target) != sizeof(cxmutstr)) {
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
324 return CX_PROPERTIES_MAP_ERROR;
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
325 }
928
d2d42cb1d59e add source/sink facility for properties - fixes #430
Mike Becker <universe@uap-core.de>
parents: 924
diff changeset
326
1555
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
327 // create a duplicate to guarantee zero-termination
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
328 cxmutstr fname = cx_strdup(filename);
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
329 if (fname.ptr == NULL) {
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
330 return CX_PROPERTIES_BUFFER_ALLOC_FAILED; // LCOV_EXCL_LINE
928
d2d42cb1d59e add source/sink facility for properties - fixes #430
Mike Becker <universe@uap-core.de>
parents: 924
diff changeset
331 }
d2d42cb1d59e add source/sink facility for properties - fixes #430
Mike Becker <universe@uap-core.de>
parents: 924
diff changeset
332
1555
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
333 // open the file
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
334 FILE *f = fopen(fname.ptr, "r");
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
335 if (f == NULL) {
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
336 cx_strfree(&fname);
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
337 return CX_PROPERTIES_FILE_ERROR;
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
338 }
928
d2d42cb1d59e add source/sink facility for properties - fixes #430
Mike Becker <universe@uap-core.de>
parents: 924
diff changeset
339
1555
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
340 // initialize the parser
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
341 char linebuf[cx_properties_load_buf_size];
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
342 char fillbuf[cx_properties_load_fill_size];
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
343 CxPropertiesStatus status;
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
344 CxProperties parser;
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
345 cxPropertiesInit(&parser, config);
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
346 cxPropertiesUseStack(&parser, linebuf, cx_properties_load_buf_size);
928
d2d42cb1d59e add source/sink facility for properties - fixes #430
Mike Becker <universe@uap-core.de>
parents: 924
diff changeset
347
1555
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
348 // read/fill/parse loop
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
349 status = CX_PROPERTIES_NO_DATA;
1558
fc863c877a75 fix return value of cxPropertiesLoad() for non-empty files that do not contain keys
Mike Becker <universe@uap-core.de>
parents: 1557
diff changeset
350 size_t keys_found = 0;
1555
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
351 while (true) {
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
352 size_t r = fread(fillbuf, 1, cx_properties_load_fill_size, f);
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
353 if (ferror(f)) {
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
354 status = CX_PROPERTIES_FILE_ERROR;
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
355 break;
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
356 }
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
357 if (r == 0) {
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
358 break;
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
359 }
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
360 if (cxPropertiesFilln(&parser, fillbuf, r)) {
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
361 status = CX_PROPERTIES_BUFFER_ALLOC_FAILED;
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
362 break;
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
363 }
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
364 cxstring key, value;
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
365 while (true) {
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
366 status = cxPropertiesNext(&parser, &key, &value);
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
367 if (status != CX_PROPERTIES_NO_ERROR) {
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
368 break;
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
369 } else {
1557
03fbf1c99e73 add allocator support to cxPropertiesLoad() - resolves #776
Mike Becker <universe@uap-core.de>
parents: 1555
diff changeset
370 cxmutstr v = cx_strdup_a(allocator, value);
1555
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
371 if (v.ptr == NULL) {
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
372 status = CX_PROPERTIES_MAP_ERROR;
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
373 break;
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
374 }
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
375 void *mv = use_cstring ? (void*)v.ptr : &v;
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
376 if (cxMapPut(target, key, mv)) {
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
377 cx_strfree(&v);
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
378 status = CX_PROPERTIES_MAP_ERROR;
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
379 break;
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
380 }
1558
fc863c877a75 fix return value of cxPropertiesLoad() for non-empty files that do not contain keys
Mike Becker <universe@uap-core.de>
parents: 1557
diff changeset
381 keys_found++;
1555
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
382 }
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
383 }
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
384 if (status > CX_PROPERTIES_OK) {
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
385 break;
928
d2d42cb1d59e add source/sink facility for properties - fixes #430
Mike Becker <universe@uap-core.de>
parents: 924
diff changeset
386 }
d2d42cb1d59e add source/sink facility for properties - fixes #430
Mike Becker <universe@uap-core.de>
parents: 924
diff changeset
387 }
d2d42cb1d59e add source/sink facility for properties - fixes #430
Mike Becker <universe@uap-core.de>
parents: 924
diff changeset
388
1555
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
389 // cleanup and exit
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
390 fclose(f);
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
391 cxPropertiesDestroy(&parser);
8972247f54e8 properties.h: removes the source/sink API and adds a new cxPropertiesLoad()
Mike Becker <universe@uap-core.de>
parents: 1503
diff changeset
392 cx_strfree(&fname);
1558
fc863c877a75 fix return value of cxPropertiesLoad() for non-empty files that do not contain keys
Mike Becker <universe@uap-core.de>
parents: 1557
diff changeset
393 if (status == CX_PROPERTIES_NO_DATA && keys_found > 0) {
fc863c877a75 fix return value of cxPropertiesLoad() for non-empty files that do not contain keys
Mike Becker <universe@uap-core.de>
parents: 1557
diff changeset
394 return CX_PROPERTIES_NO_ERROR;
fc863c877a75 fix return value of cxPropertiesLoad() for non-empty files that do not contain keys
Mike Becker <universe@uap-core.de>
parents: 1557
diff changeset
395 } else {
fc863c877a75 fix return value of cxPropertiesLoad() for non-empty files that do not contain keys
Mike Becker <universe@uap-core.de>
parents: 1557
diff changeset
396 return status;
fc863c877a75 fix return value of cxPropertiesLoad() for non-empty files that do not contain keys
Mike Becker <universe@uap-core.de>
parents: 1557
diff changeset
397 }
928
d2d42cb1d59e add source/sink facility for properties - fixes #430
Mike Becker <universe@uap-core.de>
parents: 924
diff changeset
398 }

mercurial