Changeset 208

Timestamp:

06/14/08 20:45:38 (5 months ago)

Author:

zany

Message:

adding proper unicode functions

Location:

trunk

Files:

• configure.in (modified) (1 diff)
• obexftp/Makefile.am (modified) (1 diff)
• obexftp/cache.c (modified) (4 diffs)
• obexftp/object.c (modified) (7 diffs)
• obexftp/unicode.c (added)
• obexftp/unicode.h (added)

trunk/configure.in

@@ -32 +32 @@
 
 AM_ICONV
+AC_CHECK_HEADERS([langinfo.h])
 dnl IRDA_CHECK
 BLUETOOTH_CHECK

trunk/obexftp/Makefile.am

@@ -12 +12 @@
                                 cache.c cache.h \
                                 uuid.h obexftp.h \
+                                unicode.c unicode.h \
                                 bt_kit.c bt_kit.h
 

trunk/obexftp/cache.c

@@ -37 +37 @@
 #endif
 
-#ifdef HAVE_ICONV
-#include <iconv.h>
-#include <locale.h>
-#include <langinfo.h>
-#endif
-
 #include <openobex/obex.h>
 
@@ -48 +42 @@
 #include "client.h"
 #include "object.h"
+#include "unicode.h"
 #include "cache.h"
 
@@ -261 +256 @@
 
         stat_entry_t *dir_start, *dir;
-        int i;
-#ifdef HAVE_ICONV
-        iconv_t utf8;
-        char *xml_latin1, *xml_end;
-        size_t ni, no, nrc;
-        int ret;
-#endif
+        int ret, n, i;
+        char *xml_conv;
                 
         if (!xml)
                 return NULL;
-#ifdef HAVE_ICONV
-        setlocale(LC_CTYPE, "");
-        DEBUG(2, "Iconv to %s\n", nl_langinfo(CODESET));
-        utf8 = iconv_open (nl_langinfo(CODESET), "UTF-8");
-        ni = strlen(xml);
-        no = ni;
-        xml_latin1 = xml_end = malloc(no+1);
-        p = xml;
-        if (xml_latin1) {
-                nrc = iconv (utf8, (char* *)&p, &ni, &xml_end, &no);
-                ret = iconv_close (utf8);
-                if (nrc != (size_t)(-1)) {
-                        xml = xml_latin1;
-                } else {
-                        DEBUG(1, "Iconv conversion error: '%s'\n", p);
-                }
-        }
-#endif
+        n = strlen(xml) + 1;
+        xml_conv = malloc(n);
+        ret = Utf8ToChar(xml_conv, xml, n);
+        if (ret > 0) {
+                xml = xml_conv;
+        } else {
+                DEBUG(1, "UTF-8 conversion error\n");
+        }
         
         DEBUG(4, "Converted cache xml: '%s'\n", xml);
@@ -343 +323 @@
         dir->name[0] = '\0';
 
-#ifdef HAVE_ICONV
-        if (xml_latin1)
-                free (xml_latin1);
-#endif
+        if (xml_conv)
+                free (xml_conv);
+
         return dir_start;
 }

trunk/obexftp/object.c

@@ -4 +4 @@
         ObexFTP library - language bindings for OBEX file transfer.
 
-        Copyright (c) 2002 Christian W. Zuckschwerdt <zany@triq.net>
+        Copyright (c) 2002-2007 Christian W. Zuckschwerdt <zany@triq.net>
 
         ObexFTP is free software; you can redistribute it and/or modify
@@ -24 +24 @@
 #include <string.h>
 
+#include "unicode.h"
 #include "object.h"
+
 
 /**
@@ -99 +101 @@
                 }
 
-                ucname_len = OBEX_CharToUnicode(ucname, (uint8_t*)name, ucname_len);
+                ucname_len = CharToUnicode(ucname, (uint8_t*)name, ucname_len);
 
                 hv.bs = (const uint8_t *) ucname;
@@ -159 +161 @@
 
         *appstr_p++ = 0x35;
-        ucname_len = OBEX_CharToUnicode(appstr_p + 1, (uint8_t*)from, strlen(from)*2 + 2);
+        ucname_len = CharToUnicode(appstr_p + 1, (uint8_t*)from, strlen(from)*2 + 2);
         *appstr_p = ucname_len - 2; /* no trailing 0 */
         appstr_p += ucname_len - 1;
 
         *appstr_p++ = 0x36;
-        ucname_len = OBEX_CharToUnicode(appstr_p + 1, (uint8_t*)to, strlen(to)*2 + 2);
+        ucname_len = CharToUnicode(appstr_p + 1, (uint8_t*)to, strlen(to)*2 + 2);
         *appstr_p = ucname_len - 2; /* no trailing 0 */
         
@@ -211 +213 @@
         }
 
-        ucname_len = OBEX_CharToUnicode(ucname, (uint8_t*)name, ucname_len);
+        ucname_len = CharToUnicode(ucname, (uint8_t*)name, ucname_len);
 
         hv.bs = (const uint8_t *) ucname;
@@ -264 +266 @@
                         return NULL;
                 }
-                ucname_len = OBEX_CharToUnicode(ucname, (uint8_t*)name, ucname_len);
+                ucname_len = CharToUnicode(ucname, (uint8_t*)name, ucname_len);
 
                 /* apparently the empty name header is meant to be really empty... */
@@ -318 +320 @@
         }
 
-        ucname_len = OBEX_CharToUnicode(ucname, (uint8_t*)name, ucname_len);
+        ucname_len = CharToUnicode(ucname, (uint8_t*)name, ucname_len);
 
         hv.bs = (const uint8_t *) ucname;