Add the BSD-licensed Citrus iconv to the base system with default off

setting. It can be built by setting the WITH_ICONV knob. While this
knob is unset, the library part, the binaries, the header file and
the metadata files will not be built or installed so it makes no impact
on the system if left turned off.

This work is based on the iconv implementation in NetBSD but a great
number of improvements and feature additions have been included:

- Some utilities have been added. There is a conversion table generator,
  which can compare conversion tables to reference data generated by
  GNU libiconv. This helps ensuring conversion compatibility.
- UTF-16 surrogate support and some endianness issues have been fixed.
- The rather chaotic Makefiles to build metadata have been refactored
  and cleaned up, now it is easy to read and it is also easier to add
  support for new encodings.
- A bunch of new encodings and encoding aliases have been added.
- Support for 1->2, 1->3 and 1->4 mappings, which is needed for
  transliterating with flying accents as GNU does, like "u.
- Lots of warnings have been fixed, the major part of the code is
  now WARNS=6 clean.
- New section 1 and section 5 manual pages have been added.
- Some GNU-specific calls have been implemented:
  iconvlist(), iconvctl(), iconv_canonicalize(), iconv_open_into()
- Support for GNU's //IGNORE suffix has been added.
- The "-" argument for stdin is now recognized in iconv(1) as per POSIX.
- The Big5 conversion module has been fixed.
- The iconv.h header files is supposed to be compatible with the
  GNU version, i.e. sources should build with base iconv.h and
  GNU libiconv. It also includes a macro magic to deal with the
  char ** and const char ** incompatibility.
- GNU compatibility: "" or "char" means the current local
  encoding in use
- Various cleanups and style(9) fixes.

Approved by:	delphij (mentor)
Obtained from:	The NetBSD Project
Sponsored by:	Google Summer of Code 2009

3 files changed, 354 insertions, 0 deletions

