ObjFW  Diff

Differences From Artifact [85cc9e3ded]:

To Artifact [f1cfec9f86]:


118
119
120
121
122
123
124
125
126
127
128
129
130
131
132








133
134
135
136
137
138
139

140
141

142
143
144
145

146
147
148
149

150
151
152
153

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
203
204
205
206
207
208

209
210
211
212
213
214
215
118
119
120
121
122
123
124








125
126
127
128
129
130
131
132
133
134
135
136
137
138

139
140

141
142
143
144

145
146
147
148

149
150
151
152

153
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
203
204
205
206
207

208
209
210
211
212
213
214
215







-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+






-
+

-
+



-
+



-
+



-
+





-
+



-
+

-
+


-
+



-
+










-
+



-
+








-
+


-
+

-
+






-
+








static OFStringEncoding
encodingForContentType(OFString *contentType)
{
	const char *UTF8String = contentType.UTF8String;
	size_t last, length = contentType.UTF8StringLength;
	enum {
		StateType,
		StateBeforeParamName,
		StateParamName,
		StateParamValueOrQuote,
		StateParamValue,
		StateParamQuotedValue,
		StateAfterParamValue
	} state = StateType;
		stateType,
		stateBeforeParamName,
		stateParamName,
		stateParamValueOrQuote,
		stateParamValue,
		stateParamQuotedValue,
		stateAfterParamValue
	} state = stateType;
	OFString *name = nil, *value = nil, *charset = nil;
	OFStringEncoding ret;

	last = 0;
	for (size_t i = 0; i < length; i++) {
		switch (state) {
		case StateType:
		case stateType:
			if (UTF8String[i] == ';') {
				state = StateBeforeParamName;
				state = stateBeforeParamName;
				last = i + 1;
			}
			break;
		case StateBeforeParamName:
		case stateBeforeParamName:
			if (UTF8String[i] == ' ')
				last = i + 1;
			else {
				state = StateParamName;
				state = stateParamName;
				i--;
			}
			break;
		case StateParamName:
		case stateParamName:
			if (UTF8String[i] == '=') {
				name = [OFString
				    stringWithUTF8String: UTF8String + last
						  length: i - last];

				state = StateParamValueOrQuote;
				state = stateParamValueOrQuote;
				last = i + 1;
			}
			break;
		case StateParamValueOrQuote:
		case stateParamValueOrQuote:
			if (UTF8String[i] == '"') {
				state = StateParamQuotedValue;
				state = stateParamQuotedValue;
				last = i + 1;
			} else {
				state = StateParamValue;
				state = stateParamValue;
				i--;
			}
			break;
		case StateParamValue:
		case stateParamValue:
			if (UTF8String[i] == ';') {
				value = [OFString
				    stringWithUTF8String: UTF8String + last
						  length: i - last];
				value =
				    value.stringByDeletingTrailingWhitespaces;

				if ([name isEqual: @"charset"])
					charset = value;

				state = StateBeforeParamName;
				state = stateBeforeParamName;
				last = i + 1;
			}
			break;
		case StateParamQuotedValue:
		case stateParamQuotedValue:
			if (UTF8String[i] == '"') {
				value = [OFString
				    stringWithUTF8String: UTF8String + last
						  length: i - last];

				if ([name isEqual: @"charset"])
					charset = value;

				state = StateAfterParamValue;
				state = stateAfterParamValue;
			}
			break;
		case StateAfterParamValue:
		case stateAfterParamValue:
			if (UTF8String[i] == ';') {
				state = StateBeforeParamName;
				state = stateBeforeParamName;
				last = i + 1;
			} else if (UTF8String[i] != ' ')
				return OFStringEncodingAutodetect;
			break;
		}
	}
	if (state == StateParamValue) {
	if (state == stateParamValue) {
		value = [OFString stringWithUTF8String: UTF8String + last
						length: length - last];
		value = value.stringByDeletingTrailingWhitespaces;

		if ([name isEqual: @"charset"])
			charset = value;
	}