svn commit: r340952 - stable/12/sbin/mount_msdosfs

[Eugene Grosbein]

Author: eugen
Date: Mon Nov 26 11:20:25 2018
New Revision: 340952
URL: https://svnweb.freebsd.org/changeset/base/340952

Log:
  MFC r339816: mount_msdosfs
  
    mount_msdosfs: do not fail mounts requiring locale name conversion table
    that is already present in a kernel statically.
  
    For example, the command "mount_msdosfs -L ru_RU.KOI8-R" fails with error
    "mount_msdosfs: msdosfs_iconv: File exists" for a kernel having
    options LIBICONV and MSDOSFS_ICONV. After this change, it mounts
    successfully.
  
  MFC after:		1 month
  Differential Revision:	https://reviews.freebsd.org/D16951

Modified:
  stable/12/sbin/mount_msdosfs/mount_msdosfs.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sbin/mount_msdosfs/mount_msdosfs.c
==============================================================================
--- stable/12/sbin/mount_msdosfs/mount_msdosfs.c	Mon Nov 26 11:17:12 2018	(r340951)
+++ stable/12/sbin/mount_msdosfs/mount_msdosfs.c	Mon Nov 26 11:20:25 2018	(r340952)
@@ -46,6 +46,7 @@ static const char rcsid[] =
 
 #include <ctype.h>
 #include <err.h>
+#include <errno.h>
 #include <grp.h>
 #include <locale.h>
 #include <pwd.h>
@@ -308,17 +309,17 @@ set_charset(struct iovec **iov, int *iovlen, const cha
 
 	build_iovec_argf(iov, iovlen, "cs_win", ENCODING_UNICODE);
 	error = kiconv_add_xlat16_cspairs(ENCODING_UNICODE, cs_local);
-	if (error)
+	if (error && errno != EEXIST)
 		return (-1);
 	if (cs_dos != NULL) {
 		error = kiconv_add_xlat16_cspairs(cs_dos, cs_local);
-		if (error)
+		if (error && errno != EEXIST)
 			return (-1);
 	} else {
 		build_iovec_argf(iov, iovlen, "cs_dos", cs_local);
 		error = kiconv_add_xlat16_cspair(cs_local, cs_local,
 				KICONV_FROM_UPPER | KICONV_LOWER);
-		if (error)
+		if (error && errno != EEXIST)
 			return (-1);
 	}