d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Add support for BSD iconv when it is build into libc

Browse Source 
PR:		bin/162670
Submitted by:	Jan Beich <jbeich@tormail.net>
MFC after:	2 weeks
This commit is contained in:
Gabor Kovesdan 2012-05-25 22:07:13 +00:00
parent 4412ad4887
commit af483ad6ef
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libkiconv/Makefile
View File

@ -17,4 +17,8 @@ CFLAGS+= -I${.CURDIR}/../../sys
WARNS?= 1
.if !defined(MK_ICONV)
CFLAGS+= -DICONV_DLOPEN
.endif
.include <bsd.lib.mk>

10
lib/libkiconv/xlat16_iconv.c
View File

@ -60,10 +60,18 @@ struct xlat16_table {
static struct xlat16_table kiconv_xlat16_open(const char *, const char *, int);
static int chklocale(int, const char *);
#ifdef ICONV_DLOPEN
static int my_iconv_init(void);
static iconv_t (*my_iconv_open)(const char *, const char *);
static size_t (*my_iconv)(iconv_t, const char **, size_t *, char **, size_t *);
static int (*my_iconv_close)(iconv_t);
#else
#include <iconv.h>
#define my_iconv_init() 0
#define my_iconv_open iconv_open
#define my_iconv iconv
#define my_iconv_close iconv_close
#endif
static size_t my_iconv_char(iconv_t, const u_char **, size_t *, u_char **, size_t *);
int
@ -310,6 +318,7 @@ chklocale(int category, const char *code)
return (error);
}
#ifdef ICONV_DLOPEN
static int
my_iconv_init(void)
{
@ -327,6 +336,7 @@ my_iconv_init(void)
return (0);
}
#endif
static size_t
my_iconv_char(iconv_t cd, const u_char **ibuf, size_t * ilen, u_char **obuf,