WebSVN – Kolibri OS – Diff – /programs/develop/libraries/iconv/iconv.c

 #include
-//#include
+#include
-typedef unsigned int size_t;
-#define NULL ((void*)0)
+#include
 typedef int conv_t;
-typedef unsigned int ucs4_t;
 typedef unsigned int ucs4_t;
-typedef int iconv_t;
 typedef int iconv_t;
 /* Return code if invalid input after a shift sequence of n bytes was read.
    (xxx_mbtowc) */
 #define RET_SHIFT_ILSEQ(n)  (-1-2*(n))
 /* Return code if invalid. (xxx_wctomb) */
 #define RET_ILUNI      -1
 /* Return code if output buffer is too small. (xxx_wctomb, xxx_reset) */
 #define RET_TOOSMALL   -2
 #define CP866 0
 #define CP1251 1
 #define CP1252 2
 #define KOI8_RU 3
 #include "cp1252.h"
 #include "koi8_ru.h"
 #include "iso8859_5.h"
 #include "utf8.h"
+int encoding(const char *someencoding) {
 int encoding(char *what) {
 	char *what = strdup(someencoding);
 	/* Ignore //TRANSLIT or //IGNORE for now. */
 	int i;
 	for(i = 0; i < strlen(what); i++) {
+	  }
+	}
 	if (!strcasecmp(what,"CP866")) return CP866;
+	if (!strcasecmp(what,"CP1251")) return CP1251;
-	if (!strcasecmp(what,"CP1251")) return CP1251;
+	if (!strcasecmp(what,"windows-1251")) return CP1251;
 	if (!strcasecmp(what,"windows-1252")) return CP1252;
 	if (!strcasecmp(what,"CP1252")) return CP1252;
 	if (!strcasecmp(what,"KOI8-RU")) return KOI8_RU;
 	if (!strcasecmp(what,"ISO8859-5")) return ISO8859_5;
 	if (!strcasecmp(what,"UTF-8")) return UTF_8;
 	return -1;
-}
+}
 iconv_t iconv_open(const char *tocode, const char *fromcode) {
 	int to, from;
 	if ((to=encoding(tocode))==-1) return -1;
+	if ((from=encoding(fromcode))==-1) return -1;
 	if ((from=encoding(fromcode))==-1) return -1;
 	to=to<<16&0xFFFF0000;
-	to=to<<16&0xFFFF0000;
+	from=from&0xFFFF;
 	from=from&0xFFFF;
+}
 size_t iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft,
 	char **outbuf, size_t *outbytesleft)
