Hi,
I added this module. It's an xalloc-checking wrapper of 'striconv'.
* modules/xstriconv: New file.
* lib/xstriconv.h: New file.
* lib/xstriconv.c: New file.
============================= modules/xstriconv =============================
Description:
Character set conversion of strings made easy, uses iconv, with out-of-memory
checking.
Files:
lib/xstriconv.h
lib/xstriconv.c
Depends-on:
striconv
xalloc
configure.ac:
Makefile.am:
lib_SOURCES += xstriconv.h xstriconv.c
Include:
"xstriconv.h"
License:
GPL
Maintainer:
Bruno Haible, Simon Josefsson
============================== lib/xstriconv.h ==============================
/* Charset conversion with out-of-memory checking.
Copyright (C) 2001-2004, 2006 Free Software Foundation, Inc.
Written by Bruno Haible and Simon Josefsson.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifndef _XSTRICONV_H
#define _XSTRICONV_H
#include <stddef.h>
#if HAVE_ICONV
#include <iconv.h>
#endif
#ifdef __cplusplus
extern "C" {
#endif
#if HAVE_ICONV
/* Convert an entire string from one encoding to another, using iconv.
The original string is at [SRC,...,SRC+SRCLEN-1].
The conversion descriptor is passed as CD.
*RESULTP should initially contain NULL or a malloced memory block.
May change the size of the allocated memory block in *RESULTP, storing
its new address in *RESULTP and its new length in *LENGTHP.
Upon memory allocation failure, report the error and exit.
Return value: 0 if successful, otherwise -1 and errno set.
If successful, the resulting string is stored in *RESULTP and its length
in *LENGTHP. */
extern int xmem_cd_iconv (const char *src, size_t srclen, iconv_t cd,
char **resultp, size_t *lengthp);
/* Convert an entire string from one encoding to another, using iconv.
The original string is the NUL-terminated string starting at SRC.
The conversion descriptor is passed as CD. Both the "from" and the "to"
encoding must use a single NUL byte at the end of the string (i.e. not
UCS-2, UCS-4, UTF-16, UTF-32).
Allocate a malloced memory block for the result.
Upon memory allocation failure, report the error and exit.
Return value: the freshly allocated resulting NUL-terminated string if
successful, otherwise NULL and errno set. */
extern char * xstr_cd_iconv (const char *src, iconv_t cd);
#endif
/* Convert an entire string from one encoding to another, using iconv.
The original string is the NUL-terminated string starting at SRC.
Both the "from" and the "to" encoding must use a single NUL byte at the
end of the string (i.e. not UCS-2, UCS-4, UTF-16, UTF-32).
Allocate a malloced memory block for the result.
Upon memory allocation failure, report the error and exit.
Return value: the freshly allocated resulting NUL-terminated string if
successful, otherwise NULL and errno set. */
extern char * xstr_iconv (const char *src,
const char *from_codeset, const char *to_codeset);
#ifdef __cplusplus
}
#endif
#endif /* _XSTRICONV_H */
============================== lib/xstriconv.c ==============================
/* Charset conversion with out-of-memory checking.
Copyright (C) 2001-2004, 2006 Free Software Foundation, Inc.
Written by Bruno Haible.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
/* Specification. */
#include "xstriconv.h"
#include <errno.h>
#include "striconv.h"
#include "xalloc.h"
#if HAVE_ICONV
int
xmem_cd_iconv (const char *src, size_t srclen, iconv_t cd,
char **resultp, size_t *lengthp)
{
int retval = mem_cd_iconv (src, srclen, cd, resultp, lengthp);
if (retval < 0 && errno == ENOMEM)
xalloc_die ();
return retval;
}
char *
xstr_cd_iconv (const char *src, iconv_t cd)
{
char *result = str_cd_iconv (src, cd);
if (result == NULL && errno == ENOMEM)
xalloc_die ();
return result;
}
#endif
char *
xstr_iconv (const char *src, const char *from_codeset, const char *to_codeset)
{
char *result = str_iconv (src, from_codeset, to_codeset);
if (result == NULL && errno == ENOMEM)
xalloc_die ();
return result;
}
