And functions for convertion to and from current locale and UTF-8.

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@931 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/configure.ac b/configure.ac
index 18332405ff1322cf4b107898859d5a48c90dc58f..9974c29c5ea7610f04c8137938ca515e972f3ed4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -156,7 +156,7 @@ AM_CONDITIONAL(OS_IS_WIN32, test "x$os_is_win32" = "x1")
 AC_HEADER_STDC
 
 # POSIX
-AC_CHECK_HEADERS([arpa/inet.h glob.h grp.h netdb.h netinet/in.h \
+AC_CHECK_HEADERS([arpa/inet.h glob.h grp.h iconv.h netdb.h netinet/in.h \
     netinet/in_systm.h netinet/ip.h netinet/tcp.h pwd.h sched.h \
     sys/resource.h sys/select.h sys/socket.h sys/wait.h \
     syslog.h])

diff --git a/src/polyp/utf8.c b/src/polyp/utf8.c
index 300a54cafbce79cb08fa6da34e7546f4ee52d176..931328e50cb74f6f73101df1eb5d81b8a48a73e5 100644 (file)
--- a/src/polyp/utf8.c
+++ b/src/polyp/utf8.c
@@ -29,10 +29,15 @@
 #endif
 
 #include <assert.h>
+#include <errno.h>
 #include <stdlib.h>
 #include <inttypes.h>
 #include <string.h>
 
+#ifdef HAVE_ICONV_H
+#include <iconv.h>
+#endif
+
 #include "utf8.h"
 #include "xmalloc.h"
 
@@ -162,3 +167,70 @@ char* pa_utf8_filter (const char *str) {
 
     return utf8_validate(str, new_str);
 }
+
+#ifdef HAVE_ICONV_H
+
+static char* iconv_simple(const char *str, const char *to, const char *from) {
+    char *new_str;
+    size_t len, inlen;
+
+    iconv_t cd;
+    char *inbuf, *outbuf;
+    size_t res, inbytes, outbytes;
+
+    cd = iconv_open(to, from);
+    if (cd == (iconv_t)-1)
+        return NULL;
+
+    inlen = len = strlen(str) + 1;
+    new_str = pa_xmalloc(len);
+    assert(new_str);
+
+    while (1) {
+        inbuf = (char*)str; /* Brain dead prototype for iconv() */
+        inbytes = inlen;
+        outbuf = new_str;
+        outbytes = len;
+
+        res = iconv(cd, &inbuf, &inbytes, &outbuf, &outbytes);
+
+        if (res != (size_t)-1)
+            break;
+
+        if (errno != E2BIG) {
+            pa_xfree(new_str);
+            new_str = NULL;
+            break;
+        }
+
+        assert(inbytes != 0);
+
+        len += inbytes;
+        new_str = pa_xrealloc(new_str, len);
+        assert(new_str);
+    }
+
+    iconv_close(cd);
+
+    return new_str;
+}
+
+char* pa_utf8_to_locale (const char *str) {
+    return iconv_simple(str, "", "UTF-8");
+}
+
+char* pa_locale_to_utf8 (const char *str) {
+    return iconv_simple(str, "UTF-8", "");
+}
+
+#else
+
+char* pa_utf8_to_locale (const char *str) {
+    return NULL;
+}
+
+char* pa_locale_to_utf8 (const char *str) {
+    return NULL;
+}
+
+#endif

diff --git a/src/polyp/utf8.h b/src/polyp/utf8.h
index 3cc3a7d08a103193f3bed6e9cb63a30593374459..55b8d2e49d092082bf45a36f718440b0dba2c5f3 100644 (file)
--- a/src/polyp/utf8.h
+++ b/src/polyp/utf8.h
@@ -36,6 +36,12 @@ const char *pa_utf8_valid(const char *str);
 /** Filter all invalid UTF8 characters from the specified string, returning a new fully UTF8 valid string. Don't forget to free the returned string with pa_xfree() */
 char *pa_utf8_filter(const char *str);
 
+/** Convert a UTF-8 string to the current locale. Free the string using pa_xfree(). */
+char* pa_utf8_to_locale (const char *str);
+
+/** Convert a string in the current locale to UTF-8. Free the string using pa_xfree(). */
+char* pa_locale_to_utf8 (const char *str);
+
 PA_C_DECL_END
 
 #endif