summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorgabor <gabor@FreeBSD.org>2011-02-25 00:04:39 +0000
committergabor <gabor@FreeBSD.org>2011-02-25 00:04:39 +0000
commitc91ab1769b1237e3663d59888cebe31ceee47570 (patch)
treeed256cfe2a006269f4a380597f93880be8d5c1cd /include
parent5aabdb149c1a96a1e9717d45fde4096807423095 (diff)
downloadFreeBSD-src-c91ab1769b1237e3663d59888cebe31ceee47570.zip
FreeBSD-src-c91ab1769b1237e3663d59888cebe31ceee47570.tar.gz
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
Diffstat (limited to 'include')
-rw-r--r--include/Makefile4
-rw-r--r--include/iconv.h138
-rw-r--r--include/paths.h7
3 files changed, 149 insertions, 0 deletions
diff --git a/include/Makefile b/include/Makefile
index 3bdc48e..249db95 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -68,6 +68,10 @@ _dev_ieee488= dev/ieee488
INCS+= hesiod.h
.endif
+.if ${MK_ICONV} != "no"
+INCS+= iconv.h
+.endif
+
.if ${MK_BLUETOOTH} != "no"
LSUBSUBDIRS+= netgraph/bluetooth/include
.endif
diff --git a/include/iconv.h b/include/iconv.h
new file mode 100644
index 0000000..eecb2fd
--- /dev/null
+++ b/include/iconv.h
@@ -0,0 +1,138 @@
+/* $FreeBSD$ */
+/* $NetBSD: iconv.h,v 1.6 2005/02/03 04:39:32 perry Exp $ */
+
+/*-
+ * Copyright (c) 2003 Citrus Project,
+ * Copyright (c) 2009, 2010 Gabor Kovesdan <gabor@FreeBSD.org>
+ * 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.
+ *
+ */
+
+#ifndef _ICONV_H_
+#define _ICONV_H_
+
+#include <sys/cdefs.h>
+#include <sys/types.h>
+
+#include <stdbool.h>
+#include <wchar.h>
+
+#include <sys/cdefs.h>
+#include <sys/types.h>
+
+#define iconv_open libiconv_open
+#define iconv_close libiconv_close
+#define iconv(cd, in, insize, out, outsize) libiconv(cd, __DECONST(char **, in), insize, out, outsize)
+#define iconv_t libiconv_t
+
+struct __tag_iconv_t;
+typedef struct __tag_iconv_t *iconv_t;
+
+__BEGIN_DECLS
+iconv_t libiconv_open(const char *, const char *);
+size_t libiconv(iconv_t, char ** __restrict,
+ size_t * __restrict, char ** __restrict,
+ size_t * __restrict);
+int libiconv_close(iconv_t);
+/*
+ * non-portable interfaces for iconv
+ */
+int __iconv_get_list(char ***, size_t *, bool);
+void __iconv_free_list(char **, size_t);
+size_t __iconv(iconv_t, char **, size_t *, char **,
+ size_t *, __uint32_t, size_t *);
+#define __ICONV_F_HIDE_INVALID 0x0001
+
+/*
+ * GNU interfaces for iconv
+ */
+#define iconv_open_into libiconv_open_into
+#define iconvctl libiconvctl
+#define iconvlist libiconvlist
+
+/* We have iconvctl() */
+#define _LIBICONV_VERSION 0x0108
+extern int _libiconv_version;
+
+typedef struct {
+ void *spaceholder[64];
+} iconv_allocation_t;
+
+int iconv_open_into(const char *, const char *, iconv_allocation_t *);
+void libiconv_set_relocation_prefix (const char *orig_prefix,
+ const char *curr_prefix);
+
+/*
+ * iconvctl() request macros
+ */
+#define ICONV_TRIVIALP 0
+#define ICONV_GET_TRANSLITERATE 1
+#define ICONV_SET_TRANSLITERATE 2
+#define ICONV_GET_DISCARD_ILSEQ 3
+#define ICONV_SET_DISCARD_ILSEQ 4
+#define ICONV_SET_HOOKS 5
+#define ICONV_SET_FALLBACKS 6
+
+typedef void (*iconv_unicode_char_hook) (unsigned int mbr, void *data);
+typedef void (*iconv_wide_char_hook) (wchar_t wc, void *data);
+
+struct iconv_hooks {
+ iconv_unicode_char_hook uc_hook;
+ iconv_wide_char_hook wc_hook;
+ void *data;
+};
+
+/*
+ * Fallbacks aren't supported but type definitions are provided for
+ * source compatibility.
+ */
+typedef void (*iconv_unicode_mb_to_uc_fallback) (const char*,
+ size_t, void (*write_replacement) (const unsigned int *,
+ size_t, void*), void*, void*);
+typedef void (*iconv_unicode_uc_to_mb_fallback) (unsigned int,
+ void (*write_replacement) (const char *, size_t, void*),
+ void*, void*);
+typedef void (*iconv_wchar_mb_to_wc_fallback) (const char*, size_t,
+ void (*write_replacement) (const wchar_t *, size_t, void*),
+ void*, void*);
+typedef void (*iconv_wchar_wc_to_mb_fallback) (wchar_t,
+ void (*write_replacement) (const char *, size_t, void*),
+ void*, void*);
+
+struct iconv_fallbacks {
+ iconv_unicode_mb_to_uc_fallback mb_to_uc_fallback;
+ iconv_unicode_uc_to_mb_fallback uc_to_mb_fallback;
+ iconv_wchar_mb_to_wc_fallback mb_to_wc_fallback;
+ iconv_wchar_wc_to_mb_fallback wc_to_mb_fallback;
+ void *data;
+};
+
+
+void iconvlist(int (*do_one) (unsigned int, const char * const *,
+ void *), void *);
+const char *iconv_canonicalize(const char *);
+int iconvctl(iconv_t, int, void *);
+__END_DECLS
+
+#endif /* !_ICONV_H_ */
diff --git a/include/paths.h b/include/paths.h
index 0cbc092..6503934 100644
--- a/include/paths.h
+++ b/include/paths.h
@@ -49,14 +49,21 @@
#define _PATH_CONSOLE "/dev/console"
#define _PATH_CP "/bin/cp"
#define _PATH_CSHELL "/bin/csh"
+#define _PATH_CSMAPPER "/usr/share/i18n/csmapper"
#define _PATH_DEFTAPE "/dev/sa0"
#define _PATH_DEVNULL "/dev/null"
#define _PATH_DEVZERO "/dev/zero"
#define _PATH_DRUM "/dev/drum"
+#define _PATH_ESDB "/usr/share/i18n/esdb"
#define _PATH_ETC "/etc"
#define _PATH_FTPUSERS "/etc/ftpusers"
#define _PATH_FWMEM "/dev/fwmem"
#define _PATH_HALT "/sbin/halt"
+#ifdef COMPAT_32BIT
+#define _PATH_I18NMODULE "/usr/lib32/i18n"
+#else
+#define _PATH_I18NMODULE "/usr/lib/i18n"
+#endif
#define _PATH_IFCONFIG "/sbin/ifconfig"
#define _PATH_KMEM "/dev/kmem"
#define _PATH_LIBMAP_CONF "/etc/libmap.conf"
OpenPOWER on IntegriCloud