pmplib-commits

[Pmplib-commits] SF.net SVN: pmplib: [131] trunk/lib/ucs2/ucs2char_iconv.c

[<ny...@us...>]

Revision: 131
Author:   nyaochi
Date:     2006-07-26 08:11:46 -0700 (Wed, 26 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=131&view=rev

Log Message:
-----------
Fixed a bug in string conversion. A string conversion always fails with a
source string longer than 512 bytes (MBS -> UCS-2) due to the incorrect
handling of returned values from iconv. This bug was the root of the JSPL
problem I've been investigating.

Modified Paths:
--------------
    trunk/lib/ucs2/ucs2char_iconv.c
Modified: trunk/lib/ucs2/ucs2char_iconv.c
===================================================================
--- trunk/lib/ucs2/ucs2char_iconv.c	2006-07-10 19:26:30 UTC (rev 130)
+++ trunk/lib/ucs2/ucs2char_iconv.c	2006-07-26 15:11:46 UTC (rev 131)
@@ -29,6 +29,7 @@
 #include <os.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -174,7 +175,7 @@
 			char *p = buffer;
 			size_t outbytesleft = 1024;
 			int iconvret = iconv(cd, (const char **)inbuf, &inbytesleft, &p, &outbytesleft);
-			if (iconvret == -1) {
+			if (iconvret == -1 && errno != E2BIG) {
 				return 0;
 			}
 			ret += (1024 - outbytesleft);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pmplib-commits] SF.net SVN: pmplib: [144] trunk/lib/ucs2/ucs2char_iconv.c

[<ny...@us...>]

Revision: 144
Author:   nyaochi
Date:     2006-07-29 08:41:31 -0700 (Sat, 29 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=144&view=rev

Log Message:
-----------
Reduced warnings, which were caused by the iconv 'const' problem.

Modified Paths:
--------------
    trunk/lib/ucs2/ucs2char_iconv.c
Modified: trunk/lib/ucs2/ucs2char_iconv.c
===================================================================
--- trunk/lib/ucs2/ucs2char_iconv.c	2006-07-29 15:27:47 UTC (rev 143)
+++ trunk/lib/ucs2/ucs2char_iconv.c	2006-07-29 15:41:31 UTC (rev 144)
@@ -45,6 +45,10 @@
 #define iconv_close	libiconv_close
 #endif/*USE_LIBICONV_GNU*/
 
+#ifndef ICONV_CONST
+#define ICONV_CONST
+#endif/*ICONV_CONST*/
+
 #define	MBS_CHARSET	"UTF-8"
 
 static char g_encoding[128];
@@ -166,7 +170,7 @@
 	if (*outbuf && out_size) {
 		size_t inbytesleft = in_size;
 		size_t outbytesleft = out_size;
-		iconv(cd, (const char **)inbuf, &inbytesleft, (char **)outbuf, &outbytesleft);
+		iconv(cd, (ICONV_CONST char **)inbuf, &inbytesleft, (char **)outbuf, &outbytesleft);
 		ret = (out_size - outbytesleft);
 	} else {
 		size_t inbytesleft = in_size;
@@ -174,7 +178,7 @@
 			char buffer[1024];
 			char *p = buffer;
 			size_t outbytesleft = 1024;
-			int iconvret = iconv(cd, (const char **)inbuf, &inbytesleft, &p, &outbytesleft);
+			int iconvret = iconv(cd, (ICONV_CONST char **)inbuf, &inbytesleft, &p, &outbytesleft);
 			if (iconvret == -1 && errno != E2BIG) {
 				return 0;
 			}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.