ObjFW  Diff

Differences From Artifact [331396bf91]:

To Artifact [fb863141bc]:


66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
+ (char*)escapeCString: (const char*)s
{
	char *ret;
	size_t i, j, len, nlen;

	len = nlen = strlen(s);

	if ((ret = malloc(len + 1)) == NULL) {
		[[OFNoMemException newWithObject: nil
					 andSize: len + 1] raise];
		return NULL;
	}

	for (i = j = 0; i < len; i++) {
		switch (s[i]) {
		case '<':
			if (!xmlfactory_add2str(&ret, &nlen, &j, "&lt;")) {
				[[OFNoMemException newWithObject: nil
							 andSize: nlen + 4]
				    raise];
				return NULL;
			}
			break;
		case '>':
			if (!xmlfactory_add2str(&ret, &nlen, &j, "&gt;")) {
				[[OFNoMemException newWithObject: nil
							 andSize: nlen + 4]
				    raise];
				return NULL;
			}
			break;
		case '"':
			if (!xmlfactory_add2str(&ret, &nlen, &j, "&quot;")) {
				[[OFNoMemException newWithObject: nil
							 andSize: nlen + 6]
				    raise];
				return NULL;
			}
			break;
		case '\'':
			if (!xmlfactory_add2str(&ret, &nlen, &j, "&apos;")) {
				[[OFNoMemException newWithObject: nil
							 andSize: nlen + 6]
				    raise];
				return NULL;
			}
			break;
		case '&':
			if (!xmlfactory_add2str(&ret, &nlen, &j, "&amp;")) {
				[[OFNoMemException newWithObject: nil
							 andSize: nlen + 5]
				    raise];
				return NULL;
			}
			break;
		default:
			ret[j++] = s[i];
			break;
		}
	}








|


<
<




|



<
<


|



<
<


|



<
<


|



<
<


|



<
<







66
67
68
69
70
71
72
73
74
75


76
77
78
79
80
81
82
83


84
85
86
87
88
89


90
91
92
93
94
95


96
97
98
99
100
101


102
103
104
105
106
107


108
109
110
111
112
113
114
+ (char*)escapeCString: (const char*)s
{
	char *ret;
	size_t i, j, len, nlen;

	len = nlen = strlen(s);

	if ((ret = malloc(len + 1)) == NULL)
		[[OFNoMemException newWithObject: nil
					 andSize: len + 1] raise];



	for (i = j = 0; i < len; i++) {
		switch (s[i]) {
		case '<':
			if (!xmlfactory_add2str(&ret, &nlen, &j, "&lt;"))
				[[OFNoMemException newWithObject: nil
							 andSize: nlen + 4]
				    raise];


			break;
		case '>':
			if (!xmlfactory_add2str(&ret, &nlen, &j, "&gt;"))
				[[OFNoMemException newWithObject: nil
							 andSize: nlen + 4]
				    raise];


			break;
		case '"':
			if (!xmlfactory_add2str(&ret, &nlen, &j, "&quot;"))
				[[OFNoMemException newWithObject: nil
							 andSize: nlen + 6]
				    raise];


			break;
		case '\'':
			if (!xmlfactory_add2str(&ret, &nlen, &j, "&apos;"))
				[[OFNoMemException newWithObject: nil
							 andSize: nlen + 6]
				    raise];


			break;
		case '&':
			if (!xmlfactory_add2str(&ret, &nlen, &j, "&amp;"))
				[[OFNoMemException newWithObject: nil
							 andSize: nlen + 5]
				    raise];


			break;
		default:
			ret[j++] = s[i];
			break;
		}
	}

134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
{
	char *arg, *val, *xml;
	size_t i, len;
	va_list args;

	/* Start of tag */
	len = strlen(name) + 3;
	if ((xml = malloc(len)) == NULL) {
		[[OFNoMemException newWithObject: nil
					 andSize: len] raise];
		return NULL;
	}

	i = 0;
	xml[i++] = '<';
	memcpy(xml + i, name, strlen(name));
	i += strlen(name);

	/* Arguments */







|


<
<







122
123
124
125
126
127
128
129
130
131


132
133
134
135
136
137
138
{
	char *arg, *val, *xml;
	size_t i, len;
	va_list args;

	/* Start of tag */
	len = strlen(name) + 3;
	if ((xml = malloc(len)) == NULL)
		[[OFNoMemException newWithObject: nil
					 andSize: len] raise];



	i = 0;
	xml[i++] = '<';
	memcpy(xml + i, name, strlen(name));
	i += strlen(name);

	/* Arguments */
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
		    strlen(esc_val) + 1)) {
			free(esc_val);
			[[OFNoMemException newWithObject: nil
						 andSize: len + 1 +
							  strlen(arg) + 2 +
							  strlen(esc_val) + 1]
			    raise];
			return NULL;
		}

		xml[i++] = ' ';
		memcpy(xml + i, arg, strlen(arg));
		i += strlen(arg);
		xml[i++] = '=';
		xml[i++] = '\'';
		memcpy(xml + i, esc_val, strlen(esc_val));
		i += strlen(esc_val);
		xml[i++] = '\'';

		free(esc_val);
	}
	va_end(args);

	/* End of tag */
	if (close) {
		if (data == NULL) {
			if (!xmlfactory_resize(&xml, &len, 2 - 1)) {
				[[OFNoMemException newWithObject: nil
							 andSize: len + 2 - 1]
				    raise];
				return NULL;
			}
	
			xml[i++] = '/';
			xml[i++] = '>';
		} else {
			if (!xmlfactory_resize(&xml, &len, 1 + strlen(data) +
			    2 + strlen(name) + 1 - 1)) {
				[[OFNoMemException newWithObject: nil
							 andSize: len + 1 +
								  strlen(data) +
								  2 +
								  strlen(name) +
								  1 - 1]
				    raise];
				return NULL;
			}
	
			xml[i++] = '>';
			memcpy(xml + i, data, strlen(data));
			i += strlen(data);
			xml[i++] = '<';
			xml[i++] = '/';
			memcpy(xml + i, name, strlen(name));







<


















|



<
<





|







<
<







154
155
156
157
158
159
160

161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182


183
184
185
186
187
188
189
190
191
192
193
194
195


196
197
198
199
200
201
202
		    strlen(esc_val) + 1)) {
			free(esc_val);
			[[OFNoMemException newWithObject: nil
						 andSize: len + 1 +
							  strlen(arg) + 2 +
							  strlen(esc_val) + 1]
			    raise];

		}

		xml[i++] = ' ';
		memcpy(xml + i, arg, strlen(arg));
		i += strlen(arg);
		xml[i++] = '=';
		xml[i++] = '\'';
		memcpy(xml + i, esc_val, strlen(esc_val));
		i += strlen(esc_val);
		xml[i++] = '\'';

		free(esc_val);
	}
	va_end(args);

	/* End of tag */
	if (close) {
		if (data == NULL) {
			if (!xmlfactory_resize(&xml, &len, 2 - 1))
				[[OFNoMemException newWithObject: nil
							 andSize: len + 2 - 1]
				    raise];


	
			xml[i++] = '/';
			xml[i++] = '>';
		} else {
			if (!xmlfactory_resize(&xml, &len, 1 + strlen(data) +
			    2 + strlen(name) + 1 - 1))
				[[OFNoMemException newWithObject: nil
							 andSize: len + 1 +
								  strlen(data) +
								  2 +
								  strlen(name) +
								  1 - 1]
				    raise];


	
			xml[i++] = '>';
			memcpy(xml + i, data, strlen(data));
			i += strlen(data);
			xml[i++] = '<';
			xml[i++] = '/';
			memcpy(xml + i, name, strlen(name));
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
	size_t i, len, pos;

	if (strs[0] == NULL)
		return NULL;

	len = strlen(*strs) + 1;
	
	if ((ret = malloc(len)) == NULL) {
		[[OFNoMemException newWithObject: nil
					 andSize: len] raise];
		return NULL;
	}

	memcpy(ret, strs[0], len - 1);
	pos = len - 1;

	for (i = 1; strs[i] != NULL; i++) {
		if (!xmlfactory_add2str(&ret, &len, &pos, strs[i])) {
			free(ret);
			[[OFNoMemException newWithObject: nil
						 andSize: len + strlen(strs[i])]
			    raise];
			return NULL;
		}
	}

	for (i = 0; strs[i] != NULL; i++)
		free(strs[i]);

	ret[pos] = 0;
	return ret;
}
@end







|


<
<










<










216
217
218
219
220
221
222
223
224
225


226
227
228
229
230
231
232
233
234
235

236
237
238
239
240
241
242
243
244
245
	size_t i, len, pos;

	if (strs[0] == NULL)
		return NULL;

	len = strlen(*strs) + 1;
	
	if ((ret = malloc(len)) == NULL)
		[[OFNoMemException newWithObject: nil
					 andSize: len] raise];



	memcpy(ret, strs[0], len - 1);
	pos = len - 1;

	for (i = 1; strs[i] != NULL; i++) {
		if (!xmlfactory_add2str(&ret, &len, &pos, strs[i])) {
			free(ret);
			[[OFNoMemException newWithObject: nil
						 andSize: len + strlen(strs[i])]
			    raise];

		}
	}

	for (i = 0; strs[i] != NULL; i++)
		free(strs[i]);

	ret[pos] = 0;
	return ret;
}
@end