ObjFW  Check-in [0ceb5bb869]

Overview
Comment:OFDNSResolverSettings: Use native encoding
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 0ceb5bb869a09e737385656f85ed395c7da53bfda8369c7e663528a5abe092be
User & Date: js on 2022-11-06 20:20:25
Other Links: manifest | tags
Context
2022-11-06
20:31
OFDatagramSocket: Make sender nullable check-in: 6ed8be900e user: js tags: trunk
20:20
OFDNSResolverSettings: Use native encoding check-in: 0ceb5bb869 user: js tags: trunk
19:11
Remove leftover file check-in: 68652b9696 user: js tags: trunk
Changes

Modified src/OFDNSResolverSettings.m from [bdd49f7898] to [1a84838633].

264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
	} @catch (OFOpenItemFailedException *e) {
		objc_autoreleasePoolPop(pool);
		return;
	}

	staticHosts = [OFMutableDictionary dictionary];

	/* Use ISO 8859-1 to ignore any potential non-UTF-8 comments. */
	while ((line =
	    [file readLineWithEncoding: OFStringEncodingISO8859_1]) != nil) {
		OFArray *components, *hosts;
		size_t pos;
		OFString *address;

		pos = [line rangeOfString: @"#"].location;
		if (pos != OFNotFound)
			line = [line substringToIndex: pos];







<

|







264
265
266
267
268
269
270

271
272
273
274
275
276
277
278
279
	} @catch (OFOpenItemFailedException *e) {
		objc_autoreleasePoolPop(pool);
		return;
	}

	staticHosts = [OFMutableDictionary dictionary];


	while ((line =
	    [file readLineWithEncoding: [OFLocale encoding]]) != nil) {
		OFArray *components, *hosts;
		size_t pos;
		OFString *address;

		pos = [line rangeOfString: @"#"].location;
		if (pos != OFNotFound)
			line = [line substringToIndex: pos];
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
		objc_autoreleasePoolPop(pool);
		return;
	}

	if (nameServers == nil)
		nameServers = [OFMutableArray array];

	/* Use ISO 8859-1 to ignore any potential non-UTF-8 comments. */
	while ((line =
	    [file readLineWithEncoding: OFStringEncodingISO8859_1]) != nil) {
		void *pool2 = objc_autoreleasePoolPush();
		size_t pos;
		OFArray *components, *arguments;
		OFString *option;

		pos = [line indexOfCharacterFromSet: commentCharacters];
		if (pos != OFNotFound)







<

|







365
366
367
368
369
370
371

372
373
374
375
376
377
378
379
380
		objc_autoreleasePoolPop(pool);
		return;
	}

	if (nameServers == nil)
		nameServers = [OFMutableArray array];


	while ((line =
	    [file readLineWithEncoding: [OFLocale encoding]]) != nil) {
		void *pool2 = objc_autoreleasePoolPush();
		size_t pos;
		OFArray *components, *arguments;
		OFString *option;

		pos = [line indexOfCharacterFromSet: commentCharacters];
		if (pos != OFNotFound)