[src/trunk]: src/usr.sbin/fstyp fstyp: Fix "exfat: iconv_open UCS-2LE: Invali...

[tkusumi <tkusumi%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6e2124d10190
branches:  trunk
changeset: 466781:6e2124d10190
user:      tkusumi <tkusumi%NetBSD.org@localhost>
date:      Thu Jan 02 08:52:42 2020 +0000

description:
fstyp: Fix "exfat: iconv_open UCS-2LE: Invalid argument" failure

Fix below error for the time being.
The removed code is only relevant to Capsicum.

$ fstyp -l /dev/wd1
fstyp: exfat: iconv_open UCS-2LE: Invalid argument

diffstat:

 usr.sbin/fstyp/fstyp.c |  20 ++------------------
 1 files changed, 2 insertions(+), 18 deletions(-)

diffs (41 lines):

diff -r d0b0ebc8044f -r 6e2124d10190 usr.sbin/fstyp/fstyp.c
--- a/usr.sbin/fstyp/fstyp.c    Thu Jan 02 08:49:10 2020 +0000
+++ b/usr.sbin/fstyp/fstyp.c    Thu Jan 02 08:52:42 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fstyp.c,v 1.11 2020/01/01 12:47:19 tkusumi Exp $       */
+/*     $NetBSD: fstyp.c,v 1.12 2020/01/02 08:52:42 tkusumi Exp $       */
 
 /*-
  * Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  *
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: fstyp.c,v 1.11 2020/01/01 12:47:19 tkusumi Exp $");
+__RCSID("$NetBSD: fstyp.c,v 1.12 2020/01/02 08:52:42 tkusumi Exp $");
 
 #include <sys/param.h>
 #include <sys/disklabel.h>
@@ -220,22 +220,6 @@
        if (setlocale(LC_CTYPE, "") == NULL)
                err(1, "setlocale");
 
-       /* Cache iconv conversion data before entering capability mode. */
-       if (show_label) {
-               for (i = 0; i < (int)__arraycount(fstypes); i++) {
-                       iconv_t cd;
-
-                       if (fstypes[i].precache_encoding == NULL)
-                               continue;
-                       cd = iconv_open("", fstypes[i].precache_encoding);
-                       if (cd == (iconv_t)-1)
-                               err(1, "%s: iconv_open %s", fstypes[i].name,
-                                   fstypes[i].precache_encoding);
-                       /* Iconv keeps a small cache of unused encodings. */
-                       iconv_close(cd);
-               }
-       }
-
        /*
         * DragonFly: Filesystems may have syntax to decorate path.
         * Make a wild guess.