+{
-{
+	int n, to, from;
+	size_t count1,count2;
-	int n, to, from, count1,count2;
+	unsigned int pwc;
-	int pwc, converted,written;
+	int converted,written;
 	int (*mbtowc)(conv_t, ucs4_t *, const unsigned char *, int);
-	int (*wctomb)(conv_t, ucs4_t *, const unsigned char *, int);
-	char *str;
-	str=*outbuf;
+	int (*wctomb)(conv_t, unsigned char *, ucs4_t, int);
-	from=cd>>16;
+	to=cd>>16;
-	to=cd&0xFFFF;
+	from=cd&0xFFFF;
 	switch (from)
+	{
 		case CP866: mbtowc=cp866_mbtowc; break;
 		case CP1251: mbtowc=cp1251_mbtowc; break;
 		case CP1252: mbtowc=cp1252_mbtowc; break;
 		case ISO8859_5: mbtowc=iso8859_5_mbtowc; break;
 		case KOI8_RU: mbtowc=koi8_ru_mbtowc; break;
 		case UTF_8: mbtowc=utf8_mbtowc; break;
-		default: return -2;
+		default: return (size_t)-1;
+	}
 	switch (to)
+	{
 		case CP866: wctomb=cp866_wctomb; break;
 		case CP1251: wctomb=cp1251_wctomb; break;
 		case CP1252: wctomb=cp1252_wctomb; break;
-		case ISO8859_5: wctomb=iso8859_5_wctomb; break;
-		case KOI8_RU: wctomb=koi8_ru_wctomb; break;
-		case UTF_8: wctomb=utf8_wctomb; break;
-		default: return -3;
-	}
-    if(from == to) {
-      int oc=0,ic=0;
-      while(*inbytesleft > 0 && *outbytesleft > 0) {
-        str[oc]=(*inbuf)[ic];
-        ++ic;
-        ++oc;
-        (*inbytesleft)--;
-        (*outbytesleft)--;
-        (*outbuf)++;
+		case ISO8859_5: wctomb=iso8859_5_wctomb; break;
 		case KOI8_RU: wctomb=koi8_ru_wctomb; break;
 		case UTF_8: wctomb=utf8_wctomb; break;
+		default: return (size_t)-1;
+	}
-      return 0;
+	count1=0;
-    }
+	count2=0;
-	count1=0;
-	count2=0;
+    /* Convert input multibyte char to wide character by using calls to mbtowc */
-	while ( *inbytesleft>0 && *outbytesleft>1)
+    /* Convert wide character to multibyte by calls to wctomb */
-	{
+    /* Handle errors as we go on converting to be as standard compliant as possible */
-		n=1;
-		do {
+    while(count1 < *inbytesleft) {
-		//converted= (utf8_mbtowc)(0,&pwc,((*inbuf)+count1),n);
+      unsigned char mbholder[] = { 0,0,0,0,0,0 };
-		//	printf("%d\n",n);
-		converted= (mbtowc)(0,&pwc,((*inbuf)+count1),n);
+      int numbytes = (mbtowc)(0, &pwc,((*inbuf)+count1), *inbytesleft - count1);
+      if(numbytes < 0) {
-		n++;
+        /* errno = EILSEQ if invalid multibyte sequence encountered in input */
-		}	while (converted==RET_TOOFEW(0));
-		if (converted<0) return -10;
+        /* errno = EINVAL if input ends in the middle of a multibyte sequence */
-		//written=  (cp866_wctomb)(0,str+count2,pwc,1);
-		written=  (wctomb)(0,str+count2,pwc,1);
-		if (written<0) written=0;//return -11;
+        switch(numbytes) {
-		//printf("Conv:%d Wri:%d In:%d Out:%d UTF:%x UCS:%x 866:%s\n",converted, written, *inbytesleft,*outbytesleft,*((*inbuf)+count1),pwc, str);
+          case RET_TOOFEW(0):
+            errno = EINVAL;
-		(*inbytesleft)-=converted;
+            break;
+          case RET_ILSEQ:
+            errno = EILSEQ;
-		(*outbytesleft)-=written;
+            break;
+        }
+        *inbytesleft -= count1;
+        *outbytesleft -= count2;
+        *inbuf += count1;
+        *outbuf += count2;
+        return (size_t) -1;
+      }
+      /* Convert from wide to multibyte storing result in mbholder and num converted in numbytes2 */
+      /* Pass the minimum amount of space we have, one from mbholder and one from remaining in outbuf */
+      int minspace = sizeof(mbholder) <= (*outbytesleft - count2) ? sizeof(mbholder) : (*outbytesleft - count2);
+      int numbytes2 = (wctomb)(0, &mbholder[0], pwc, minspace);
-		(*outbuf)+=written;
+      if(numbytes2 < 0) {
+        switch(numbytes2) {
+          case RET_ILUNI:
+            errno = EILSEQ;
+            break;
-		count1+=converted;
-		count2+=written;
-	}
-	*(str+count2)='\0';
-	if (*inbytesleft>0 && *outbytesleft==0) return -12;
-	return 0;
-}
-/*
+          case RET_TOOSMALL:
-int main()
-{
-	char *s;// ="вертолет";
-	char *z;
-	//unsigned int pwc;
-	iconv_t cd;
-	int in, out;
-		FILE *infile;
-		char *fname = "file.txt";
-		infile = fopen(fname,"r");
-	fseek(infile, 0, SEEK_END);
-	size_t file_size = ftell(infile);
-	rewind(infile);
-	//printf ("LOL\n");
-	char *buffer = (char*)malloc(file_size * sizeof(char));
-	if (buffer == NULL)
-	{
-		fclose(infile);
-		printf("Error allocating %d bytes.\n", file_size * sizeof(char));
+            errno = E2BIG;
-		return -1;
-	}
-	size_t bytes_read = fread(buffer, sizeof(char), file_size, infile);
-	if (bytes_read != file_size)
-	{
-		printf("Have read only %d bytes of %d.\n", bytes_read, file_size);
-		free(buffer);
+            break;
-		fclose(infile);
+        }
-		return -1;
-	}
-	in=strlen(buffer);
+        *inbytesleft -= count1;
-	z=malloc(in+1);
+        *outbytesleft -= count2;
+        *inbuf += count1;
+        *outbuf += count2;
+        return (size_t) -1;
+      }
+      int i;
+      for(i = 0; i < numbytes2; i++) {
+        *(*outbuf + count2 + i) = mbholder[i];
-	out=in+1;
+      }
+      count1+=numbytes;
+      count2+=numbytes2;
+    }
+    /* Successfully converted everything, update the variables and return number of bytes converted */
+    *inbytesleft -= count1;
+    *outbytesleft -= count2;
+    *inbuf += count1;
+    *outbuf += count2;
+    return count1;
+}
+/* int main() */
+/* { */
+/* 	char *s;// ="вертолет"; */
+/* 	char *z; */
+/* 	//unsigned int pwc; */
+/* 	iconv_t cd; */
+/* 	size_t in, out; */
+/*     FILE *infile; */
+/*     char *fname = "file3.txt"; */
+/*     size_t testmax = 100; */
+/*     size_t test = 0; */
+/*     infile = fopen(fname,"r"); */
+/* 	fseek(infile, 0, SEEK_END); */
+/* 	size_t file_size = ftell(infile); */
+/* 	rewind(infile); */
+/* 	char *buffer = (char*)malloc(file_size * sizeof(char)); */
+/* 	if (buffer == NULL) */
+/* 	{ */
+/* 		fclose(infile); */
+/* 		printf("Error allocating %d bytes.\n", file_size * sizeof(char)); */
+/* 		return -1; */
+/* 	} */
+/* 	size_t bytes_read = fread(buffer, sizeof(char), file_size, infile); */
+/* 	if (bytes_read != file_size) */
+/* 	{ */
+/* 		/\* printf("Have read only %d bytes of %d.\n", bytes_read, file_size); *\/ */
+/* 		free(buffer); */
+/* 		fclose(infile); */
+/* 		return -1; */
+/* 	} */
+/* 	/\* in=strlen(buffer); *\/ */
+/*     in = bytes_read; */
+/* 	z=malloc(in+12000); */
+/* 	out=in-1000; */
+/* 	cd=iconv_open("UTF-8","UTF-8"); */
+/* //	printf("%x\n",cd); */
+/* 	int t; */
+/*     char *zor = z; */
+/*     /\* for(t = 0; t < 27400; t++) *\/ */
-	cd=iconv_open("CP1251","CP866");
+/*     /\*    printf("0x%x,", buffer[t]); *\/ */
-//	printf("%x\n",cd);
-	int t;
+/* 	t=iconv(cd, &buffer, &in, &z, &out); */
-	t=iconv(cd, &buffer, &in, &z, &out);
+/* 	/\* printf("\nResult after iconv(): %d", t); *\/ */
-	printf("\nResult: %d", t);
-	puts(z);
+/*     /\* for(t = 0; t < 24259; t++) *\/ */
-	//for (;s
+/*     /\*   printf("%c", zor[t]); *\/ */
-}
-*/
+/*  	//for (;s
+/* } */
-typedef struct
+/* typedef struct */
-{
+/* { */
-	char *name;
+/* 	char *name; */
-	void *f;
+/* 	void *f; */
-} export_t;
+/* } export_t; */

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/iconv/iconv.c – Rev 7045 → 7057