ucx/properties.c

Sat, 08 Nov 2025 23:06:11 +0100

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Sat, 08 Nov 2025 23:06:11 +0100
changeset 888
af685cc9d623
parent 854
1c8401ece69e
permissions
-rw-r--r--

update ucx

852
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
1 /*
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
2 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
3 *
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
4 * Copyright 2024 Mike Becker, Olaf Wintermann All rights reserved.
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
5 *
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
6 * Redistribution and use in source and binary forms, with or without
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
7 * modification, are permitted provided that the following conditions are met:
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
8 *
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
9 * 1. Redistributions of source code must retain the above copyright
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
10 * notice, this list of conditions and the following disclaimer.
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
11 *
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
12 * 2. Redistributions in binary form must reproduce the above copyright
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
13 * notice, this list of conditions and the following disclaimer in the
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
14 * documentation and/or other materials provided with the distribution.
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
15 *
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
16 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
17 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
20 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
21 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
22 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
23 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
25 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
26 * POSSIBILITY OF SUCH DAMAGE.
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
27 */
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
28
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
29 #include "cx/properties.h"
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
30
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
31 #include <assert.h>
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
32
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
33 const CxPropertiesConfig cx_properties_config_default = {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
34 '=',
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
35 '#',
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
36 '\0',
854
1c8401ece69e update ucx to version 3.1
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 852
diff changeset
37 '\0',
1c8401ece69e update ucx to version 3.1
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 852
diff changeset
38 '\\',
852
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
39 };
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
40
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
41 void cxPropertiesInit(
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
42 CxProperties *prop,
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
43 CxPropertiesConfig config
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
44 ) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
45 memset(prop, 0, sizeof(CxProperties));
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
46 prop->config = config;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
47 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
48
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
49 void cxPropertiesDestroy(CxProperties *prop) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
50 cxBufferDestroy(&prop->input);
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
51 cxBufferDestroy(&prop->buffer);
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
52 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
53
888
af685cc9d623 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 854
diff changeset
54 void cxPropertiesReset(CxProperties *prop) {
af685cc9d623 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 854
diff changeset
55 CxPropertiesConfig config = prop->config;
af685cc9d623 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 854
diff changeset
56 cxPropertiesDestroy(prop);
af685cc9d623 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 854
diff changeset
57 cxPropertiesInit(prop, config);
af685cc9d623 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 854
diff changeset
58 }
af685cc9d623 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 854
diff changeset
59
852
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
60 int cxPropertiesFilln(
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
61 CxProperties *prop,
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
62 const char *buf,
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
63 size_t len
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
64 ) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
65 if (cxBufferEof(&prop->input)) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
66 // destroy a possible previously initialized buffer
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
67 cxBufferDestroy(&prop->input);
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
68 cxBufferInit(&prop->input, (void*) buf, len,
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
69 NULL, CX_BUFFER_COPY_ON_WRITE | CX_BUFFER_AUTO_EXTEND);
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
70 prop->input.size = len;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
71 } else {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
72 if (cxBufferAppend(buf, 1, len, &prop->input) < len) return -1;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
73 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
74 return 0;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
75 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
76
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
77 void cxPropertiesUseStack(
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
78 CxProperties *prop,
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
79 char *buf,
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
80 size_t capacity
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
81 ) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
82 cxBufferInit(&prop->buffer, buf, capacity, NULL, CX_BUFFER_COPY_ON_EXTEND);
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
83 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
84
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
85 CxPropertiesStatus cxPropertiesNext(
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
86 CxProperties *prop,
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
87 cxstring *key,
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
88 cxstring *value
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
89 ) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
90 // check if we have a text buffer
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
91 if (prop->input.space == NULL) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
92 return CX_PROPERTIES_NULL_INPUT;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
93 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
94
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
95 // a pointer to the buffer we want to read from
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
96 CxBuffer *current_buffer = &prop->input;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
97
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
98 // check if we have rescued data
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
99 if (!cxBufferEof(&prop->buffer)) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
100 // check if we can now get a complete line
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
101 cxstring input = cx_strn(prop->input.space + prop->input.pos,
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
102 prop->input.size - prop->input.pos);
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
103 cxstring nl = cx_strchr(input, '\n');
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
104 if (nl.length > 0) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
105 // we add as much data to the rescue buffer as we need
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
106 // to complete the line
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
107 size_t len_until_nl = (size_t)(nl.ptr - input.ptr) + 1;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
108
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
109 if (cxBufferAppend(input.ptr, 1,
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
110 len_until_nl, &prop->buffer) < len_until_nl) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
111 return CX_PROPERTIES_BUFFER_ALLOC_FAILED;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
112 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
113
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
114 // advance the position in the input buffer
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
115 prop->input.pos += len_until_nl;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
116
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
117 // we now want to read from the rescue buffer
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
118 current_buffer = &prop->buffer;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
119 } else {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
120 // still not enough data, copy input buffer to internal buffer
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
121 if (cxBufferAppend(input.ptr, 1,
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
122 input.length, &prop->buffer) < input.length) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
123 return CX_PROPERTIES_BUFFER_ALLOC_FAILED;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
124 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
125 // reset the input buffer (make way for a re-fill)
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
126 cxBufferReset(&prop->input);
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
127 return CX_PROPERTIES_INCOMPLETE_DATA;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
128 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
129 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
130
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
131 char comment1 = prop->config.comment1;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
132 char comment2 = prop->config.comment2;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
133 char comment3 = prop->config.comment3;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
134 char delimiter = prop->config.delimiter;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
135
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
136 // get one line and parse it
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
137 while (!cxBufferEof(current_buffer)) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
138 const char *buf = current_buffer->space + current_buffer->pos;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
139 size_t len = current_buffer->size - current_buffer->pos;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
140
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
141 /*
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
142 * First we check if we have at least one line. We also get indices of
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
143 * delimiter and comment chars
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
144 */
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
145 size_t delimiter_index = 0;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
146 size_t comment_index = 0;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
147 bool has_comment = false;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
148
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
149 size_t i = 0;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
150 char c = 0;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
151 for (; i < len; i++) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
152 c = buf[i];
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
153 if (c == comment1 || c == comment2 || c == comment3) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
154 if (comment_index == 0) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
155 comment_index = i;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
156 has_comment = true;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
157 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
158 } else if (c == delimiter) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
159 if (delimiter_index == 0 && !has_comment) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
160 delimiter_index = i;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
161 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
162 } else if (c == '\n') {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
163 break;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
164 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
165 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
166
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
167 if (c != '\n') {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
168 // we don't have enough data for a line, use the rescue buffer
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
169 assert(current_buffer != &prop->buffer);
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
170 // make sure that the rescue buffer does not already contain something
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
171 assert(cxBufferEof(&prop->buffer));
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
172 if (prop->buffer.space == NULL) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
173 // initialize a rescue buffer, if the user did not provide one
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
174 cxBufferInit(&prop->buffer, NULL, 256, NULL, CX_BUFFER_AUTO_EXTEND);
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
175 } else {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
176 // from a previous rescue there might be already read data
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
177 // reset the buffer to avoid unnecessary buffer extension
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
178 cxBufferReset(&prop->buffer);
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
179 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
180 if (cxBufferAppend(buf, 1, len, &prop->buffer) < len) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
181 return CX_PROPERTIES_BUFFER_ALLOC_FAILED;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
182 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
183 // reset the input buffer (make way for a re-fill)
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
184 cxBufferReset(&prop->input);
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
185 return CX_PROPERTIES_INCOMPLETE_DATA;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
186 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
187
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
188 cxstring line = has_comment ?
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
189 cx_strn(buf, comment_index) :
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
190 cx_strn(buf, i);
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
191 // check line
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
192 if (delimiter_index == 0) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
193 // if line is not blank ...
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
194 line = cx_strtrim(line);
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
195 // ... either no delimiter found, or key is empty
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
196 if (line.length > 0) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
197 if (line.ptr[0] == delimiter) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
198 return CX_PROPERTIES_INVALID_EMPTY_KEY;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
199 } else {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
200 return CX_PROPERTIES_INVALID_MISSING_DELIMITER;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
201 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
202 } else {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
203 // skip blank line
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
204 // if it was the rescue buffer, return to the original buffer
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
205 if (current_buffer == &prop->buffer) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
206 // assert that the rescue buffer really does not contain more data
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
207 assert(current_buffer->pos + i + 1 == current_buffer->size);
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
208 // reset the rescue buffer, but don't destroy it!
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
209 cxBufferReset(&prop->buffer);
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
210 // continue with the input buffer
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
211 current_buffer = &prop->input;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
212 } else {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
213 // if it was the input buffer already, just advance the position
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
214 current_buffer->pos += i + 1;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
215 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
216 continue;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
217 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
218 } else {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
219 cxstring k = cx_strn(buf, delimiter_index);
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
220 cxstring val = cx_strn(
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
221 buf + delimiter_index + 1,
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
222 line.length - delimiter_index - 1);
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
223 k = cx_strtrim(k);
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
224 val = cx_strtrim(val);
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
225 if (k.length > 0) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
226 *key = k;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
227 *value = val;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
228 current_buffer->pos += i + 1;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
229 assert(current_buffer->pos <= current_buffer->size);
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
230 return CX_PROPERTIES_NO_ERROR;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
231 } else {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
232 return CX_PROPERTIES_INVALID_EMPTY_KEY;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
233 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
234 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
235 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
236
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
237 // when we come to this point, all data must have been read
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
238 assert(cxBufferEof(&prop->buffer));
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
239 assert(cxBufferEof(&prop->input));
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
240
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
241 return CX_PROPERTIES_NO_DATA;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
242 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
243
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
244 static int cx_properties_sink_map(
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
245 cx_attr_unused CxProperties *prop,
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
246 CxPropertiesSink *sink,
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
247 cxstring key,
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
248 cxstring value
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
249 ) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
250 CxMap *map = sink->sink;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
251 CxAllocator *alloc = sink->data;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
252 cxmutstr v = cx_strdup_a(alloc, value);
888
af685cc9d623 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 854
diff changeset
253 int r = cxMapPut(map, key, v.ptr);
852
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
254 if (r != 0) cx_strfree_a(alloc, &v);
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
255 return r;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
256 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
257
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
258 CxPropertiesSink cxPropertiesMapSink(CxMap *map) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
259 CxPropertiesSink sink;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
260 sink.sink = map;
854
1c8401ece69e update ucx to version 3.1
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 852
diff changeset
261 sink.data = (void*) cxDefaultAllocator;
852
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
262 sink.sink_func = cx_properties_sink_map;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
263 return sink;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
264 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
265
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
266 static int cx_properties_read_string(
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
267 CxProperties *prop,
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
268 CxPropertiesSource *src,
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
269 cxstring *target
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
270 ) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
271 if (prop->input.space == src->src) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
272 // when the input buffer already contains the string
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
273 // we have nothing more to provide
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
274 target->length = 0;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
275 } else {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
276 target->ptr = src->src;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
277 target->length = src->data_size;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
278 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
279 return 0;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
280 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
281
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
282 static int cx_properties_read_file(
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
283 cx_attr_unused CxProperties *prop,
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
284 CxPropertiesSource *src,
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
285 cxstring *target
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
286 ) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
287 target->ptr = src->data_ptr;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
288 target->length = fread(src->data_ptr, 1, src->data_size, src->src);
854
1c8401ece69e update ucx to version 3.1
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 852
diff changeset
289 return ferror((FILE*)src->src);
852
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
290 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
291
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
292 static int cx_properties_read_init_file(
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
293 cx_attr_unused CxProperties *prop,
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
294 CxPropertiesSource *src
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
295 ) {
888
af685cc9d623 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 854
diff changeset
296 src->data_ptr = cxMallocDefault(src->data_size);
852
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
297 if (src->data_ptr == NULL) return 1;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
298 return 0;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
299 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
300
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
301 static void cx_properties_read_clean_file(
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
302 cx_attr_unused CxProperties *prop,
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
303 CxPropertiesSource *src
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
304 ) {
888
af685cc9d623 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 854
diff changeset
305 cxFreeDefault(src->data_ptr);
852
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
306 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
307
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
308 CxPropertiesSource cxPropertiesStringSource(cxstring str) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
309 CxPropertiesSource src;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
310 src.src = (void*) str.ptr;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
311 src.data_size = str.length;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
312 src.data_ptr = NULL;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
313 src.read_func = cx_properties_read_string;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
314 src.read_init_func = NULL;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
315 src.read_clean_func = NULL;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
316 return src;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
317 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
318
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
319 CxPropertiesSource cxPropertiesCstrnSource(const char *str, size_t len) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
320 CxPropertiesSource src;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
321 src.src = (void*) str;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
322 src.data_size = len;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
323 src.data_ptr = NULL;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
324 src.read_func = cx_properties_read_string;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
325 src.read_init_func = NULL;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
326 src.read_clean_func = NULL;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
327 return src;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
328 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
329
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
330 CxPropertiesSource cxPropertiesCstrSource(const char *str) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
331 CxPropertiesSource src;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
332 src.src = (void*) str;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
333 src.data_size = strlen(str);
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
334 src.data_ptr = NULL;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
335 src.read_func = cx_properties_read_string;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
336 src.read_init_func = NULL;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
337 src.read_clean_func = NULL;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
338 return src;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
339 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
340
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
341 CxPropertiesSource cxPropertiesFileSource(FILE *file, size_t chunk_size) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
342 CxPropertiesSource src;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
343 src.src = file;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
344 src.data_size = chunk_size;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
345 src.data_ptr = NULL;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
346 src.read_func = cx_properties_read_file;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
347 src.read_init_func = cx_properties_read_init_file;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
348 src.read_clean_func = cx_properties_read_clean_file;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
349 return src;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
350 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
351
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
352 CxPropertiesStatus cxPropertiesLoad(
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
353 CxProperties *prop,
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
354 CxPropertiesSink sink,
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
355 CxPropertiesSource source
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
356 ) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
357 assert(source.read_func != NULL);
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
358 assert(sink.sink_func != NULL);
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
359
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
360 // initialize reader
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
361 if (source.read_init_func != NULL) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
362 if (source.read_init_func(prop, &source)) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
363 return CX_PROPERTIES_READ_INIT_FAILED;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
364 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
365 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
366
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
367 // transfer the data from the source to the sink
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
368 CxPropertiesStatus status;
854
1c8401ece69e update ucx to version 3.1
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 852
diff changeset
369 CxPropertiesStatus kv_status = CX_PROPERTIES_NO_DATA;
852
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
370 bool found = false;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
371 while (true) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
372 // read input
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
373 cxstring input;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
374 if (source.read_func(prop, &source, &input)) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
375 status = CX_PROPERTIES_READ_FAILED;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
376 break;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
377 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
378
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
379 // no more data - break
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
380 if (input.length == 0) {
854
1c8401ece69e update ucx to version 3.1
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 852
diff changeset
381 if (found) {
1c8401ece69e update ucx to version 3.1
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 852
diff changeset
382 // something was found, check the last kv_status
1c8401ece69e update ucx to version 3.1
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 852
diff changeset
383 if (kv_status == CX_PROPERTIES_INCOMPLETE_DATA) {
1c8401ece69e update ucx to version 3.1
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 852
diff changeset
384 status = CX_PROPERTIES_INCOMPLETE_DATA;
1c8401ece69e update ucx to version 3.1
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 852
diff changeset
385 } else {
1c8401ece69e update ucx to version 3.1
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 852
diff changeset
386 status = CX_PROPERTIES_NO_ERROR;
1c8401ece69e update ucx to version 3.1
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 852
diff changeset
387 }
1c8401ece69e update ucx to version 3.1
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 852
diff changeset
388 } else {
1c8401ece69e update ucx to version 3.1
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 852
diff changeset
389 // nothing found
1c8401ece69e update ucx to version 3.1
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 852
diff changeset
390 status = CX_PROPERTIES_NO_DATA;
1c8401ece69e update ucx to version 3.1
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 852
diff changeset
391 }
852
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
392 break;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
393 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
394
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
395 // set the input buffer and read the k/v-pairs
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
396 cxPropertiesFill(prop, input);
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
397
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
398 do {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
399 cxstring key, value;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
400 kv_status = cxPropertiesNext(prop, &key, &value);
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
401 if (kv_status == CX_PROPERTIES_NO_ERROR) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
402 found = true;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
403 if (sink.sink_func(prop, &sink, key, value)) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
404 kv_status = CX_PROPERTIES_SINK_FAILED;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
405 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
406 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
407 } while (kv_status == CX_PROPERTIES_NO_ERROR);
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
408
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
409 if (kv_status > CX_PROPERTIES_OK) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
410 status = kv_status;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
411 break;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
412 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
413 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
414
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
415 if (source.read_clean_func != NULL) {
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
416 source.read_clean_func(prop, &source);
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
417 }
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
418
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
419 return status;
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
420 }

mercurial