about summary refs log tree commit diff
path: root/iconv
diff options
context:
space:
mode:
Diffstat (limited to 'iconv')
-rw-r--r--iconv/gconv.c4
-rw-r--r--iconv/gconv.h4
-rw-r--r--iconv/gconv_simple.c36
-rw-r--r--iconv/iconv_open.c46
4 files changed, 79 insertions, 11 deletions
diff --git a/iconv/gconv.c b/iconv/gconv.c
index 537d0dc3e7..0cbb052a6d 100644
--- a/iconv/gconv.c
+++ b/iconv/gconv.c
@@ -27,6 +27,7 @@ __gconv (gconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf,
 	 size_t *outbytesleft, size_t *converted)
 {
   size_t last_step = cd->nsteps - 1;
+  size_t oldinbytes = *inbytesleft;
   int result;
 
   cd->data[last_step].outbuf = *outbuf;
@@ -36,9 +37,10 @@ __gconv (gconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf,
   if (converted != NULL)
     *converted = 0;
 
-  result = (*cd->steps->fct) (cd->steps, cd->data, inbuf, inbytesleft,
+  result = (*cd->steps->fct) (cd->steps, cd->data, *inbuf, inbytesleft,
 			      converted, inbuf == NULL || *inbuf == NULL);
 
+  *inbuf += oldinbytes - *inbytesleft;
   *outbuf += cd->data[last_step].outbufavail;
   *outbytesleft -= cd->data[last_step].outbufavail;
 
diff --git a/iconv/gconv.h b/iconv/gconv.h
index 45f3a6cf8a..2c42f99ace 100644
--- a/iconv/gconv.h
+++ b/iconv/gconv.h
@@ -24,6 +24,8 @@
 #include <sys/types.h>
 #include <regex.h>
 
+__BEGIN_DECLS
+
 /* Error codes for gconv functions.  */
 enum
 {
@@ -202,4 +204,6 @@ extern void __gconv_transform_end_rstate __P ((struct gconv_step_data *__data));
 
 #endif
 
+__END_DECLS
+
 #endif /* gconv.h */
diff --git a/iconv/gconv_simple.c b/iconv/gconv_simple.c
index 91a347b058..582c6f5a27 100644
--- a/iconv/gconv_simple.c
+++ b/iconv/gconv_simple.c
@@ -123,14 +123,23 @@ __gconv_transform_ucs4_utf8 (struct gconv_step *step,
 					  data->outbufsize - data->outbufavail,
 					  (mbstate_t *) data->data);
 
-	  /* Status so far.  */
-	  result = GCONV_EMPTY_INPUT;
-
 	  /* Remember how much we converted.  */
 	  do_write += newinbuf - inbuf;
 	  *inlen -= (newinbuf - inbuf) * sizeof (wchar_t);
 
 	  data->outbufavail += actually;
+
+	  if (data->is_last)
+	    {
+	      /* This is the last step.  */
+	      result = (*inlen < sizeof (wchar_t)
+			? GCONV_EMPTY_INPUT : GCONV_FULL_OUTPUT);
+	      break;
+	    }
+
+	  /* Status so far.  */
+	  result = GCONV_EMPTY_INPUT;
+
 	  if (data->outbufavail > 0)
 	    {
 	      /* Call the functions below in the chain.  */
@@ -140,7 +149,7 @@ __gconv_transform_ucs4_utf8 (struct gconv_step *step,
 			       written, 0);
 
 	      /* Correct the output buffer.  */
-	      if (newavail != data->outbufavail)
+	      if (newavail != data->outbufavail && newavail > 0)
 		{
 		  memmove (data->outbuf,
 			   &data->outbuf[data->outbufavail - newavail],
@@ -204,14 +213,23 @@ __gconv_transform_utf8_ucs4 (struct gconv_step *step,
 					   / sizeof (wchar_t)),
 					  (mbstate_t *) data->data);
 
-	  /* Status so far.  */
-	  result = GCONV_EMPTY_INPUT;
-
 	  /* Remember how much we converted.  */
 	  do_write += actually;
 	  *inlen -= newinbuf - inbuf;
 
 	  data->outbufavail += actually * sizeof (wchar_t);
+
+	  if (data->is_last)
+	    {
+	      /* This is the last step.  */
+	      result = (data->outbufavail + sizeof (wchar_t) > data->outbufsize
+			? GCONV_FULL_OUTPUT : GCONV_EMPTY_INPUT);
+	      break;
+	    }
+
+	  /* Status so far.  */
+	  result = GCONV_EMPTY_INPUT;
+
 	  if (data->outbufavail > 0)
 	    {
 	      /* Call the functions below in the chain.  */
@@ -221,7 +239,7 @@ __gconv_transform_utf8_ucs4 (struct gconv_step *step,
 			       written, 0);
 
 	      /* Correct the output buffer.  */
-	      if (newavail != data->outbufavail)
+	      if (newavail != data->outbufavail && newavail > 0)
 		{
 		  memmove (data->outbuf,
 			   &data->outbuf[data->outbufavail - newavail],
@@ -236,5 +254,5 @@ __gconv_transform_utf8_ucs4 (struct gconv_step *step,
   if (written != NULL && data->is_last)
     *written = do_write;
 
-  return GCONV_OK;
+  return result;
 }
diff --git a/iconv/iconv_open.c b/iconv/iconv_open.c
index dadf3d9dbb..82802b7451 100644
--- a/iconv/iconv_open.c
+++ b/iconv/iconv_open.c
@@ -18,19 +18,63 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#include <ctype.h>
 #include <errno.h>
 #include <iconv.h>
+#include <string.h>
 
 #include <gconv.h>
 
 
+static inline void
+strip (char *s)
+{
+  int slash_count = 0;
+  char *wp;
+  wp = s;
+
+  while (*s != '\0')
+    {
+      if (isalnum (*s) || *s == '_' || *s == '-' || *s == '.')
+	*wp++ = *s;
+      else if (*s == '/')
+	{
+	  if (++slash_count == 2)
+	    break;
+	  *wp++ = '/';
+	}
+      ++s;
+    }
+
+  while (slash_count++ < 2)
+    *wp++ = '/';
+
+  *wp = '\0';
+}
+
+
 iconv_t
 iconv_open (const char *tocode, const char *fromcode)
 {
+  char *tocode_conv;
+  char *fromcode_conv;
+  size_t tocode_len;
+  size_t fromcode_len;
   gconv_t cd;
   int res;
 
-  res = __gconv_open (tocode, fromcode, &cd);
+  /* Normalize the name.  We remove all characters beside alpha-numeric,
+     '_', '-', '/', and '.'.  */
+  tocode_len = strlen (tocode);
+  tocode_conv = alloca (tocode_len + 3);
+  strip (memcpy (tocode_conv, tocode, tocode_len + 1));
+
+  fromcode_len = strlen (fromcode);
+  fromcode_conv = alloca (fromcode_len + 3);
+  strip (memcpy (fromcode_conv, fromcode, fromcode_len + 1));
+
+  res = __gconv_open (tocode_conv[2] == '\0' ? tocode : tocode_conv,
+		      fromcode_conv[2] == '\0' ? fromcode, fromcode_conv, &cd);
 
   if (res != GCONV_OK)
     {