jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-27 00:33:30 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

MFC r339816: mount_msdosfs

Browse Source 
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
This commit is contained in:
Eugene Grosbein 2018-11-26 11:22:04 +00:00
parent 15d5d4fb25
commit 4a18c56d33
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/stable/11/; revision=340953
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sbin/mount_msdosfs/mount_msdosfs.c
View File

@ -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 char *cs_local, const char *c
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);
}