]> CyberLeo.Net >> Repos - FreeBSD/stable/10.git/commit
MFC r258537, r258587:
authorgjb <gjb@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Fri, 29 Nov 2013 19:44:30 +0000 (19:44 +0000)
committergjb <gjb@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Fri, 29 Nov 2013 19:44:30 +0000 (19:44 +0000)
commitfa26593571c541f567a13240361095a41d8072ca
tree617b6871ac0e81d0dfbf5a38172aed46e8dc844c
parentc45155e6b561ae523f74f0e2d527f9938dd92232
MFC r258537, r258587:

r258537 (hrs):
  Add ICONV_{GET,SET}_ILSEQ_INVALID iconvctl.  GNU iconv returns
  EILSEQ when there is an invalid character in the output codeset
  while it is valid in the input.  However, POSIX requires iconv()
  to perform an implementation-defined conversion on the character.
  So, Citrus iconv converts such a character to a special character
  which means it is invalid in the output codeset.

  This is not a problem in most cases but some software like libxml2
  depends on GNU's behavior to determine if a character is output
  as-is or another form such as a character entity (&#NNN;).

r258587 (peter):
  Move the iconv wrapper source from libc_nonshared to libc/iconv so
  that it is all in the one place again.  Rename libc/iconv/iconv.c
  to bsd_iconv.c. Compile the wrappers into libc.a so that
  WITHOUT_DYNAMICROOT works again.

Approved by: re (kib)
Sponsored by: The FreeBSD Foundation

git-svn-id: svn://svn.freebsd.org/base/stable/10@258750 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
20 files changed:
include/iconv.h
lib/libc/Makefile
lib/libc/iconv/Makefile.inc
lib/libc/iconv/__iconv.c [moved from lib/libc_nonshared/__iconv.c with 100% similarity]
lib/libc/iconv/__iconv_free_list.c [moved from lib/libc_nonshared/__iconv_free_list.c with 100% similarity]
lib/libc/iconv/__iconv_get_list.c [moved from lib/libc_nonshared/__iconv_get_list.c with 100% similarity]
lib/libc/iconv/bsd_iconv.c [new file with mode: 0644]
lib/libc/iconv/citrus_iconv_local.h
lib/libc/iconv/iconv.c
lib/libc/iconv/iconv_canonicalize.c [moved from lib/libc_nonshared/iconv_canonicalize.c with 100% similarity]
lib/libc/iconv/iconv_close.c [moved from lib/libc_nonshared/iconv_close.c with 100% similarity]
lib/libc/iconv/iconv_open.c [moved from lib/libc_nonshared/iconv_open.c with 100% similarity]
lib/libc/iconv/iconv_open_into.c [moved from lib/libc_nonshared/iconv_open_into.c with 100% similarity]
lib/libc/iconv/iconv_set_relocation_prefix.c [moved from lib/libc_nonshared/iconv_set_relocation_prefix.c with 100% similarity]
lib/libc/iconv/iconvctl.3
lib/libc/iconv/iconvctl.c [moved from lib/libc_nonshared/iconvctl.c with 100% similarity]
lib/libc/iconv/iconvlist.c [moved from lib/libc_nonshared/iconvlist.c with 100% similarity]
lib/libc_nonshared/Makefile
lib/libc_nonshared/Makefile.iconv [new file with mode: 0644]
lib/libc_nonshared/iconv.c [deleted file]