View | Details | Raw Unified | Return to bug 216813
Collapse All | Expand All

(-)mount_msdosfs.c (-3 / +4 lines)
Lines 43-48 Link Here
43
#include <sys/module.h>
43
#include <sys/module.h>
44
44
45
#include <ctype.h>
45
#include <ctype.h>
46
#include <errno.h>
46
#include <err.h>
47
#include <err.h>
47
#include <grp.h>
48
#include <grp.h>
48
#include <locale.h>
49
#include <locale.h>
Lines 306-322 Link Here
306
307
307
	build_iovec_argf(iov, iovlen, "cs_win", ENCODING_UNICODE);
308
	build_iovec_argf(iov, iovlen, "cs_win", ENCODING_UNICODE);
308
	error = kiconv_add_xlat16_cspairs(ENCODING_UNICODE, cs_local);
309
	error = kiconv_add_xlat16_cspairs(ENCODING_UNICODE, cs_local);
309
	if (error)
310
	if (error && errno != EEXIST)
310
		return (-1);
311
		return (-1);
311
	if (cs_dos != NULL) {
312
	if (cs_dos != NULL) {
312
		error = kiconv_add_xlat16_cspairs(cs_dos, cs_local);
313
		error = kiconv_add_xlat16_cspairs(cs_dos, cs_local);
313
		if (error)
314
		if (error && errno != EEXIST)
314
			return (-1);
315
			return (-1);
315
	} else {
316
	} else {
316
		build_iovec_argf(iov, iovlen, "cs_dos", cs_local);
317
		build_iovec_argf(iov, iovlen, "cs_dos", cs_local);
317
		error = kiconv_add_xlat16_cspair(cs_local, cs_local,
318
		error = kiconv_add_xlat16_cspair(cs_local, cs_local,
318
				KICONV_FROM_UPPER | KICONV_LOWER);
319
				KICONV_FROM_UPPER | KICONV_LOWER);
319
		if (error)
320
		if (error && errno != EEXIST)
320
			return (-1);
321
			return (-1);
321
	}
322
	}
322
323

Return to bug 216813