CVS libidn/gl

[libidn-commit]

Update of /home/cvs/libidn/gl
In directory dopio:/tmp/cvs-serv11629/gl

Modified Files:
        Makefile.am 
Added Files:
        iconvme.c iconvme.h 
Log Message:
Add iconvme from gnulib.

--- /home/cvs/libidn/gl/Makefile.am     2004/10/15 23:05:41     1.11
+++ /home/cvs/libidn/gl/Makefile.am     2005/01/05 01:43:35     1.12
@@ -9,7 +9,7 @@
 #
 # Generated by gnulib-tool.
 # Invoked as: gnulib-tool --import
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl 
--m4-base=gl/m4 --libtool --lgpl dummy error getopt gettext strdup
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl 
--m4-base=gl/m4 --libtool --lgpl dummy error getopt gettext iconv iconvme strdup
 
 AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
 
@@ -52,6 +52,13 @@
 
 ## end   gnulib module gettext
 
+## begin gnulib module iconvme
+
+libgnu_la_SOURCES += iconvme.h iconvme.c
+libgnu_la_LIBADD += $(LTLIBICONV)
+
+## end   gnulib module iconvme
+
 ## begin gnulib module strdup
 
 libgnu_la_SOURCES += strdup.h

--- /home/cvs/libidn/gl/iconvme.c       2005/01/05 01:43:35     NONE
+++ /home/cvs/libidn/gl/iconvme.c       2005/01/05 01:43:35     1.1
/* Recode strings between character sets, using iconv.
   Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.

   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1, 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 Lesser General Public License for more details.

   You should have received a copy of the GNU Lesser General Public License 
along
   with this program; if not, write to the Free Software Foundation,
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

#ifdef HAVE_CONFIG_H
# include <config.h>
#endif

/* Get prototype. */
#include "iconvme.h"

/* Get malloc. */
#include <stdlib.h>

/* Get strcmp. */
#include <string.h>

/* Get errno. */
#include <errno.h>

#if HAVE_ICONV
/* Get iconv etc. */
# include <iconv.h>
/* Get MB_LEN_MAX. */
# include <limits.h>
#endif

/* Get strdup. */
#include "strdup.h"

/* Convert a zero-terminated string STR from the FROM_CODSET code set
   to the TO_CODESET code set.  The returned string is allocated using
   malloc, and must be dellocated by the caller using free.  On
   failure, NULL is returned and errno holds the error reason.  Note
   that if TO_CODESET uses \0 for anything but to terminate the
   string, the caller of this function may have difficulties finding
   out the length of the output string.  */
char *
iconv_string (const char *str, const char *from_codeset,
              const char *to_codeset)
{
  char *dest = NULL;
#if HAVE_ICONV
  iconv_t cd;
  char *outp;
  char *p = (char *) str;
  size_t inbytes_remaining = strlen (p);
  /* Guess the maximum length the output string can have.  */
  size_t outbuf_size = (inbytes_remaining + 1) * MB_LEN_MAX;
  size_t outbytes_remaining = outbuf_size - 1; /* -1 for NUL */
  size_t err;
  int have_error = 0;
#endif

  if (strcmp (to_codeset, from_codeset) == 0)
    return strdup (str);

#if HAVE_ICONV
  cd = iconv_open (to_codeset, from_codeset);
  if (cd == (iconv_t) - 1)
    return NULL;

  outp = dest = malloc (outbuf_size);
  if (dest == NULL)
    goto out;

again:
  err = iconv (cd, &p, &inbytes_remaining, &outp, &outbytes_remaining);

  if (err == (size_t) - 1)
    {
      switch (errno)
        {
        case EINVAL:
          /* Incomplete text, do not report an error */
          break;

        case E2BIG:
          {
            size_t used = outp - dest;
            size_t newsize = outbuf_size * 2;
            char *newdest;

            if (newsize <= outbuf_size)
              {
                errno = ENOMEM;
                have_error = 1;
                goto out;
              }
            if (!(newdest = realloc (dest, newsize)))
              {
                have_error = 1;
                goto out;
              }
            dest = newdest;
            outbuf_size = newsize;

            outp = dest + used;
            outbytes_remaining = outbuf_size - used - 1;        /* -1 for NUL */

            goto again;
          }
          break;

        case EILSEQ:
          have_error = 1;
          break;

        default:
          have_error = 1;
          break;
        }
    }

  *outp = '\0';

out:
  {
    int save_errno = errno;

    if (iconv_close (cd) < 0 && !have_error)
      {
        /* If we didn't have a real error before, make sure we restore
           the iconv_close error below. */
        save_errno = errno;
        have_error = 1;
      }

    if (have_error && dest)
      {
        free (dest);
        dest = NULL;
        errno = save_errno;
      }
  }
#else
  errno = ENOSYS;
#endif

  return dest;
}
--- /home/cvs/libidn/gl/iconvme.h       2005/01/05 01:43:35     NONE
+++ /home/cvs/libidn/gl/iconvme.h       2005/01/05 01:43:35     1.1
/* Recode strings between character sets, using iconv.
   Copyright (C) 2004 Free Software Foundation, Inc.
   Written by Simon Josefsson.

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1, 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 Lesser General Public License for more details.

   You should have received a copy of the GNU Lesser General Public License 
along
   with this program; if not, write to the Free Software Foundation,
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

#ifndef ICONVME_H
# define ICONVME_H

extern char *iconv_string (const char *string, const char *from_code,
                           const char *to_code);

#endif /* ICONVME_H */