diff --git a/usr.bin/iconv/Makefile b/usr.bin/iconv/Makefile
new file mode 100644
index 0000000..7e8f6e7
--- /dev/null
+++ b/usr.bin/iconv/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+# $NetBSD: Makefile,v 1.6 2009/04/14 22:15:21 lukem Exp $
+
+.include <bsd.own.mk>
+
+PROG=	iconv
+#SRCS=	iconv.c
+MAN=	iconv.1
+
+WARNS?=	6
+
+LDADD+=	-lcrypt
+DPADD+=	${LIBCRYPT}
+
+.include <bsd.prog.mk>
diff --git a/usr.bin/iconv/iconv.1 b/usr.bin/iconv/iconv.1
new file mode 100644
index 0000000..3018a4b
--- /dev/null
+++ b/usr.bin/iconv/iconv.1
@@ -0,0 +1,119 @@
+.\" $FreeBSD$
+.\" $NetBSD: iconv.1,v 1.3 2008/03/20 11:35:44 tnozaki Exp $
+.\"
+.\" Copyright (c)2003 Citrus Project,
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.Dd October 22, 2009
+.Dt ICONV 1
+.Os
+.Sh NAME
+.Nm iconv
+.Nd codeset conversion utility
+.Sh SYNOPSIS
+.Nm
+.Op Fl cs
+.Fl f
+.Ar from_name
+.Fl t
+.Ar to_name
+.Op Ar file ...
+.Nm
+.Fl f
+.Ar from_name
+.Op Fl cs
+.Op Fl t Ar to_name
+.Op Ar file ...
+.Nm
+.Fl t
+.Ar to_name
+.Op Fl cs
+.Op Fl f Ar from_name
+.Op Ar file ...
+.Nm
+.Fl l
+.Sh DESCRIPTION
+The
+.Nm
+utility converts the codeset of
+.Ar file
+(or from standard input if no file is specified) from codeset
+.Ar from_name
+to codeset
+.Ar to_name
+and outputs the
+converted text on standard output.
+.Pp
+The following options are available:
+.Bl -tag -width 0123
+.It Fl c
+Prevent output of any invalid characters.
+By default,
+.Nm
+outputs an
+.Dq invalid character
+specified by the
+.Ar to_name
+codeset when it encounts a character which is valid in the
+.Ar from_name
+codeset but does not have a corresponding character in the
+.Ar to_name
+codeset.
+.It Fl f
+Specifies the source codeset name as
+.Ar from_name .
+.It Fl l
+Lists available codeset names.
+Note that not all combinations of
+.Ar from_name
+and
+.Ar to_name
+are valid.
+.It Fl s
+Silent.
+By default,
+.Nm
+outputs the number of
+.Dq invalid characters
+to standard error if they exist.
+This option prevents this behaviour.
+.It Fl t
+Specifies the destination codeset name as
+.Ar to_name .
+.El
+.Sh EXIT STATUS
+.Ex -std iconv
+.Sh SEE ALSO
+.Xr mkcsmapper 1 ,
+.Xr mkesdb 1 ,
+.Xr iconv 3
+.Sh STANDARDS
+.Nm
+conform to
+.St -p1003.1-2008 .
+.Sh HISTORY
+.Nm
+first appeared in
+.Nx 2.0 , and made its appearance in
+.Fx 9.0 .
diff --git a/usr.bin/iconv/iconv.c b/usr.bin/iconv/iconv.c
new file mode 100644
index 0000000..0da65a0
--- /dev/null
+++ b/usr.bin/iconv/iconv.c
@@ -0,0 +1,220 @@
+/* $FreeBSD$ */
+/* $NetBSD: iconv.c,v 1.16 2009/02/20 15:28:21 yamt Exp $ */
+
+/*-
+ * Copyright (c)2003 Citrus Project,
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+
+#include <err.h>
+#include <errno.h>
+#include <getopt.h>
+#include <iconv.h>
+#include <limits.h>
+#include <locale.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+static unsigned long long invalids;
+
+static void		 do_conv(FILE *, const char *, const char *, bool, bool);
+static int		 do_list(unsigned int, const char * const *, void *);
+static void		 usage(void);
+
+struct option long_options[] =
+{
+	{"from-code",		required_argument,	NULL, 'f'},
+	{"list",		no_argument,		NULL, 'l'},
+	{"silent",		no_argument,		NULL, 's'},
+        {"to-code",		required_argument,	NULL, 't'},
+        {NULL,                  no_argument,            NULL, 0}
+};
+
+static void
+usage(void)
+{
+	(void)fprintf(stderr,
+	    "Usage:\t%1$s [-cs] -f <from_code> -t <to_code> [file ...]\n"
+	    "\t%1$s -f <from_code> [-cs] [-t <to_code>] [file ...]\n"
+	    "\t%1$s -t <to_code> [-cs] [-f <from_code>] [file ...]\n"
+	    "\t%1$s -l\n", getprogname());
+	exit(1);
+}
+
+#define INBUFSIZE 1024
+#define OUTBUFSIZE (INBUFSIZE * 2)
+static void
+do_conv(FILE *fp, const char *from, const char *to, bool silent,
+    bool hide_invalid)
+{
+	iconv_t cd;
+	char inbuf[INBUFSIZE], outbuf[OUTBUFSIZE], *out;
+	char *in;
+	size_t inbytes, outbytes, ret;
+
+	if ((cd = iconv_open(to, from)) == (iconv_t)-1)
+		err(EXIT_FAILURE, "iconv_open(%s, %s)", to, from);
+
+	if (hide_invalid) {
+		int arg = 1;
+
+		if (iconvctl(cd, ICONV_SET_DISCARD_ILSEQ, (void *)&arg) == -1)
+			err(1, NULL);
+	}
+	while ((inbytes = fread(inbuf, 1, INBUFSIZE, fp)) > 0) {
+		in = inbuf;
+		while (inbytes > 0) {
+			size_t inval;
+
+			out = outbuf;
+			outbytes = OUTBUFSIZE;
+			ret = __iconv(cd, &in, &inbytes, &out, &outbytes,
+			    0, &inval);
+			invalids += inval;
+			if (outbytes < OUTBUFSIZE)
+				(void)fwrite(outbuf, 1, OUTBUFSIZE - outbytes,
+				    stdout);
+			if (ret == (size_t)-1 && errno != E2BIG) {
+				if (errno != EINVAL || in == inbuf)
+					err(EXIT_FAILURE, "iconv()");
+
+				/* incomplete input character */
+				(void)memmove(inbuf, in, inbytes);
+				ret = fread(inbuf + inbytes, 1,
+				    INBUFSIZE - inbytes, fp);
+				if (ret == 0) {
+					fflush(stdout);
+					if (feof(fp))
+						errx(EXIT_FAILURE,
+						    "unexpected end of file; "
+						    "the last character is "
+						    "incomplete.");
+					else
+						err(EXIT_FAILURE, "fread()");
+				}
+				in = inbuf;
+				inbytes += ret;
+			}
+		}
+	}
+	/* reset the shift state of the output buffer */
+	outbytes = OUTBUFSIZE;
+	out = outbuf;
+	ret = iconv(cd, NULL, NULL, &out, &outbytes);
+	if (ret == (size_t)-1)
+		err(EXIT_FAILURE, "iconv()");
+	if (outbytes < OUTBUFSIZE)
+		(void)fwrite(outbuf, 1, OUTBUFSIZE - outbytes, stdout);
+
+	if (invalids > 0 && !silent)
+		warnx("warning: invalid characters: %llu", invalids);
+
+	iconv_close(cd);
+}
+
+static int
+do_list(unsigned int n, const char * const *list, void *data __unused)
+{
+	unsigned int i;
+
+	for(i = 0; i < n; i++) {
+		printf("%s", list[i]);
+		if (i < n - 1)
+			printf(" ");
+	}
+	printf("\n");
+
+	return (1);
+}
+
+int
+main(int argc, char **argv)
+{
+	FILE *fp;
+	char *opt_f, *opt_t;
+	int ch, i;
+	bool opt_c = false, opt_s = false;
+
+	opt_f = opt_t = strdup("");
+
+	setlocale(LC_ALL, "");
+	setprogname(argv[0]);
+
+	while ((ch = getopt_long(argc, argv, "csLlf:t:",
+	    long_options, NULL)) != -1) {
+		switch (ch) {
+		case 'c':
+			opt_c = true;
+			break;
+		case 's':
+			opt_s = true;
+			break;
+		case 'l':
+			/* list */
+			if (opt_s || opt_c || strcmp(opt_f, "") != 0 ||
+			    strcmp(opt_t, "") != 0) {
+				warnx("-l is not allowed with other flags.");
+				usage();
+			}
+			iconvlist(do_list, NULL);
+			return (EXIT_SUCCESS);
+		case 'f':
+			/* from */
+			if (optarg != NULL)
+				opt_f = strdup(optarg);
+			break;
+		case 't':
+			/* to */
+			if (optarg != NULL)
+				opt_t = strdup(optarg);
+			break;
+		default:
+			usage();
+		}
+	}
+	argc -= optind;
+	argv += optind;
+	if ((strcmp(opt_f, "") == 0) && (strcmp(opt_t, "") == 0))
+		usage();
+	if (argc == 0)
+		do_conv(stdin, opt_f, opt_t, opt_s, opt_c);
+	else {
+		for (i = 0; i < argc; i++) {
+			fp = (strcmp(argv[i], "-") != 0) ?
+			    fopen(argv[i], "r") : stdin;
+			if (fp == NULL)
+				err(EXIT_FAILURE, "Cannot open `%s'",
+				    argv[i]);
+			do_conv(fp, opt_f, opt_t, opt_s,
+			    opt_c);
+			(void)fclose(fp);
+		}
+	}
+	return (EXIT_SUCCESS);
+}